Changeset 157 in ntrip for trunk/BNC

Timestamp:

Sep 9, 2006, 11:11:27 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncapp.h (modified) (1 diff)
• bncrinex.cpp (modified) (5 diffs)
• bncrinex.h (modified) (1 diff)

trunk/BNC/bncapp.h

@@ -12 +12 @@
     bncApp(int argc, char* argv[], bool GUIenabled);
     virtual ~bncApp();  
+    QString bncVersion() const {return _bncVersion;}
   public slots:
     void slotMessage(const QByteArray msg);

trunk/BNC/bncrinex.cpp

@@ -25 +25 @@
 
 #include "bncrinex.h"
+#include "bncapp.h"
 #include "bncutils.h"
 #include "bncconst.h"
@@ -52 +53 @@
     }
   }
+
+  _pgmName  = ((bncApp*)qApp)->bncVersion().leftJustified(20, ' ', true);
+  _userName = QString("${USER}").leftJustified(20, ' ', true);
+  expandEnvVar(_userName);
 }
 
@@ -179 +184 @@
     while (it.hasNext()) {
       QString line = it.next();
-      if      (line.indexOf("# / TYPES OF OBSERV") != -1) {
+      if      (line.indexOf("PGM / RUN BY / DATE") != -1) {
+        QString hlp = QDate::currentDate().toString("dd-MMM-yyyy         ");
+        _out << _pgmName.toAscii().data() << _userName.toAscii().data() 
+             << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;
+      }
+      else if (line.indexOf("# / TYPES OF OBSERV") != -1) {
         _out << "     4    P1    P2    L1    L2"
                 "                              # / TYPES OF OBSERV"  << endl;
@@ -204 +214 @@
     
     _out << "     2.10           OBSERVATION DATA    G (GPS)             RINEX VERSION / TYPE" << endl;
-    _out << "BNC                 LM                  27-Aug-2006         PGM / RUN BY / DATE"  << endl;
+    QString hlp = QDate::currentDate().toString("dd-MMM-yyyy         ");
+    _out << _pgmName.toAscii().data() << _userName.toAscii().data() 
+         << hlp.toAscii().data() << "PGM / RUN BY / DATE" << endl;
     _out.setf(ios::left);
     _out << setw(60) << _statID.data()                               << "MARKER NAME"          << endl;
@@ -228 +240 @@
                                 "    hh    mm   ss.zzz0000").toAscii().data();
     _out << "                 "                                      << "TIME OF FIRST OBS"    << endl;
-    QString hlp = QString("GENERATED FROM STREAM %1").arg(_mountPoint)
-                         .leftJustified(60, ' ', true);
+    hlp = QString("GENERATED FROM STREAM %1").arg(_mountPoint)
+                                             .leftJustified(60, ' ', true);
     _out << hlp.toAscii().data() << "COMMENT" << endl;
     _out << "                                                            END OF HEADER"        << endl;

trunk/BNC/bncrinex.h

@@ -35 +35 @@
    QProcess            _rnxScript;
    QString             _mountPoint;
+   QString             _pgmName;
+   QString             _userName;
 };