Changeset 7764 in ntrip for trunk/BNC

Timestamp:

Feb 11, 2016, 11:24:45 AM (8 years ago)

Author:

stuerze

Message:

Agency and solution ID added in SINEX TRO File header

Location:

trunk/BNC/src

Files:

• bncsinextro.cpp (modified) (7 diffs)
• bncwindow.cpp (modified) (3 diffs)
• pppWidgets.cpp (modified) (7 diffs)
• pppWidgets.h (modified) (1 diff)

trunk/BNC/src/bncsinextro.cpp

@@ -84 +84 @@
   }
 
-
-  QString numberOfEpochs = QString("%1").arg(1, 5, 10, QLatin1Char('0'));
-  _out << "%=TRO 2.00 BNC " << creationTime.toStdString() << " BNC "
-       << startTime.toStdString() << " " << endTime.toStdString() << " P "
+  QString numberOfEpochs = QString("%1").arg(intr * _sampl, 5, 10, QLatin1Char('0'));
+  QString ac   = QString("%1").arg(settings.value("PPP/snxtroAc").toString(),3,QLatin1Char('0'));
+  QString sol  = QString("%1").arg(settings.value("PPP/snxtroSol").toString(),4,QLatin1Char('0'));
+  QString corr = settings.value("PPP/corrMount").toString();
+  _out << "%=TRO 2.00 " << ac.toStdString() << " "
+       << creationTime.toStdString()   << " "   << ac.toStdString() << " "
+       << startTime.toStdString()      << " "   << endTime.toStdString() << " P "
        << numberOfEpochs.toStdString() << " 0 " << " T "  << endl;
-
 
   _out << "+FILE/REFERENCE" << endl;
   _out << " DESCRIPTION        " << "BNC generated SINEX TRO file" << endl;
   _out << " OUTPUT             " << "Total Troposphere Zenith Path Delay Product" << endl;
-  _out << " SOFTWARE           " << BNCPGMNAME <<  endl;
-  _out << " INPUT              " << "Orbit and Clock information used from BRDC and RTCM-SSR streams" << endl;
+  _out << " SOFTWARE           " <<  BNCPGMNAME <<  endl;
+  _out << " INPUT              " << "Additional Orbit and Clock information from Ntrip stream "
+                                 << corr.toStdString() <<endl;
   _out << "-FILE/REFERENCE" << endl << endl;
 
-
+  double recEll[3];
+  int lonD, lonM,  latD, latM;
+  double lonS, latS;
+  xyz2ell(_opt->_xyzAprRover.data(), recEll);
+  recEll[0] = recEll[0] * 180.0 / M_PI;
+  recEll[1] = recEll[1] * 180.0 / M_PI;
+  deg2DMS(recEll[1], lonD, lonM, lonS);
+  deg2DMS(recEll[0], latD, latM, latS);
+  QString country;
+  QListIterator<QString> it(settings.value("mountPoints").toStringList());
+  while (it.hasNext()) {
+    QStringList hlp = it.next().split(" ");
+    if (hlp.size() < 7)
+      continue;
+    if (hlp.join(" ").indexOf(QString::fromStdString(_opt->_roverName), 0) != -1) {
+      country = hlp[2];
+    }
+  }
   _out << "+SITE/ID" << endl;
+  _out << "*CODE PT DOMES____ T _STATION DESCRIPTION___ APPROX_LON_ APPROX_LAT_ _APP_H_" << endl;
+  _out << " " << _opt->_roverName.substr(0,4) << "  A           P "
+       << country.toStdString() << "                   "
+       << QString(" %1").arg(lonD, 3, 10, QLatin1Char(' ')).toStdString()
+       << QString(" %1").arg(lonM, 2, 10, QLatin1Char(' ')).toStdString()
+       << QString(" %1").arg(lonS, 4, 'f', 1, QLatin1Char(' ')).toStdString()
+       << QString(" %1").arg(latD, 3, 10, QLatin1Char(' ')).toStdString()
+       << QString(" %1").arg(latM, 2, 10, QLatin1Char(' ')).toStdString()
+       << QString(" %1").arg(latS, 4, 'f', 1, QLatin1Char(' ')).toStdString()
+       << QString(" %1").arg(recEll[2], 7, 'f', 1, QLatin1Char(' ')).toStdString()
+       << endl;
   _out << "-SITE/ID" << endl << endl;
 
@@ -105 +136 @@
     _out << "+SITE/RECEIVER" << endl;
     _out << "*SITE PT SOLN T DATA_START__ DATA_END____ DESCRIPTION_________ S/N__ FIRMWARE___" << endl;
-    _out << " " << _opt->_roverName.substr(0,4) << "  A    1 P "
+    _out << " " << _opt->_roverName.substr(0,4) << "  A "  <<  sol.toStdString() << " P "
          << startTime.toStdString() << " " << endTime.toStdString() << " " << _opt->_recNameRover << endl;
     _out << "-SITE/RECEIVER" << endl << endl;
