Changeset 9675 in ntrip for trunk/BNC

Timestamp:

Apr 7, 2022, 4:19:40 PM (2 years ago)

Author:

stuerze

Message:

 

Location:

trunk/BNC/src

Files:

• bncantex.cpp (modified) (1 diff)
• bnccore.cpp (modified) (9 diffs)
• upload/bncrtnetuploadcaster.cpp (modified) (1 diff)

trunk/BNC/src/bncantex.cpp

@@ -111 +111 @@
   t_frqMap* frqMap = map->frqMap[frqType];
 
-  QString u, n,e;
-  u.sprintf("%+6.4f" ,frqMap->neu[2]); if (u.mid(1,1) == "0") {u.remove(1,1);}
-  n.sprintf("%+6.4f" ,frqMap->neu[0]); if (n.mid(1,1) == "0") {n.remove(1,1);}
-  e.sprintf("%+6.4f" ,frqMap->neu[1]); if (e.mid(1,1) == "0") {e.remove(1,1);}
+  QString u = QString().asprintf("%+6.4f" ,frqMap->neu[2]); if (u.mid(1,1) == "0") {u.remove(1,1);}
+  QString n = QString().asprintf("%+6.4f" ,frqMap->neu[0]); if (n.mid(1,1) == "0") {n.remove(1,1);}
+  QString e = QString().asprintf("%+6.4f" ,frqMap->neu[1]); if (e.mid(1,1) == "0") {e.remove(1,1);}
 
   return QString(" %1 %2 %3").arg(u).arg(n).arg(e);

trunk/BNC/src/bnccore.cpp

@@ -390 +390 @@
     if (_rinexVers == 3) {
       if ( ! (appendFlagGPS & QIODevice::Append)) {
-        QString line;
-        line.sprintf(
-          "%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n",
+        QString line = QString().asprintf("%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n",
           defaultRnxNavVersion3, "", "");
         *_ephStreamGPS << line;
+        line.clear();
 
         QString hlp = currentDateAndTimeGPS().toString("yyyyMMdd hhmmss UTC").leftJustified(20, ' ', true);
@@ -400 +399 @@
                        << _userName.toLatin1().data()
                        << hlp.toLatin1().data()
-                       << "PGM / RUN BY / DATE" << endl;
+                       << "PGM / RUN BY / DATE\n";
 
         QStringListIterator it(comments);
@@ -407 +406 @@
         }
 
-        line.sprintf("%60sEND OF HEADER\n", "");
+        line = QString().asprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
 
@@ -418 +417 @@
     else if (_rinexVers == 2) {
       if (! (appendFlagGPS & QIODevice::Append)) {
-        QString line;
-        line.sprintf("%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n",
+        QString line = QString().asprintf("%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n",
                      defaultRnxNavVersion2, "", "");
         *_ephStreamGPS << line;
+        line.clear();
 
         QString hlp = currentDateAndTimeGPS().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
@@ -427 +426 @@
                        << _userName.toLatin1().data()
                        << hlp.toLatin1().data()
-                       << "PGM / RUN BY / DATE" << endl;
+                       << "PGM / RUN BY / DATE\n";
 
         QStringListIterator it(comments);
@@ -434 +433 @@
         }
 
-        line.sprintf("%60sEND OF HEADER\n", "");
+        line = QString().asprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
 
@@ -440 +439 @@
       }
       if (! (appendFlagGlonass & QIODevice::Append)) {
-        QString line;
-        line.sprintf("%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n",
+        QString line = QString().asprintf("%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n",
                      defaultRnxNavVersion2, "", "");
         *_ephStreamGlonass << line;
+        line.clear();
 
         QString hlp = currentDateAndTimeGPS().date().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
@@ -449 +448 @@
                            << _userName.toLatin1().data()
                            << hlp.toLatin1().data()
-                           << "PGM / RUN BY / DATE" << endl;
+                           << "PGM / RUN BY / DATE\n";
 
         QStringListIterator it(comments);
@@ -456 +455 @@
         }
 
-        line.sprintf("%60sEND OF HEADER\n", "");
+        line = QString().asprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGlonass << line;
 

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -1036 +1036 @@
   }
 
-  outLine.sprintf("%d %.1f %s  %u  %10.3f %8.3f %8.3f  %8.3f %8.3f %8.3f\n", GPSweek,
+  outLine = QString().asprintf("%d %.1f %s  %u  %10.3f %8.3f %8.3f  %8.3f %8.3f %8.3f\n", GPSweek,
       GPSweeks, eph->prn().toString().c_str(), eph->IOD(), dClkA0, dClkA1, dClkA2,
       rsw(1), rsw(2), rsw(3));  //fprintf(stderr, "%s\n", outLine.toStdString().c_str());