Changeset 3927 in ntrip

Timestamp:

Apr 19, 2012, 12:52:22 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncapp.h (modified) (1 diff)
• rinex/rnxobsfile.cpp (modified) (4 diffs)
• rinex/rnxobsfile.h (modified) (1 diff)

trunk/BNC/bncapp.h

@@ -58 +58 @@
     void initCombination();
     void stopCombination();
+    const QString& pgmName() {return _pgmName;}
+    const QString& userName() {return _userName;}
 
   public slots:

trunk/BNC/rinex/rnxobsfile.cpp

@@ -44 +44 @@
 #include "rnxobsfile.h"
 #include "bncutils.h"
-#include "bncversion.h"
+#include "bncapp.h"
 
 using namespace std;
@@ -552 +552 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_rnxObsFile::writeHeader() {
+
+  bncApp* app = (bncApp*) qApp;
+
   *_stream << QString("%1           Observation data    Mixed")
     .arg(_header._version, 9, 'f', 2)
@@ -558 +561 @@
 
   *_stream << QString("%1%2%3")
-    .arg("BNC "BNCVERSION, -20)
-    .arg("BKG", -20)
+    .arg(app->pgmName(), -20)
+    .arg(app->userName(), -20)
     .arg(currentDateAndTimeGPS().date().toString("dd-MMM-yyyy"), -20)
     .leftJustified(60)
@@ -570 +573 @@
 
   *_stream << QString("%1%2")
-    .arg("Observer", -20)  // TODO
-    .arg("Agency", -40)    // TODO
+    .arg(_header._observer, -20)
+    .arg(_header._agency,   -20)
     .leftJustified(60)
            << "OBSERVER / AGENCY\n";
 
   *_stream << QString("%1%2%3")
-    .arg("xxxx", -20)      // TODO
-    .arg("Receiver", -20)  // TODO
-    .arg("yyyy", -20)      // TODO
+    .arg(_header._receiverNumber,  -20)
+    .arg(_header._receiverType,    -20)
+    .arg(_header._receiverVersion, -20)
     .leftJustified(60)
            << "REC # / TYPE / VERS\n";

trunk/BNC/rinex/rnxobsfile.h

@@ -109 +109 @@
     QString                               _antennaName;
     QString                               _markerName;
+    QString                               _observer;
+    QString                               _agency;
+    QString                               _receiverNumber;
+    QString                               _receiverType;
+    QString                               _receiverVersion;
     ColumnVector                          _antNEU;
     ColumnVector                          _antXYZ;