Changeset 4483 in ntrip

Timestamp:

Aug 3, 2012, 8:22:05 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncrinex.cpp (modified) (8 diffs)
• bncrinex.h (modified) (2 diffs)

trunk/BNC/src/bncrinex.cpp

@@ -91 +91 @@
   _userName = _userName.leftJustified(20, ' ', true);
 
-  if ( Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked) {
-    _rinexVers = 3;    
-  }
-  else {
-    _rinexVers = 2;
-  }
-
-  _approxPos[0] = _approxPos[1] = _approxPos[2] = 0.0;
-
   _samplingRate = settings.value("rnxSampl").toInt();
 
@@ -138 +129 @@
 bncRinex::~bncRinex() {
   bncSettings settings;
-  if ((_rinexVers == 3) && ( Qt::CheckState(settings.value("rnxAppend").toInt()) != Qt::Checked) ) {
+  if ((_header._version >= 3.0) && ( Qt::CheckState(settings.value("rnxAppend").toInt()) != Qt::Checked) ) {
     _out << ">                              4  1" << endl;
     _out << "END OF FILE" << endl;
@@ -237 +228 @@
     }
   }
+
+  bncSettings settings;
+  if ( Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked) {
+    _header._version = 3.01;    
+  }
+  else {
+    _header._version = 2.12;
+  }
 }
 
@@ -438 +437 @@
   // Epoch header line: RINEX Version 3
   // ----------------------------------
-  if (_rinexVers == 3) {
+  if (_header._version >= 3.0) {
     _out << datTim.toString("> yyyy MM dd hh mm ").toAscii().data()
          << setw(10) << setprecision(7) << sec
@@ -502 +501 @@
     // RINEX Version 3
     // ---------------
-    if (_rinexVers == 3) {
+    if (_header._version >= 3.0) {
       _out << rinexSatLine(obs, lli1, lli2, lli5); 
       _out << endl;
@@ -510 +509 @@
     // ---------------
     else {
-      _out << setw(14) << setprecision(3) << obs.measdata("C1", _rinexVers)  << ' '  << ' '
-           << setw(14) << setprecision(3) << obs.measdata("P1", _rinexVers)  << ' '  << ' '
-           << setw(14) << setprecision(3) << obs.measdata("L1", _rinexVers)  << lli1 << ' '
-           << setw(14) << setprecision(3) << obs.measdata("S1", _rinexVers)  << ' '  << ' '
-           << setw(14) << setprecision(3) << obs.measdata("C2", _rinexVers)  << ' '  << ' ' << endl
-           << setw(14) << setprecision(3) << obs.measdata("P2", _rinexVers)  << ' '  << ' ' 
-           << setw(14) << setprecision(3) << obs.measdata("L2", _rinexVers)  << lli2 << ' '
-           << setw(14) << setprecision(3) << obs.measdata("S2", _rinexVers)  << endl;
+      _out << setw(14) << setprecision(3) << obs.measdata("C1", _header._version)  << ' '  << ' '
+           << setw(14) << setprecision(3) << obs.measdata("P1", _header._version)  << ' '  << ' '
+           << setw(14) << setprecision(3) << obs.measdata("L1", _header._version)  << lli1 << ' '
+           << setw(14) << setprecision(3) << obs.measdata("S1", _header._version)  << ' '  << ' '
+           << setw(14) << setprecision(3) << obs.measdata("C2", _header._version)  << ' '  << ' ' << endl
+           << setw(14) << setprecision(3) << obs.measdata("P2", _header._version)  << ' '  << ' ' 
+           << setw(14) << setprecision(3) << obs.measdata("L2", _header._version)  << lli2 << ' '
+           << setw(14) << setprecision(3) << obs.measdata("S2", _header._version)  << endl;
     }
   }
@@ -527 +526 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncRinex::closeFile() {
-  if (_rinexVers == 3) {
+  if (_header._version == 3) {
     _out << ">                              4  1" << endl;
     _out << "END OF FILE" << endl;
@@ -555 +554 @@
   const QVector<QString>& types = _header._obsTypesV3[obs.satSys];
   for (int ii = 0; ii < types.size(); ii++) {
-    double value = obs.measdata(types[ii], _rinexVers);
+    double value = obs.measdata(types[ii], _header._version);
     str << setw(14) << setprecision(3) << value;
     if      (value != 0.0 && types[ii].indexOf("L1") == 0) {

trunk/BNC/src/bncrinex.h

@@ -49 +49 @@
    int samplingRate() const {return _samplingRate;}
 
-   void setApproxPos(double stax, double stay, double staz) {
-     _approxPos[0] = stax;
-     _approxPos[1] = stay;
-     _approxPos[2] = staz;
-   }
-
    std::string rinexSatLine(const t_obs& obs, char lli1, char lli2, char lli5);
 
@@ -85 +79 @@
    bool          _reconnectFlag;
    QDate         _skeletonDate;
-   int           _rinexVers;
-   double        _approxPos[3];
    int           _samplingRate;