Changeset 5474 in ntrip

Timestamp:

Sep 18, 2013, 12:14:33 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/monitor

Files:

• monitor.cpp (modified) (6 diffs)
• monitor.h (modified) (2 diffs)

trunk/GnssCenter/monitor/monitor.cpp

@@ -69 +69 @@
   connect(_actStopThrift, SIGNAL(triggered()), this, SLOT(slotStopThrift()));
 
-  // Window title
-  // ------------
-  setTitle();
-
   // Thrift Client;
   // --------------
   _thriftClient = 0;
   _results      = 0;
+
+  // Read Settings, Set Title, Enable/Disable Actions
+  // ------------------------------------------------
+  readSettings();
+  setTitle();
+  enableActions();
 }
 
@@ -92 +94 @@
 }
 
+// Read Settings
+/////////////////////////////////////////////////////////////////////////////
+void t_monitor::readSettings() {
+  t_settings settings(pluginName);
+  _host = settings.value("host").toString();
+  if (_host.isEmpty()) {
+    _host = "localhost";
+  }
+  _port = settings.value("port").toString();
+}
+
 // Set title
 /////////////////////////////////////////////////////////////////////////////
 void t_monitor::setTitle() {
-  t_settings settings(pluginName);
-  QString host = settings.value("host").toString();
-  if (host.isEmpty()) {
-    host = "localhost";
-  }
-  QString port = settings.value("port").toString();
-  if (port.isEmpty()) {
+  if (_port.isEmpty()) {
     setWindowTitle(QString(pluginName));
-    _actStartThrift->setEnabled(false);
-    _actStopThrift->setEnabled(false);
   }
   else {
-    _actStartThrift->setEnabled(true);
-    _actStopThrift->setEnabled(false);
-    setWindowTitle(QString(pluginName) + "   " + host + ':' + port);
-  }
+    setWindowTitle(QString(pluginName) + "   " + _host + ':' + _port);
+  }
+}
+
+// Enable/Disable Actions
+/////////////////////////////////////////////////////////////////////////////
+void t_monitor::enableActions() {
+  _actConfig->setEnabled(true);
+  _actStartThrift->setEnabled(true);
+  _actStopThrift->setEnabled(true);
 }
 
@@ -118 +129 @@
   t_dlgConf dlg(this);
   dlg.exec();
+  readSettings();
   setTitle();
+  enableActions();
 }
 
@@ -124 +137 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_monitor::slotStartThrift() {
-  _actConfig->setEnabled(false);
-  _actStartThrift->setEnabled(false);
-  _actStopThrift->setEnabled(true);
+  enableActions();
   if (!_thriftClient) {
-    t_settings settings(pluginName);
-    QString host = settings.value("host").toString();
-    if (host.isEmpty()) {
-      host = "localhost";
-    }
-    int port = settings.value("port").toInt();
-    _thriftClient = new t_thriftClient(this, host, port);
+    _thriftClient = new t_thriftClient(this, _host, _port.toInt());
     connect(_thriftClient, SIGNAL(finished()), this, SLOT(slotThriftFinished()));
     _thriftClient->start();
@@ -144 +149 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_monitor::slotStopThrift() {
-  _actStopThrift->setEnabled(false);
+  enableActions();
   if (_thriftClient) {
     _thriftClient->stop();
@@ -154 +159 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_monitor::slotThriftFinished() {
-  _actConfig->setEnabled(true);
-  _actStartThrift->setEnabled(true);
-  _actStopThrift->setEnabled(false);
+  enableActions();
   sender()->deleteLater();
   _thriftClient = 0;

trunk/GnssCenter/monitor/monitor.h

@@ -31 +31 @@
 
  private:
+  void readSettings();
   void setTitle();
+  void enableActions();
   QMutex                        _mutex;
   QTabWidget*                   _tabWidget;
@@ -38 +40 @@
   QAction*                      _actStopThrift;
   t_worldPlot*                  _plot;
+  QString                       _host;
+  QString                       _port;
   t_thriftClient*               _thriftClient;
   std::vector<t_thriftResult*>* _results;