Changeset 1575 in ntrip

Timestamp:

Feb 11, 2009, 1:22:58 PM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (4 diffs)
• bncnetqueryv1.cpp (modified) (4 diffs)

trunk/BNC/bncgetthread.cpp

@@ -505 +505 @@
     if ( _miscMount == _staID || _miscMount == "ALL" ) {
 
-      // RTCMv3 message types
-      // --------------------
+      // RTCM message types
+      // ------------------
       for (int ii = 0; ii <_decoder->_typeList.size(); ii++) {
         QString type =  QString("%1 ").arg(_decoder->_typeList[ii]);
@@ -519 +519 @@
       }
 
-      // Antenna Coordinates
-      // -------------------
+      // RTCM Antenna Coordinates
+      // ------------------------
       for (int ii=0; ii <_decoder->_antList.size(); ii++) {
         QByteArray antT;
@@ -529 +529 @@
           antT = "APC";
         }
+        QByteArray ant1, ant2, ant3;
+        ant1 = QString("%1 ").arg(_decoder->_antList[ii].xx,0,'f',4).toAscii();
+        ant2 = QString("%1 ").arg(_decoder->_antList[ii].yy,0,'f',4).toAscii();
+        ant3 = QString("%1 ").arg(_decoder->_antList[ii].zz,0,'f',4).toAscii();
+        emit(newMessage(_staID + ": " + antT + " (ITRF) X " + ant1 + "m", true));
+        emit(newMessage(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true));
+        emit(newMessage(_staID + ": " + antT + " (ITRF) Z " + ant3 + "m", true));
+        if (_decoder->_antList[ii].height_f) {
+          QByteArray ant4 = QString("%1 ").arg(_decoder->_antList[ii].height,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, 
@@ -535 +546 @@
     }
   }
-      
+
   _decoder->_typeList.clear();
   _decoder->_antType.clear();

trunk/BNC/bncnetqueryv1.cpp

@@ -68 +68 @@
         _socket = 0;
         _status = error;
-        emit newMessage(_url.path().toAscii() + " read timeout", true);
+        emit newMessage(_url.path().toAscii() + ": Read timeout", true);
         return;
       }
@@ -149 +149 @@
     _socket = 0;
     _status = error;
-    emit newMessage(_url.path().toAscii() + " write timeout", true);
+    emit newMessage(_url.path().toAscii() + ": Write timeout", true);
     return;
   }
@@ -161 +161 @@
       _socket = 0;
       _status = error;
-      emit newMessage(_url.path().toAscii() + " response timeout", true);
+      emit newMessage(_url.path().toAscii() + ": Response timeout", true);
       return;
     }
@@ -181 +181 @@
     _socket = 0;
     _status = error;
-    emit newMessage(_url.path().toAscii() + " wrong caster response\n" +
-                    response.join("\n").toAscii(), true);
+    emit newMessage(_url.path().toAscii() + ": Wrong caster response\n" +
+                    response.join("").toAscii(), true);
   }
 }