Changeset 5486 in ntrip for trunk/GnssCenter/monitor

Timestamp:

Sep 18, 2013, 2:54:23 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/monitor

Files:

• monitor.cpp (modified) (5 diffs)
• monitor.h (modified) (4 diffs)
• thriftclient.cpp (modified) (1 diff)

trunk/GnssCenter/monitor/monitor.cpp

@@ -76 +76 @@
   _thriftClient = 0;
   _results      = 0;
+  _satellites   = 0;
 
   // Read Settings, Set Title, Enable/Disable Actions
@@ -95 +96 @@
     delete _results;
   }
+  if (_satellites) {
+    while (!_satellites->empty()) {
+      delete _satellites->back();
+      _satellites->pop_back();
+    }
+    delete _satellites;
+  }
 }
 
@@ -163 +171 @@
     connect(_thriftClient, SIGNAL(message(QByteArray)), this, SLOT(slotMessage(QByteArray)));
     _thriftClient->start();
-    slotPlotResults();
+    slotPlot();
   }
   enableActions();
@@ -202 +210 @@
 // 
 /////////////////////////////////////////////////////////////////////////////
-void t_monitor::slotPlotResults() {
+void t_monitor::putThriftSatellites(std::vector<t_thriftSatellite*>* satellites) {
   QMutexLocker locker(&_mutex);
-
+  if (_satellites) {
+    while (!_satellites->empty()) {
+      delete _satellites->back();
+      _satellites->pop_back();
+    }
+    delete _satellites;
+  }
+  _satellites = satellites;
+}
+
+// 
+/////////////////////////////////////////////////////////////////////////////
+void t_monitor::slotPlot() {
+  QMutexLocker locker(&_mutex);
+  plotResults();
+  plotSatellites();
+  if (_thriftClient) {
+    QTimer::singleShot(1000, this, SLOT(slotPlotResults()));
+  }
+}
+
+// 
+/////////////////////////////////////////////////////////////////////////////
+void t_monitor::plotResults() {
   if (_results) {
     QList<t_worldPlot::t_point*> points;
@@ -232 +263 @@
     }
   }
-
-  if (_thriftClient) {
-    QTimer::singleShot(1000, this, SLOT(slotPlotResults()));
-  }
-}
+}
+
+// 
+/////////////////////////////////////////////////////////////////////////////
+void t_monitor::plotSatellites() {
+  if (_satellites) {
+  }
+}

trunk/GnssCenter/monitor/monitor.h

@@ -11 +11 @@
   class t_thriftClient;
   class t_thriftResult;
+  class t_thriftSatellite;
 }
 
@@ -22 +23 @@
 
   void putThriftResults(std::vector<t_thriftResult*>* results);
+  void putThriftSatellites(std::vector<t_thriftSatellite*>* satellites);
 
  private slots:
@@ -28 +30 @@
   void slotStopThrift();
   void slotThriftFinished();
-  void slotPlotResults();
+  void slotPlot();
   void slotMessage(QByteArray msg);
 
@@ -35 +37 @@
   void setTitle();
   void enableActions();
-  QMutex                        _mutex;
-  QTabWidget*                   _tabWidget;
-  QAction*                      _actConfig;
-  QAction*                      _actStartThrift;
-  QAction*                      _actStopThrift;
-  QString                       _host;
-  QString                       _port;
-  t_thriftClient*               _thriftClient;
-  t_worldPlot*                  _plotStations;
-  t_worldPlot*                  _plotSatellites;
-  std::vector<t_thriftResult*>* _results;
+  void plotResults();
+  void plotSatellites();
+  QMutex                           _mutex;
+  QTabWidget*                      _tabWidget;
+  QAction*                         _actConfig;
+  QAction*                         _actStartThrift;
+  QAction*                         _actStopThrift;
+  QString                          _host;
+  QString                          _port;
+  t_thriftClient*                  _thriftClient;
+  t_worldPlot*                     _plotStations;
+  t_worldPlot*                     _plotSatellites;
+  std::vector<t_thriftResult*>*    _results;
+  std::vector<t_thriftSatellite*>* _satellites;
 };
 

trunk/GnssCenter/monitor/thriftclient.cpp

@@ -99 +99 @@
     satellite->_y   = sat.xyz.y;
     satellite->_z   = sat.xyz.z;
-    cout << satellite->_prn << ' ' << satellite->_x << endl;
+    satellites->push_back(satellite);
   }
+  _parent->putThriftSatellites(satellites);
 }