Changeset 12374 for trunk

Timestamp:

11/04/11 19:06:39 (13 years ago)

Author:

tbretz

Message:

Set the region of interest for channel 9 in addition, enabled the RoiCh9 controls.

Location:

trunk/FACT++/gui

Files:

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

trunk/FACT++/gui/MainWindow.cc

@@ -363 +363 @@
 }
 
-void MainWindow::on_fFadRoiCmd_valueChanged(int val)
-{
-    const int32_t vals[2] = { -1, val };
-    Dim::SendCommand("FAD_CONTROL/SET_REGION_OF_INTEREST", vals);
+void MainWindow::on_fFadRoiCmd_valueChanged(int)
+{
+    const int32_t vals1[2] = { -1, fFadRoiCmd->value() };
+    Dim::SendCommand("FAD_CONTROL/SET_REGION_OF_INTEREST", vals1);
+
+    const int32_t vals2[2] = { 8,  fFadRoiCh9Cmd->value() };
+    Dim::SendCommand("FAD_CONTROL/SET_REGION_OF_INTEREST", vals2);
 }
 

trunk/FACT++/gui/MainWindow.h

@@ -87 +87 @@
     void on_fFadPrescalerCmd_valueChanged(int);
     void on_fFadRunNumberCmd_valueChanged(int);
-    void on_fFadRoiCmd_valueChanged(int);
+    void on_fFadRoiCmd_valueChanged(int = 0);
+    void on_fFadRoiCh9Cmd_valueChanged(int) { on_fFadRoiCmd_valueChanged(); }
 
     void FadDacCmd_valueChanged(uint16_t, uint16_t);