Changeset 6608 in ntrip

Timestamp:

Feb 20, 2015, 3:57:46 PM (10 years ago)

Author:

stuerze

Message:

preparation for sinex tro

Location:

trunk/BNC/src

Files:

• pppMain.cpp (modified) (1 diff)
• pppMain.h (modified) (1 diff)
• pppRun.cpp (modified) (3 diffs)
• pppRun.h (modified) (1 diff)
• pppWidgets.cpp (modified) (2 diffs)

trunk/BNC/src/pppMain.cpp

@@ -125 +125 @@
   _nmeaFile = settings.value("PPP/nmeaFile").toString();
   _nmeaPort = settings.value("PPP/nmeaPort").toInt();
+  _snxtroFile = settings.value("PPP/snxtroFile").toString();
 
   _realTime = false;

trunk/BNC/src/pppMain.h

@@ -22 +22 @@
   QString  _logFile;
   QString  _nmeaFile;
+  QString  _snxtroFile;
   int      _nmeaPort;
   bool     _running;

trunk/BNC/src/pppRun.cpp

@@ -149 +149 @@
     _nmeaFile = new bncoutf(nmeaFileSkl, "1 day", 0);
   }
-}
+
+  QString snxtroFileSkl = settings.value("PPP/snxtroFile").toString();
+  if (snxtroFileSkl.isEmpty()) {
+    _snxtroFile = 0;
+  }
+  else {
+    if (snxtroFileSkl.indexOf("${STATION}") == -1) {
+      snxtroFileSkl = snxtroFileSkl + "_" + roverName;
+    }
+    else {
+      snxtroFileSkl.replace("${STATION}", roverName);
+    }
+    _snxtroFile = new bncoutf(snxtroFileSkl, "1 day", 0);
+  }
+}
+
+
 
 // Destructor
@@ -156 +172 @@
   delete _logFile;
   delete _nmeaFile;
+  delete _snxtroFile;
 }
 
@@ -274 +291 @@
       emit newNMEAstr(staID, rmcStr.toAscii());
       emit newNMEAstr(staID, ggaStr.toAscii());
+    }
+
+    if (_snxtroFile && output._epoTime.valid()) {
+     // _snxtroFile->write(output._epoTime.gpsw(), output._epoTime.gpssec(),QString("TEST"));
     }
 

trunk/BNC/src/pppRun.h

@@ -72 +72 @@
   bncoutf*               _logFile;
   bncoutf*               _nmeaFile;
+  bncoutf*               _snxtroFile;
 };
 

trunk/BNC/src/pppWidgets.cpp

@@ -195 +195 @@
   _nmeaFile   ->setText(settings.value(_nmeaFile   ->objectName()).toString());
   _nmeaPort   ->setText(settings.value(_nmeaPort   ->objectName()).toString());
+  _snxtroFile ->setText(settings.value(_snxtroFile ->objectName()).toString());
   _sigmaC1    ->setText(settings.value(_sigmaC1    ->objectName()).toString());
   _sigmaL1    ->setText(settings.value(_sigmaL1    ->objectName()).toString());
@@ -261 +262 @@
   settings.setValue(_nmeaFile    ->objectName(), _nmeaFile    ->text());
   settings.setValue(_nmeaPort    ->objectName(), _nmeaPort    ->text());
+  settings.setValue(_snxtroFile  ->objectName(), _snxtroFile  ->text());
   settings.setValue(_lcGPS       ->objectName(), _lcGPS       ->currentText());
   settings.setValue(_lcGLONASS   ->objectName(), _lcGLONASS   ->currentText());