Changeset 10568 for trunk/FACT++

Timestamp:

05/04/11 15:13:15 (13 years ago)

Author:

tbretz

Message:

Some small fixes.

Location:

trunk/FACT++/gui

Files:

• MainWindow.cc (modified) (2 diffs)
• MainWindow.h (modified) (2 diffs)

trunk/FACT++/gui/MainWindow.cc

@@ -129 +129 @@
 }
 
-void on_fTriggerInterval_valueChanged(int val)
+void MainWindow::on_fTriggerInterval_valueChanged(int val)
 {
-    Dim::SendCommand("FTM_CONTROL/SET_TRIGGER_INTERVAL", val);
+    Dim::SendCommand("FTM_CONTROL/SET_TRIGGER_INTERVAL", val/4-2);
 }
 
-void on_fTriggerDelay_valueChanged(int val)
+void MainWindow::on_fTriggerDelay_valueChanged(int val)
 {
-    Dim::SendCommand("FTM_CONTROL/SET_TRIGGER_DELAY", val);
+    Dim::SendCommand("FTM_CONTROL/SET_TRIGGER_DELAY", val/4-2);
 }
 
-void on_fTimeMarkerDelay_valueChanged(int val)
+void MainWindow::on_fTimeMarkerDelay_valueChanged(int val)
 {
-    Dim::SendCommand("FTM_CONTROL/SET_TIME_MARKER_DELAY", val);
+    Dim::SendCommand("FTM_CONTROL/SET_TIME_MARKER_DELAY", val/4-2);
 }
 
-void on_fDeadTime_valueChanged(int val)
+void MainWindow::on_fDeadTime_valueChanged(int val)
 {
-    Dim::SendCommand("FTM_CONTROL/SET_DEAD_TIME", val);
+    cout << "===> " << val << endl;
+    Dim::SendCommand("FTM_CONTROL/SET_DEAD_TIME", val/4-2);
 }
 
@@ -188 +189 @@
 void MainWindow::on_fStatusFTULed_clicked()
 {
-    SelectTab("FTU");
+    SelectTab("FTUs");
 }
 

trunk/FACT++/gui/MainWindow.h

@@ -51 +51 @@
     void on_fTriggerSeqLP2_valueChanged(int) { }
 
-    void on_fTriggerInterval_valueChanged(int) { }
 
     void on_fPhysicsCoincidence_valueChanged(int) { }
@@ -59 +58 @@
     void on_fCalibWindow_valueChanged(int) { }
 
-    void on_fTriggerDelay_valueChanged(int) { }
-    void on_fTimeMarkerDelay_valueChanged(int) { }
-    void on_fDeadTime_valueChanged(int) { }
+    void on_fTriggerInterval_valueChanged(int);
+    void on_fTriggerDelay_valueChanged(int);
+    void on_fTimeMarkerDelay_valueChanged(int);
+    void on_fDeadTime_valueChanged(int);
 
     void on_fClockCondR0_valueChanged(int) { }