Changeset 3930 in ntrip for trunk

Timestamp:

Apr 19, 2012, 1:06:02 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/rinex

Files:

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

trunk/BNC/rinex/rnxobsfile.cpp

@@ -94 +94 @@
       _markerName = value;
     }
+    else if (key == "MARKER NUMBER") {
+      _markerNumber = line.mid(0,20).trimmed();
+    }
     else if (key == "ANT # / TYPE") {
-      _antennaName = line.mid(20,20).trimmed();
+      _antennaNumber = line.mid( 0,20).trimmed();
+      _antennaName   = line.mid(20,20).trimmed();
+    }
+    else if (key == "OBSERVER / AGENCY") {
+      _observer = line.mid( 0,20).trimmed();
+      _agency   = line.mid(20,40).trimmed();
+    }
+    else if (key == "REC # / TYPE / VERS") {
+      _receiverNumber  = line.mid( 0,20).trimmed();
+      _receiverType    = line.mid(20,20).trimmed();
+      _receiverVersion = line.mid(40,20).trimmed();
     }
     else if (key == "INTERVAL") {
@@ -523 +536 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_rnxObsFile::setHeader(const t_rnxObsHeader& header) {
-  _header._version     =  header._version;     
-  _header._interval    =  header._interval;    
-  _header._antennaName =  header._antennaName; 
-  _header._markerName  =  header._markerName;  
-  _header._antNEU      =  header._antNEU;      
-  _header._antXYZ      =  header._antXYZ;      
-  _header._antBSG      =  header._antBSG;      
-  _header._xyz         =  header._xyz;         
+  _header._version         = header._version;     
+  _header._interval        = header._interval;    
+  _header._antennaNumber   = header._antennaNumber; 
+  _header._antennaName     = header._antennaName; 
+  _header._markerName      = header._markerName;  
+  _header._markerNumber    = header._markerNumber;  
+  _header._antNEU          = header._antNEU;      
+  _header._antXYZ          = header._antXYZ;      
+  _header._antBSG          = header._antBSG;      
+  _header._xyz             = header._xyz;         
+  _header._observer        = header._observer;       
+  _header._agency          = header._agency;         
+  _header._receiverNumber  = header._receiverNumber; 
+  _header._receiverType    = header._receiverType;   
+  _header._receiverVersion = header._receiverVersion;
+
   for (unsigned iPrn = 1; iPrn <= MAXPRN_GPS; iPrn++) {
     _header._wlFactorsL1[iPrn] =  header._wlFactorsL1[iPrn]; 
@@ -581 +602 @@
   *_stream << QString("%1%2")
     .arg(_header._observer, -20)
-    .arg(_header._agency,   -20)
+    .arg(_header._agency,   -40)
     .leftJustified(60)
            << "OBSERVER / AGENCY\n";
@@ -593 +614 @@
 
   *_stream << QString("%1%2")
-    .arg("xxxx", -20)      // TODO
-    .arg(_header._antennaName, -20)
+    .arg(_header._antennaNumber, -20)
+    .arg(_header._antennaName,   -20)
     .leftJustified(60)
            << "ANT # / TYPE\n";

trunk/BNC/rinex/rnxobsfile.h

@@ -107 +107 @@
     float                                 _version;
     double                                _interval;
+    QString                               _antennaNumber;
     QString                               _antennaName;
     QString                               _markerName;