Changeset 7665 in ntrip for trunk/BNC

Timestamp:

Jan 11, 2016, 2:01:13 PM (8 years ago)

Author:

stuerze

Message:

minor changes ragarding rinex obs file writing with incomplete skl file

Location:

trunk/BNC/src

Files:

• bncrinex.cpp (modified) (2 diffs)
• rinex/rnxobsfile.cpp (modified) (2 diffs)
• rinex/rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/bncrinex.cpp

@@ -163 +163 @@
     if (query->status() == bncNetQuery::finished &&
         outData.contains("END OF HEADER")) {
-      irc = success;
       QTextStream in(outData);
-      _sklHeader.read(&in);
+      irc = _sklHeader.read(&in);
     }
 
@@ -184 +183 @@
   QFile skl(_sklName);
   if ( skl.exists() && skl.open(QIODevice::ReadOnly) ) {
-    readDone = true;
     QTextStream in(&skl);
-    _sklHeader.read(&in);
+    if (_sklHeader.read(&in) == success) {
+      readDone = true;
+    }
   }
 

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -63 +63 @@
     _wlFactorsL2[iPrn] = 1;
   }
+  bncSettings settings;
+  _writeRinexOnlyWithSklObsTypes = settings.value("rnxOnlyWithSKL").toBool();
 }
 
@@ -278 +280 @@
   // ----------------------------------------------------
   if (_obsTypes.empty()) {
-    setDefault(_markerName, _version);
+    if (!_writeRinexOnlyWithSklObsTypes) {
+      setDefault(_markerName, _version);
+    }
+    else {
+      return failure;
+    }
   }
 

trunk/BNC/src/rinex/rnxobsfile.h

@@ -97 +97 @@
   int                     _wlFactorsL2[t_prn::MAXPRN_GPS+1];
   bncTime                 _startTime;
+  bool                    _writeRinexOnlyWithSklObsTypes;
+
   QMap<QString, QPair<double, QStringList> > _phaseShifts;
 };