Changeset 4990 in ntrip for trunk

Timestamp:

Mar 20, 2013, 10:31:52 AM (11 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bnccaster.cpp (modified) (1 diff)

trunk/BNC/src/bnccaster.cpp

@@ -338 +338 @@
   for (long sec = minTime; sec <= maxTime; sec++) {
 
-    QList<t_obs> allObs = _epochs->values(sec);
-
-    bool firstEpoLine = true;
-
-    QListIterator<t_obs> it(allObs);
-    while (it.hasNext()) {
-      const t_obs& obs = it.next();
-
-      if (_samplingRate == 0 || sec % _samplingRate == 0) {
-
-        if (_out || _sockets) {
-          ostringstream oStr;
-          oStr.setf(ios::showpoint | ios::fixed);
-          if (firstEpoLine) {
-            firstEpoLine = false;
-            oStr << "> " << obs.GPSWeek << ' ' 
-                 << setprecision(7) << obs.GPSWeeks << endl;;
-          }
-          oStr << obs.StatID << ' ' << bncRinex::asciiSatLine(obs) << endl;
-          if (!it.hasNext()) { 
-            oStr << endl;
-          }
-          string hlpStr = oStr.str();
-
-          // Output into the File
-          // --------------------
-          if (_out) {
-            *_out << hlpStr.c_str();
-            _out->flush();
-          }
-
-          // Output into the socket
-          // ----------------------
-          if (_sockets) {
-            QMutableListIterator<QTcpSocket*> is(*_sockets);
-            while (is.hasNext()) {
-              QTcpSocket* sock = is.next();
-              if (sock->state() == QAbstractSocket::ConnectedState) {
-                int numBytes = hlpStr.length(); 
-                if (myWrite(sock, hlpStr.c_str(), numBytes) != numBytes) {
-                  delete sock;
-                  is.remove();
-                }
-              }
-              else if (sock->state() != QAbstractSocket::ConnectingState) {
+    if ( (_out || _sockets) && 
+         (_samplingRate == 0 || sec % _samplingRate == 0) ) {
+
+      QList<t_obs> allObs = _epochs->values(sec);
+      
+      QListIterator<t_obs> it(allObs);
+      bool firstObs = true;
+      while (it.hasNext()) {
+        const t_obs& obs = it.next();
+
+        ostringstream oStr;
+        oStr.setf(ios::showpoint | ios::fixed);
+        if (firstObs) { 
+          firstObs = false;
+          oStr << "> " << obs.GPSWeek << ' ' 
+               << setprecision(7) << obs.GPSWeeks << endl;;
+        }
+        oStr << obs.StatID << ' ' << bncRinex::asciiSatLine(obs) << endl;
+        if (!it.hasNext()) { 
+          oStr << endl;
+        }
+        string hlpStr = oStr.str();
+
+        // Output into the File
+        // --------------------
+        if (_out) {
+          *_out << hlpStr.c_str();
+          _out->flush();
+        }
+
+        // Output into the socket
+        // ----------------------
+        if (_sockets) {
+          QMutableListIterator<QTcpSocket*> is(*_sockets);
+          while (is.hasNext()) {
+            QTcpSocket* sock = is.next();
+            if (sock->state() == QAbstractSocket::ConnectedState) {
+              int numBytes = hlpStr.length(); 
+              if (myWrite(sock, hlpStr.c_str(), numBytes) != numBytes) {
                 delete sock;
                 is.remove();
               }
             }
+            else if (sock->state() != QAbstractSocket::ConnectingState) {
+              delete sock;
+              is.remove();
+            }
           }
         }
       }
-
-      _epochs->remove(sec);
-    }
+    }
+    _epochs->remove(sec);
   }
 }