Changeset 8127 in ntrip for trunk/BNC/src/bncgetthread.cpp

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/src/bncgetthread.cpp (modified) (14 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -43 +43 @@
 #include <sstream>
 
+#include <QComboBox>
+#include <QDialog>
 #include <QFile>
 #include <QTextStream>
 #include <QMutex>
 #include <QtNetwork>
+#include <QPushButton>
+#include <QTableWidget>
 #include <QTime>
 
@@ -90 +94 @@
   _rawFile = 0;
   _mountPoint = mountPoint;
-  _staID = mountPoint.path().mid(1).toAscii();
+  _staID = mountPoint.path().mid(1).toLatin1();
   _format = format;
   _latitude = latitude;
@@ -134 +138 @@
       continue;
     }
-    QByteArray mp = hlp[0].toAscii();
+    QByteArray mp = hlp[0].toLatin1();
     if (_staID == mp) {
       nmeaPort = hlp[9].toInt();
@@ -275 +279 @@
         hlp = "0.0";
       }
-      QByteArray _serialHeightNMEA = hlp.toAscii();
+      QByteArray _serialHeightNMEA = hlp.toLatin1();
       _manualNMEAString = ggaString(_latitude, _longitude, _serialHeightNMEA,
           nmeaMode);
@@ -603 +607 @@
             QString prn(obs._prn.toString().c_str());
             emit(newMessage(
-                _staID + " (" + prn.toAscii() + ")"
+                _staID + " (" + prn.toLatin1() + ")"
                     + ": Wrong observation epoch(s)", false));
             continue;
@@ -619 +623 @@
             long oldTime = it.value();
             if (obsTime < oldTime) {
-              emit(newMessage(_staID + ": old observation " + prn.toAscii(),
+              emit(newMessage(_staID + ": old observation " + prn.toLatin1(),
                   false));
               continue;
@@ -625 +629 @@
               emit(newMessage(
                   _staID + ": observation coming more than once "
-                      + prn.toAscii(), false));
+                      + prn.toLatin1(), false));
               continue;
             }
@@ -774 +778 @@
       for (int ii = 0; ii < decoder()->_typeList.size(); ii++) {
         QString type = QString("%1 ").arg(decoder()->_typeList[ii]);
-        emit(newMessage(_staID + ": Received message type " + type.toAscii(),
+        emit(newMessage(_staID + ": Received message type " + type.toLatin1(),
             true));
       }
@@ -847 +851 @@
             str << " " << rnxTypes[iType];
           }
-          emit(newMessage(_staID + ": Observation Types: " + msg.toAscii(),
+          emit(newMessage(_staID + ": Observation Types: " + msg.toLatin1(),
               true));
         }
@@ -856 +860 @@
       for (int ii = 0; ii < decoder()->_antType.size(); ii++) {
         QString ant1 = QString("%1 ").arg(decoder()->_antType[ii]);
-        emit(newMessage(_staID + ": Antenna descriptor " + ant1.toAscii(), true));
+        emit(newMessage(_staID + ": Antenna descriptor " + ant1.toLatin1(), true));
       }
 
@@ -870 +874 @@
         QByteArray ant1, ant2, ant3;
         ant1 =
-            QString("%1 ").arg(decoder()->_antList[ii].xx, 0, 'f', 4).toAscii();
+            QString("%1 ").arg(decoder()->_antList[ii].xx, 0, 'f', 4).toLatin1();
         ant2 =
-            QString("%1 ").arg(decoder()->_antList[ii].yy, 0, 'f', 4).toAscii();
+            QString("%1 ").arg(decoder()->_antList[ii].yy, 0, 'f', 4).toLatin1();
         ant3 =
-            QString("%1 ").arg(decoder()->_antList[ii].zz, 0, 'f', 4).toAscii();
+            QString("%1 ").arg(decoder()->_antList[ii].zz, 0, 'f', 4).toLatin1();
         emit(newMessage(_staID + ": " + antT + " (ITRF) X " + ant1 + "m", true));
         emit(newMessage(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true));
@@ -881 +885 @@
         if (decoder()->_antList[ii].height_f) {
           hh = decoder()->_antList[ii].height;
-          QByteArray ant4 = QString("%1 ").arg(hh, 0, 'f', 4).toAscii();
+          QByteArray ant4 = QString("%1 ").arg(hh, 0, 'f', 4).toLatin1();
           emit(newMessage(
               _staID + ": Antenna height above marker " + ant4 + "m", true));
@@ -902 +906 @@
           _gloSlots.sort();
           emit(newMessage(
-              _staID + ": GLONASS Slot:Freq " + _gloSlots.join(" ").toAscii(),
+              _staID + ": GLONASS Slot:Freq " + _gloSlots.join(" ").toLatin1(),
               true));
         }
@@ -983 +987 @@
   _nmeaSockets->push_back(_nmeaServer->nextPendingConnection());
   emit(newMessage(
-      QString("New PPP client on port: # %1").arg(_nmeaSockets->size()).toAscii(),
+      QString("New PPP client on port: # %1").arg(_nmeaSockets->size()).toLatin1(),
       true));
 }