@@ -112 +143 @@
   _out << "+SITE/ANTENNA" << endl;
   _out << "*SITE PT SOLN T DATA_START__ DATA_END____ DESCRIPTION_________ S/N__" << endl;
-  _out << " " << _opt->_roverName.substr(0,4) << "  A    1 P "
+  _out << " " << _opt->_roverName.substr(0,4) << "  A "  <<  sol.toStdString() << " P "
        << startTime.toStdString() << " " << endTime.toStdString() << " " << _opt->_antNameRover << endl;
   _out << "-SITE/ANTENNA" << endl << endl;
@@ -166 +197 @@
   _out << "*                                             UP______ NORTH___ EAST____" << endl;
   _out << "*SITE PT SOLN T DATA_START__ DATA_END____ AXE ARP->BENCHMARK(M)_________" << endl;
-  _out << " " << _opt->_roverName.substr(0,4) << "  A    1 P "
+  _out << " " << _opt->_roverName.substr(0,4) << "  A "  <<  sol.toStdString() << " P "
        << startTime.toStdString() << " " << endTime.toStdString() << " " << " UNE"
        << QString("%1").arg(_opt->_neuEccRover(3), 9, 'f', 4, QLatin1Char(' ')).toStdString()
@@ -173 +204 @@
   _out << "-SITE/ANTENNA" << endl << endl;
 
-
   _out << "+TROP/COORDINATES" << endl;
   _out << "*SITE PT SOLN T __STA_X_____ __STA_Y_____ __STA_Z_____ SYSTEM REMRK" << endl;
-  _out << " " << _opt->_roverName.substr(0,4) << "  A    1 P"
+  _out << " " << _opt->_roverName.substr(0,4) << "  A "  <<  sol.toStdString() << " P "
        << QString("%1").arg(_opt->_xyzAprRover(1), 13, 'f', 3, QLatin1Char(' ')).toStdString()
        << QString("%1").arg(_opt->_xyzAprRover(2), 13, 'f', 3, QLatin1Char(' ')).toStdString()
@@ -182 +212 @@
        << " ITRF08"<< endl;
   _out << "-TROP/COORDINATES"<< endl << endl;
-
 
   _out << "+TROP/DESCRIPTION" << endl;
@@ -196 +225 @@
   _out << "-TROP/DESCRIPTION"<< endl << endl;
 
-
   _out << "+TROP/SOLUTION" << endl;
   _out << "*SITE EPOCH_______ TROTOT STDEV" << endl;

trunk/BNC/src/bncwindow.cpp

@@ -867 +867 @@
   _pppWidgets._logPath->setMaximumWidth(35*ww);
   _pppWidgets._snxtroPath->setMaximumWidth(35*ww);
-  _pppWidgets._snxtroIntr->setMaximumWidth(15*ww);
+  _pppWidgets._snxtroIntr->setMaximumWidth(10*ww);
+  _pppWidgets._snxtroAc  ->setMaximumWidth(10*ww);
+  _pppWidgets._snxtroSol ->setMaximumWidth(7*ww);
 
   QGridLayout* pppLayout1 = new QGridLayout();
@@ -902 +904 @@
   pppLayout1->addWidget(new QLabel("   SNX TRO interval"),   ir, 3);
   pppLayout1->addWidget(_pppWidgets._snxtroIntr,             ir, 4);
-  pppLayout1->addWidget(new QLabel("   SNX TRO sampling"),   ir, 5, Qt::AlignRight);
+  pppLayout1->addWidget(new QLabel("   SNX TRO sampling"),   ir, 5);
   pppLayout1->addWidget(_pppWidgets._snxtroSampl,            ir, 6, Qt::AlignRight);
   ++ir;
+  pppLayout1->addWidget(new QLabel("   SNX TRO AC"),         ir, 3);
+  pppLayout1->addWidget(_pppWidgets._snxtroAc,               ir, 4);
+  pppLayout1->addWidget(new QLabel("   SNX TRO solution")    ,ir, 5);
+  pppLayout1->addWidget(_pppWidgets._snxtroSol,              ir, 6, Qt::AlignRight);
   pppLayout1->setRowStretch(ir, 999);
 
@@ -1334 +1340 @@
   _pppWidgets._snxtroIntr->setWhatsThis(tr("<p>Select a length for SINEX Troposphere files.</p><p>Default 'SNX TRO interval' for saving SINEX Troposphere files on disk is '1 hour'.</p>"));
   _pppWidgets._snxtroSampl->setWhatsThis(tr("<p>Select a 'Sampling' rate for saving troposphere parameters.</p><p>Default 'SNX TRO sampling' rate is '0', meaning that all troposphere estimates will be saved on disk.</p>"));
+  _pppWidgets._snxtroAc->setWhatsThis(tr("<p>Specify an abbreviation for the Analysis Center (AC) providing the SINEX Troposphere files.</p>"));
+  _pppWidgets._snxtroSol->setWhatsThis(tr("<p>Specify a solution ID to allow a distinction of different solutions per AC.</p>"));
 
   // WhatsThis, PPP (3)

trunk/BNC/src/pppWidgets.cpp

