Changeset 3595 in ntrip

Timestamp:

Jan 21, 2012, 1:56:25 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (2 diffs)
• bncgetthread.h (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -725 +725 @@
         emit(newMessage(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true));
         emit(newMessage(_staID + ": " + antT + " (ITRF) Z " + ant3 + "m", true));
+        double hh = 0.0;
         if (decoder()->_antList[ii].height_f) {
-          QByteArray ant4 = QString("%1 ").arg(decoder()->_antList[ii].height,0,'f',4).toAscii();
+          hh = decoder()->_antList[ii].height;
+          QByteArray ant4 = QString("%1 ").arg(hh,0,'f',4).toAscii();
           emit(newMessage(_staID + ": Antenna height above marker "  + ant4 + "m", true));
         }
         emit(newAntCrd(_staID, decoder()->_antList[ii].xx, 
                        decoder()->_antList[ii].yy, decoder()->_antList[ii].zz, 
-                       antT));
+                       hh, antT));
       }
     }
@@ -745 +747 @@
           antT = "APC";
         }
+        double hh = 0.0;
+        if (decoder()->_antList[ii].height_f) {
+          hh = decoder()->_antList[ii].height;
+        }
         emit(newAntCrd(_staID, decoder()->_antList[ii].xx, 
                        decoder()->_antList[ii].yy, decoder()->_antList[ii].zz, 
-                       antT));
+                       hh, antT));
   }
 

trunk/BNC/bncgetthread.h

@@ -82 +82 @@
    void newLatency(QByteArray staID, double clate);
    void newObs(QByteArray staID, bool firstObs, t_obs obs);
-   void newAntCrd(QByteArray staID, double xx, double yy, double zz, QByteArray antType);
+   void newAntCrd(QByteArray staID, double xx, double yy, double zz, 
+                  double hh, QByteArray antType);
    void newMessage(QByteArray msg, bool showOnScreen);
    void newRTCMMessage(QByteArray staID, int msgID);