Changeset 971 in ntrip

Timestamp:

Jul 26, 2008, 9:44:25 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (4 diffs)
• RTCM3/RTCM3coDecoder.h (modified) (1 diff)
• bncapp.cpp (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -68 +68 @@
   _out = 0;
 
-  connect(this, SIGNAL(newCorrLine(QString)), 
-          (bncApp*) qApp, SLOT(slotNewCorrLine(QString)));
+  connect(this, SIGNAL(newCorrLine(QString, QString)), 
+          (bncApp*) qApp, SLOT(slotNewCorrLine(QString, QString)));
 }
 
@@ -169 +169 @@
       for(int ii = 0; ii < _co.NumberOfGPSSat; ++ii) {
         QString line;
-        line.sprintf("%d %.1f G%2.2d   %3d   %8.3f   %8.3f %8.3f %8.3f\n", 
+        line.sprintf("%d %.1f G%2.2d   %3d   %8.3f   %8.3f %8.3f %8.3f", 
                GPSweek, GPSweeks, _co.Sat[ii].ID, _co.Sat[ii].IOD, 
                _co.Sat[ii].Clock.DeltaA0,
@@ -180 +180 @@
           ii < CLOCKORBIT_NUMGPS + _co.NumberOfGLONASSSat; ++ii) {
         QString line;
-        line.sprintf("%d %.1f R%2.2d   %3d   %8.3f   %8.3f %8.3f %8.3f\n", 
+        line.sprintf("%d %.1f R%2.2d   %3d   %8.3f   %8.3f %8.3f %8.3f", 
                GPSweek, GPSweeks, _co.Sat[ii].ID, _co.Sat[ii].IOD, 
                _co.Sat[ii].Clock.DeltaA0, 
@@ -204 +204 @@
 void RTCM3coDecoder::printLine(const QString& line) {
   if (_out) {
-    *_out << line.toAscii().data();
+    *_out << line.toAscii().data() << endl;
     _out->flush();
   }
 
-  emit newCorrLine(line);
-}
+  emit newCorrLine(line, _staID);
+}

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -45 +45 @@
 
  signals:
-  void newCorrLine(QString line);
+  void newCorrLine(QString line, QString staID);
 
  private:

trunk/BNC/bncapp.cpp

@@ -590 +590 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncApp::slotNewCorrLine(QString line) {
+void bncApp::slotNewCorrLine(QString line, QString staID) {
   if (_socketsCorr) {
     QMutableListIterator<QTcpSocket*> is(*_socketsCorr);