@@ -64 +64 @@
   _snxtroSampl  = new QSpinBox();      _snxtroSampl ->setObjectName("PPP/snxtroSampl");  _widgets << _snxtroSampl;
   _snxtroIntr   = new QComboBox();     _snxtroIntr  ->setObjectName("PPP/snxtroIntr");   _widgets << _snxtroIntr;
+  _snxtroAc     = new QLineEdit();     _snxtroAc    ->setObjectName("PPP/snxtroAc");     _widgets << _snxtroAc;
+  _snxtroSol    = new QLineEdit();     _snxtroSol   ->setObjectName("PPP/snxtroSol");    _widgets << _snxtroSol;
   _v3filenames  = new QCheckBox();     _v3filenames ->setObjectName("PPP/v3filenames");  _widgets << _v3filenames;
   _staTable     = new QTableWidget();  _staTable    ->setObjectName("PPP/staTable");     _widgets << _staTable;
@@ -103 +105 @@
          this, SLOT(slotPPPTextChanged()));
 
+  connect(_snxtroAc, SIGNAL(textChanged(const QString &)),
+         this, SLOT(slotPPPTextChanged()));
+
+  connect(_snxtroSol, SIGNAL(textChanged(const QString &)),
+         this, SLOT(slotPPPTextChanged()));
+
   slotEnableWidgets();
 
@@ -218 +226 @@
   delete _snxtroSampl;
   delete _snxtroIntr;
+  delete _snxtroAc;
+  delete _snxtroSol;
   delete _v3filenames;
   for (int iRow = _staTable->rowCount()-1; iRow >=0; iRow--) {
@@ -296 +306 @@
   _nmeaPath   ->setText(settings.value(_nmeaPath   ->objectName()).toString());
   _snxtroPath ->setText(settings.value(_snxtroPath ->objectName()).toString());
+  _snxtroAc   ->setText(settings.value(_snxtroAc   ->objectName()).toString());
+  _snxtroSol  ->setText(settings.value(_snxtroSol  ->objectName()).toString());
 
   if (!settings.value(_sigmaC1->objectName()).toString().isEmpty()) {
@@ -396 +408 @@
   settings.setValue(_snxtroPath  ->objectName(), _snxtroPath  ->text());
   settings.setValue(_snxtroSampl ->objectName(), _snxtroSampl ->value());
+  settings.setValue(_snxtroIntr  ->objectName(), _snxtroIntr  ->currentText());
+  settings.setValue(_snxtroAc    ->objectName(), _snxtroAc    ->text());
+  settings.setValue(_snxtroSol   ->objectName(), _snxtroSol   ->text());
   settings.setValue(_v3filenames ->objectName(), _v3filenames ->checkState());
-  settings.setValue(_snxtroIntr  ->objectName(), _snxtroIntr  ->currentText());
   settings.setValue(_lcGPS       ->objectName(), _lcGPS       ->currentText());
   settings.setValue(_lcGLONASS   ->objectName(), _lcGLONASS   ->currentText());
@@ -467 +481 @@
     _snxtroSampl->setEnabled(true);
     _snxtroIntr ->setEnabled(true);
+    _snxtroAc   ->setEnabled(true);
+    _snxtroSol  ->setEnabled(true);
   }
   else {
     _snxtroSampl->setEnabled(false);
     _snxtroIntr ->setEnabled(false);
+    _snxtroAc   ->setEnabled(false);
+    _snxtroSol  ->setEnabled(false);
   }
 
@@ -538 +556 @@
     if ( _snxtroPath->text() != "" ) {
       _snxtroSampl->setEnabled(true);
-      _snxtroIntr->setEnabled(true);
+      _snxtroIntr ->setEnabled(true);
+      _snxtroAc   ->setEnabled(true);
+      _snxtroSol  ->setEnabled(true);
       _snxtroSampl->setPalette(paletteWhite);
-      _snxtroIntr->setPalette(paletteWhite);
+      _snxtroIntr ->setPalette(paletteWhite);
+      _snxtroAc   ->setPalette(paletteWhite);
+      _snxtroSol  ->setPalette(paletteWhite);
     }
     else {
     _snxtroSampl->setEnabled(false);
-    _snxtroIntr->setEnabled(false);
+    _snxtroIntr ->setEnabled(false);
+    _snxtroAc   ->setEnabled(false);
+    _snxtroSol  ->setEnabled(false);
     _snxtroSampl->setPalette(paletteGray);
-    _snxtroIntr->setPalette(paletteGray);
-    }
-  }
-}
+    _snxtroIntr ->setPalette(paletteGray);
+    _snxtroAc   ->setPalette(paletteGray);
+    _snxtroSol  ->setPalette(paletteGray);
+    }
+  }
+}

trunk/BNC/src/pppWidgets.h

@@ -50 +50 @@
   QSpinBox*      _snxtroSampl;
   QComboBox*     _snxtroIntr;
+  QLineEdit*     _snxtroAc;
+  QLineEdit*     _snxtroSol;
   QCheckBox*     _v3filenames;
   QTableWidget*  _staTable;