Changeset 6795 in ntrip for trunk/BNC/src/rinex

Timestamp:

Apr 23, 2015, 5:33:29 PM (9 years ago)

Author:

stuerze

Message:

Receiver Number, Antenna Number and Antenna Eccentricity are now additional editable RINEX header fields

Location:

trunk/BNC/src/rinex

Files:

• reqcedit.cpp (modified) (2 diffs)
• rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -339 +339 @@
   }
 
+  QString oldAntennaNumber  = settings.value("reqcOldAntennaNumber").toString();
+  QString newAntennaNumber  = settings.value("reqcNewAntennaNumber").toString();
+  if (!newAntennaNumber.isEmpty()) {
+    if (oldAntennaNumber.isEmpty() ||
+        QRegExp(oldAntennaNumber).exactMatch(obsFile.antennaNumber())) {
+      obsFile.setAntennaNumber(newAntennaNumber);
+    }
+  }
+
+
+  const ColumnVector& obsFileAntNEU = obsFile.antNEU();
+  QString oldAntennadN = settings.value("reqcOldAntennadN").toString();
+  QString newAntennadN = settings.value("reqcNewAntennadN").toString();
+  if(!newAntennadN.isEmpty()) {
+    if (oldAntennadN.isEmpty() ||
+        oldAntennadN.toDouble() == obsFileAntNEU(1)) {
+      obsFile.setAntennaN(newAntennadN.toDouble());
+    }
+  }
+  QString oldAntennadE = settings.value("reqcOldAntennadE").toString();
+  QString newAntennadE = settings.value("reqcNewAntennadE").toString();
+  if(!newAntennadE.isEmpty()) {
+    if (oldAntennadE.isEmpty() ||
+        oldAntennadE.toDouble() == obsFileAntNEU(2)) {
+      obsFile.setAntennaE(newAntennadE.toDouble());
+    }
+  }
+  QString oldAntennadU = settings.value("reqcOldAntennadU").toString();
+  QString newAntennadU = settings.value("reqcNewAntennadU").toString();
+  if(!newAntennadU.isEmpty()) {
+    if (oldAntennadU.isEmpty() ||
+        oldAntennadU.toDouble() == obsFileAntNEU(3)) {
+      obsFile.setAntennaU(newAntennadU.toDouble());
+    }
+  }
+
   QString oldReceiverType = settings.value("reqcOldReceiverName").toString();
   QString newReceiverType = settings.value("reqcNewReceiverName").toString();
@@ -345 +381 @@
         QRegExp(oldReceiverType).exactMatch(obsFile.receiverType())) {
       obsFile.setReceiverType(newReceiverType);
+    }
+  }
+
+  QString oldReceiverNumber = settings.value("reqcOldReceiverNumber").toString();
+  QString newReceiverNumber = settings.value("reqcNewReceiverNumber").toString();
+  if (!newReceiverNumber.isEmpty()) {
+    if (oldReceiverNumber.isEmpty() ||
+        QRegExp(oldReceiverNumber).exactMatch(obsFile.receiverNumber())) {
+      obsFile.setReceiverNumber(newReceiverNumber);
     }
   }

trunk/BNC/src/rinex/rnxobsfile.h

@@ -139 +139 @@
   }
   const QString& antennaName() const {return _header._antennaName;}
+  const QString& antennaNumber() const {return _header._antennaNumber;}
   const QString& markerName() const {return _header._markerName;}
   const QString& markerNumber() const {return _header._markerNumber;}
   const QString& receiverType() const {return _header._receiverType;}
+  const QString& receiverNumber() const {return _header._receiverNumber;}
 
   void setInterval(double interval) {_header._interval = interval;}
   void setAntennaName(const QString& antennaName) {_header._antennaName = antennaName;}
+  void setAntennaNumber(const QString& antennaNumber) {_header._antennaNumber = antennaNumber;}
+  void setAntennaN(double antN) {_header._antNEU(1) = antN;}
+  void setAntennaE(double antE) {_header._antNEU(2) = antE;}
+  void setAntennaU(double antU) {_header._antNEU(3) = antU;}
+
   void setMarkerName(const QString& markerName) {_header._markerName = markerName;}
   void setReceiverType(const QString& receiverType) {_header._receiverType = receiverType;}
+  void setReceiverNumber(const QString& receiverNumber) {_header._receiverNumber = receiverNumber;}
 
   const ColumnVector& xyz() const {return _header._xyz;}