Changeset 5455 in ntrip

Timestamp:

Sep 15, 2013, 9:58:01 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/monitor

Files:

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

trunk/GnssCenter/monitor/dlgconf.cpp

@@ -24 +24 @@
 // Constructor
 /////////////////////////////////////////////////////////////////////////////
-t_dlgConf::t_dlgConf() : QDialog() {
+t_dlgConf::t_dlgConf(QWidget* parent) : QDialog(parent) {
 }
 

trunk/GnssCenter/monitor/dlgconf.h

@@ -9 +9 @@
  Q_OBJECT
  public:
-  t_dlgConf();
+  t_dlgConf(QWidget* parent);
   ~t_dlgConf();
  private:

trunk/GnssCenter/monitor/monitor.cpp

@@ -29 +29 @@
 
 #include "monitor.h"
+#include "dlgconf.h"
 #include "utils.h"
 #include "worldplot.h"
@@ -56 +57 @@
   addToolBar(Qt::BottomToolBarArea, toolBar);
 
-  QAction* actStartThrift = new QAction("Start Thrift", 0);
-  toolBar->addAction(actStartThrift);
-  connect(actStartThrift, SIGNAL(triggered()), this, SLOT(slotStartThrift()));
+  _actConfig = new QAction("Config", 0);
+  toolBar->addAction(_actConfig);
+  connect(_actConfig, SIGNAL(triggered()), this, SLOT(slotConfig()));
 
-  QAction* actStopThrift = new QAction("Stop Thrift", 0);
-  toolBar->addAction(actStopThrift);
-  connect(actStopThrift, SIGNAL(triggered()), this, SLOT(slotStopThrift()));
+  _actStartThrift = new QAction("Start", 0);
+  toolBar->addAction(_actStartThrift);
+  connect(_actStartThrift, SIGNAL(triggered()), this, SLOT(slotStartThrift()));
+
+  _actStopThrift = new QAction("Stop", 0);
+  toolBar->addAction(_actStopThrift);
+  connect(_actStopThrift, SIGNAL(triggered()), this, SLOT(slotStopThrift()));
 
   // Host and Port
@@ -88 +93 @@
     delete _results;
   }
+}
+
+// 
+/////////////////////////////////////////////////////////////////////////////
+void t_monitor::slotConfig() {
+  t_dlgConf dlg(this);
+  dlg.exec();
 }
 

trunk/GnssCenter/monitor/monitor.h

@@ -25 +25 @@
 
  private slots:
+  void slotConfig();
   void slotStartThrift();
   void slotStopThrift();
@@ -33 +34 @@
   QMutex                        _mutex;
   QTabWidget*                   _tabWidget;
+  QAction*                      _actConfig;
+  QAction*                      _actStartThrift;
+  QAction*                      _actStopThrift;
   t_worldPlot*                  _plot;
   t_thriftClient*               _thriftClient;