Changeset 10221 in ntrip for trunk/BNC/src

Timestamp:

Oct 6, 2023, 12:31:04 PM (13 months ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (1 diff)
• bncgetthread.cpp (modified) (2 diffs)
• bncmain.cpp (modified) (1 diff)
• combination/bncbiassnx.cpp (modified) (2 diffs)
• combination/bnccomb.cpp (modified) (6 diffs)
• upload/bncrtnetuploadcaster.cpp (modified) (8 diffs)
• upload/bncuploadcaster.cpp (modified) (2 diffs)

trunk/BNC/src/bnccore.cpp

@@ -123 +123 @@
 ////////////////////////////////////////////////////////////////////////////
 t_bncCore::~t_bncCore() {
-  delete _logStream;
-  delete _logFile;
+  delete _logStream; _logStream = 0;
+  delete _logFile;   _logFile   = 0;
   delete _ephStreamGPS;
   delete _ephFileGPS;

trunk/BNC/src/bncgetthread.cpp

@@ -476 +476 @@
         if (data.isEmpty() || BNC_CORE->sigintReceived) {
           emit(newMessage("No more data or Ctrl-C received", true));
+          BNC_CORE->stopPPP();
           BNC_CORE->stopCombination();
-          BNC_CORE->stopPPP();
           sleep(2);
           ::exit(5);
@@ -802 +802 @@
       // -----------------------
       for (int ii = 0; ii < decoder()->_obsList.size(); ii++) {
-        t_satObs& obs = decoder()->_obsList[ii]; 
+        t_satObs& obs = decoder()->_obsList[ii];
         QVector<QString>& rnxTypes = _rnxTypes[obs._prn.system()];
         bool allFound = true;

trunk/BNC/src/bncmain.cpp

@@ -569 +569 @@
     BNC_CORE->stopPPP();
     BNC_CORE->stopCombination();
+    sleep(2);
   }
   if (caster) {

trunk/BNC/src/combination/bncbiassnx.cpp

@@ -264 +264 @@
         if  (cb.contains("C1X") && cb.contains("C2X")) {cb.insert("C1X-C2X", cb["C1X"] - cb["C2X"]);}
         if  (cb.contains("C1X") && cb.contains("C5X")) {cb.insert("C1X-C5X", cb["C1X"] - cb["C5X"]);}
+        break;
       default:
         break;
@@ -271 +272 @@
 }
 
-// get DSBs from OSBs
+//
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncBiasSnx::cleanDsb() {
-  for (auto itS = _snxSatCodeBiasMap.begin(); itS != _snxSatCodeBiasMap.end();){
-    if (!_useGnss[itS.key().at(0).toLatin1()]) {
+
+  for (auto itS = _snxSatCodeBiasMap.begin(); itS != _snxSatCodeBiasMap.end();) {
+    char sys = itS.key().at(0).toLatin1();
+    if (!_useGnss[sys]) {
+      delete itS.value();
       itS = _snxSatCodeBiasMap.erase(itS);
     }

trunk/BNC/src/combination/bnccomb.cpp

@@ -174 +174 @@
       newAC->name         = hlp[1];
       newAC->weightFactor = hlp[2].toDouble();
-      newAC->isAPC = (newAC->mountPoint.mid(0,4) =="SSRA");
+      newAC->isAPC = bool(newAC->mountPoint.mid(0,4) == "SSRA");
       QMapIterator<char, unsigned> itSys(_cmbSysPrn);
       // init
@@ -301 +301 @@
     _MAXRES = 999.0;
   }
+
 }
 
@@ -306 +307 @@
 ////////////////////////////////////////////////////////////////////////////
 bncComb::~bncComb() {
+
   QListIterator<cmbAC*> icAC(_ACs);
   while (icAC.hasNext()) {
@@ -315 +317 @@
   if (_ssrCorr) {
     delete _ssrCorr;
-
-  }
+  }
+
   delete _antex;
   delete _bsx;
@@ -1050 +1052 @@
     clkCorrections.push_back(clkCorr);
 
-
     ColumnVector xc(6);
     ColumnVector vv(3);
@@ -1062 +1063 @@
     // Correction Phase Center --> CoM
     // -------------------------------
-
     ColumnVector dx(3);   dx = 0.0;
     ColumnVector apc(3); apc = 0.0;

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -862 +862 @@
     }
     if (co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) {
-      char obuffer[CLOCKORBIT_BUFFERSIZE] = {0};
+      char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'};
       if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
         co.UpdateInterval = ephUpdInd;
@@ -883 +883 @@
     }
     if (co.NumberOfSat[CLOCKORBIT_SATGALILEO] > 0) {
-      char obuffer[CLOCKORBIT_BUFFERSIZE] = {0};
+      char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'};
       if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
         co.UpdateInterval = ephUpdInd;
@@ -903 +903 @@
     }
     if (co.NumberOfSat[CLOCKORBIT_SATQZSS] > 0) {
-      char obuffer[CLOCKORBIT_BUFFERSIZE] = {0};
+      char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'};
       if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
         co.UpdateInterval = ephUpdInd;
@@ -922 +922 @@
     }
     if (co.NumberOfSat[CLOCKORBIT_SATSBAS] > 0) {
-      char obuffer[CLOCKORBIT_BUFFERSIZE] = {0};
+      char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'};
       if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
         co.UpdateInterval = ephUpdInd;
@@ -940 +940 @@
     }
     if (co.NumberOfSat[CLOCKORBIT_SATBDS] > 0) {
-      char obuffer[CLOCKORBIT_BUFFERSIZE] = {0};
+      char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'};
       if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
         co.UpdateInterval = ephUpdInd;
@@ -968 +968 @@
       || bias.NumberOfSat[CLOCKORBIT_SATSBAS] > 0
       || bias.NumberOfSat[CLOCKORBIT_SATBDS] > 0) {
-    char obuffer[CLOCKORBIT_BUFFERSIZE] = {0};
+    char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'};
     if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
       int len = _ssrCorr->MakeCodeBias(&bias, _ssrCorr->CBTYPE_AUTO, 0, obuffer, sizeof(obuffer));
@@ -987 +987 @@
       || phasebias.NumberOfSat[CLOCKORBIT_SATBDS] > 0)
       && (_phaseBiasInformationDecoded)) {
-    char obuffer[CLOCKORBIT_BUFFERSIZE] = {0};
+    char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'};
     if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
       int len = _ssrCorr->MakePhaseBias(&phasebias, _ssrCorr->PBTYPE_AUTO, 0, obuffer, sizeof(obuffer));
@@ -1000 +1000 @@
   QByteArray hlpBufferVtec;
   if (vtec.NumLayers > 0) {
-    char obuffer[CLOCKORBIT_BUFFERSIZE] = {0};
+    char obuffer[CLOCKORBIT_BUFFERSIZE] = {'\0'};
     int len = _ssrCorr->MakeVTEC(&vtec, 0, obuffer, sizeof(obuffer));
     if (len > 0) {

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -294 +294 @@
     msg = "SOURCE " + _password.toLatin1() + " /" + _mountpoint.toLatin1()
         + "\r\n" + "Source-Agent: NTRIP BNC/" BNCVERSION "\r\n\r\n";
+    _outSocket->write(msg);
+    _outSocket->waitForBytesWritten();
+    _outSocket->waitForReadyRead();
   } else {
     msg = "POST " + _postExtension.toLatin1() + "/" + _mountpoint.toLatin1()
@@ -301 +304 @@
         + "User-Agent: NTRIP BNC/" BNCVERSION " (" + BNC_OS + ")\r\n"
         + "Connection: close\r\n" + "Transfer-Encoding: chunked\r\n\r\n";
-  }
-  _outSocket->write(msg);
-  _outSocket->waitForBytesWritten();
-  _outSocket->waitForReadyRead();
+    _outSocket->write(msg);
+    _outSocket->waitForBytesWritten();
+    _outSocket->waitForReadyRead();
+  }
 
    QByteArray ans = _outSocket->readAll();