Changeset 10540 for trunk/FACT++

Timestamp:

05/03/11 18:26:51 (14 years ago)

Author:

tbretz

Message:

Send SetThreshold if a value is changed.

Location:

trunk/FACT++/gui

Files:

• MainWindow.cc (modified) (5 diffs)
• MainWindow.h (modified) (1 diff)

trunk/FACT++/gui/MainWindow.cc

@@ -10 +10 @@
 
 using namespace std;
+
+namespace Dim
+{
+static bool SendCommand(const char *command)
+{
+    return DimClient::sendCommand(command, NULL, 0);
+}
+
+template<typename T>
+static bool SendCommand(const char *command, const T &t)
+{
+    return DimClient::sendCommand(command, (void*)&t, sizeof(t));
+}
+}
 
 MainWindow::MainWindow(QWidget *p) : QMainWindow(p)
@@ -67 +81 @@
 }
 
+
 void MainWindow::on_fShutdown_clicked()
 {
-    DimClient::sendCommand("DIS_DNS/KILL_SERVERS", NULL, 0);
+    Dim::SendCommand("DIS_DNS/KILL_SERVERS");
 }
 
@@ -75 +90 @@
 void MainWindow::on_fShutdownAll_clicked()
 {
-    DimClient::sendCommand("DIS_DNS/KILL_SERVERS", NULL, 0);
-    DimClient::sendCommand("DIS_DNS/EXIT",         1);
+    Dim::SendCommand("DIS_DNS/KILL_SERVERS");
+    Dim::SendCommand("DIS_DNS/EXIT", int(1));
 }
 
@@ -106 +121 @@
 }
 
+void MainWindow::on_fThresholdVal_valueChanged(int v)
+{
+    fThresholdVolt->setValue(2500./4095*v);
+
+    const int32_t d[2] = { fThresholdIdx->value(), v };
+    Dim::SendCommand("FTM_CONTROL/SET_THRESHOLD", d);
+}
+
 
 void MainWindow::on_fChatSend_clicked()
 {
-    if (DimClient::sendCommand("CHAT/MSG", fChatMessage->displayText().toStdString().c_str()))
+    if (Dim::SendCommand("CHAT/MSG", fChatMessage->displayText().constData()))
         fChatMessage->clear();
 }
@@ -138 +161 @@
 {
     if (checked)
-        DimClient::sendCommand("FTM_CONTROL/PING", NULL, 0);
+        Dim::SendCommand("FTM_CONTROL/PING");
 }

trunk/FACT++/gui/MainWindow.h

@@ -78 +78 @@
 
     // Tab: Rates
-    void on_fThresholdVal_valueChanged(int v) { fThresholdVolt->setValue(2500./4095*v); }
+    void on_fThresholdVal_valueChanged(int v);
     virtual void on_fThresholdIdx_valueChanged(int) { }