Changeset 9609 in ntrip for trunk

Timestamp:

Jan 19, 2022, 10:01:01 PM (2 years ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/pppRun.cpp (modified) (1 diff)

trunk/BNC/src/pppRun.cpp

@@ -546 +546 @@
   }
 
-  _rnxNavFile = new t_rnxNavFile(QString(_opt->_rinexNav.c_str()), t_rnxNavFile::input);
+  try {
+    cout << "_opt->_rinexNav: " << _opt->_rinexNav.c_str() << endl;
+    _rnxNavFile = new t_rnxNavFile(QString(_opt->_rinexNav.c_str()), t_rnxNavFile::input);
+  }
+  catch (...) {
+    delete _rnxNavFile; _rnxNavFile = 0;
+    emit finishedRnxPPP();
+    return;
+  }
 
   if (!_opt->_corrFile.empty()) {
     _corrFile = new t_corrFile(QString(_opt->_corrFile.c_str()));
-    connect(_corrFile, SIGNAL(newTec(t_vTec)),
-            this, SLOT(slotNewTec(t_vTec)));
-    connect(_corrFile, SIGNAL(newOrbCorrections(QList<t_orbCorr>)),
-            this, SLOT(slotNewOrbCorrections(QList<t_orbCorr>)));
-    connect(_corrFile, SIGNAL(newClkCorrections(QList<t_clkCorr>)),
-            this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
-    connect(_corrFile, SIGNAL(newCodeBiases(QList<t_satCodeBias>)),
-            this, SLOT(slotNewCodeBiases(QList<t_satCodeBias>)));
-    connect(_corrFile, SIGNAL(newPhaseBiases(QList<t_satPhaseBias>)),
-            this, SLOT(slotNewPhaseBiases(QList<t_satPhaseBias>)));
+
+    if (_opt->_ionoFile.empty()) {
+      connect(_corrFile, SIGNAL(newTec(t_vTec)), this, SLOT(slotNewTec(t_vTec)));
+    }
+    connect(_corrFile, SIGNAL(newOrbCorrections(QList<t_orbCorr>)), this, SLOT(slotNewOrbCorrections(QList<t_orbCorr>)));
+    connect(_corrFile, SIGNAL(newClkCorrections(QList<t_clkCorr>)), this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
+    connect(_corrFile, SIGNAL(newCodeBiases(QList<t_satCodeBias>)), this, SLOT(slotNewCodeBiases(QList<t_satCodeBias>)));
+    connect(_corrFile, SIGNAL(newPhaseBiases(QList<t_satPhaseBias>)), this, SLOT(slotNewPhaseBiases(QList<t_satPhaseBias>)));
   }
 
   if (!_opt->_ionoFile.empty()) {
     _ionoFile = new t_corrFile(QString(_opt->_corrFile.c_str()));
-    connect(_ionoFile, SIGNAL(newTec(t_vTec)),
-            this, SLOT(slotNewTec(t_vTec)));
+    connect(_ionoFile, SIGNAL(newTec(t_vTec)), this, SLOT(slotNewTec(t_vTec)));
   }