Changeset 5452 in ntrip for trunk/GnssCenter/monitor

Timestamp:

Sep 14, 2013, 3:28:51 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/monitor

Files:

• monitor.cpp (modified) (3 diffs)
• monitor.h (modified) (2 diffs)
• monitor.pro (modified) (1 diff)
• thriftclient.cpp (modified) (1 diff)
• thriftclient.h (modified) (3 diffs)

trunk/GnssCenter/monitor/monitor.cpp

@@ -32 +32 @@
 #include "worldplot.h"
 #include "thriftclient.h"
+#include "settings.h"
 
 using namespace std;
@@ -63 +64 @@
   connect(actStopThrift, SIGNAL(triggered()), this, SLOT(slotStopThrift()));
 
+  // Host and Port
+  // -------------
+  t_settings settings;
+  settings.beginGroup(pluginName);
+  settings.setValue("host", "rtnet.rtcm-ntrip.org");
+  settings.setValue("port", 7777);
+  settings.endGroup();
+  settings.sync();
+
   // Thrift Client;
   // --------------
@@ -86 +96 @@
 void t_monitor::slotStartThrift() {
   if (!_thriftClient) {
-    _thriftClient = new t_thriftClient(this);
+    t_settings settings;
+    settings.beginGroup(pluginName);
+    QString host = settings.value("host").toString();
+    int     port = settings.value("port").toInt();
+    settings.endGroup();
+    _thriftClient = new t_thriftClient(this, host, port);
     connect(_thriftClient, SIGNAL(finished()), this, SLOT(slotThriftFinished()));
     _thriftClient->start();

trunk/GnssCenter/monitor/monitor.h

@@ -13 +13 @@
 
 namespace GnssCenter {
+
+const static QString pluginName = "RTNet Monitor";
 
 class t_monitor : public QMainWindow {
@@ -41 +43 @@
  public:
   virtual QWidget* create() {return new t_monitor();} 
-  virtual QString getName() const {return QString("RTNet Monitor");}
+  virtual QString getName() const {return pluginName;}
 };
 

trunk/GnssCenter/monitor/monitor.pro

@@ -35 +35 @@
             worldplot.cpp    \
             thriftclient.cpp \
+            ../main/settings.cpp \
             gen-cpp/RtnetData.cpp \
             gen-cpp/rtnet_constants.cpp gen-cpp/rtnet_types.cpp \

trunk/GnssCenter/monitor/thriftclient.cpp

@@ -20 +20 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_thriftClient::t_thriftClient(t_monitor* parent) {
+t_thriftClient::t_thriftClient(t_monitor* parent, const QString& host, int port) {
   _stop   = false;
   _parent = parent;
+  _host   = host.toAscii().data();
+  _port   = port;
 }
 

trunk/GnssCenter/monitor/thriftclient.h

@@ -4 +4 @@
 #include <string>
 #include <map>
+#include <QString>
 #include <QThread>
 #include <QMutex>
@@ -66 +67 @@
 class t_thriftClient : public QThread {
  public:
-  t_thriftClient(t_monitor* parent);
+  t_thriftClient(t_monitor* parent, const QString& host, int port);
   ~t_thriftClient();
   virtual void run();
@@ -75 +76 @@
 
  private:
-  QMutex     _mutex;
-  t_monitor* _parent;
-  bool       _stop;
+  QMutex      _mutex;
+  std::string _host;
+  int         _port;
+  t_monitor*  _parent;
+  bool        _stop;
 };