Changeset 2938 in ntrip

Timestamp:

Jan 30, 2011, 12:53:57 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncantex.cpp (modified) (3 diffs)
• bncantex.h (modified) (1 diff)
• bncmodel.cpp (modified) (2 diffs)

trunk/BNC/bncantex.cpp

@@ -206 +206 @@
 // Phase Center Offset (Receiver Antenna and GPS only)
 ////////////////////////////////////////////////////////////////////////////
-double bncAntex::pco(const QString& antName, double eleSat) {
+double bncAntex::pco(const QString& antName, double eleSat, bool& found) {
 
   static const double f1 = t_CST::freq1;
@@ -215 +215 @@
   QMap<QString, t_antMap*>::const_iterator it = _maps.find(antName);
   if (it != _maps.end()) {
+    found = true;
     t_antMap* map = it.value();
     if (map->frqMapL1 && map->frqMapL2) {
@@ -222 +223 @@
     }
   }
+  else {
+    found = false;
+  }
 
   return 0.0;

trunk/BNC/bncantex.h

@@ -37 +37 @@
   t_irc readFile(const QString& fileName);  
   void print() const;
-  double pco(const QString& antName, double eleSat);
+  double pco(const QString& antName, double eleSat, bool& found);
 
  private:

trunk/BNC/bncmodel.cpp

@@ -264 +264 @@
     _antex = new bncAntex();
     if (_antex->readFile(antexFileName) != success) {
-      emit newMessage("wrong ANTEX file", false);
+      emit newMessage("wrong ANTEX file", true);
       delete _antex;
       _antex = 0;
     }
-    _antennaName = settings.value("pppAntenna").toString();
-  }
-
-////  if (_antex) {
-////    _antex->print();
-////  }
+    else {
+      _antennaName = settings.value("pppAntenna").toString();
+    }
+  }
 }
 
@@ -389 +387 @@
 
   double phaseCenter = 0.0;
-  if (_antex) {
-    phaseCenter = _antex->pco(_antennaName, satData->eleSat);
+  if (_antex) { 
+    bool found;
+    phaseCenter = _antex->pco(_antennaName, satData->eleSat, found);
+    if (!found) {
+      emit newMessage("ANTEX: antenna >" 
+                      + _antennaName.toAscii() + "< not found", true);
+    }
   }