Changeset 10752 for trunk/FACT++

Timestamp:

05/19/11 08:56:39 (13 years ago)

Author:

tbretz

Message:

Connected output lines of FTM, enable/disable pixel and some first FAD stuff.

Location:

trunk/FACT++/gui

Files:

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

trunk/FACT++/gui/MainWindow.cc

@@ -224 +224 @@
 }
 
-void MainWindow::on_fPixelEnable_stateChanged(bool b)
-{
-    if (fInHandler)
-        return;
-
-    const uint16_t idx = fPixelIdx->value();
-
-    const uint8_t d[3] = { uint8_t(idx&0xff), uint8_t(idx>>8), !b };
-
-    Dim::SendCommand("FTM_CONTROL/DISABLE_PIXEL", d);
-}
-
-void MainWindow::on_fEnableTrigger_stateChanged(bool b)
-{
-    if (!fInHandler)
-        Dim::SendCommand("FTM_CONTROL/ENABLE_TRIGGER", b);
-}
-
-void MainWindow::on_fEnableExt1_stateChanged(bool b)
-{
-    if (!fInHandler)
-        Dim::SendCommand("FTM_CONTROL/ENABLE_EXT1", b);
-}
-
-void MainWindow::on_fEnableExt2_stateChanged(bool b)
-{
-    if (!fInHandler)
-        Dim::SendCommand("FTM_CONTROL/ENABLE_EXT2", b);
-}
-
-void MainWindow::on_fEnableTimeMarker_stateChanged(bool b)
-{
-    if (!fInHandler)
-        Dim::SendCommand("FTM_CONTROL/ENABLE_TIM", b);
-}
-
-void MainWindow::on_fEnableVeto_stateChanged(bool b)
-{
-    if (!fInHandler)
-        Dim::SendCommand("FTM_CONTROL/ENABLE_VETO", b);
+void MainWindow::on_fPixelEnable_stateChanged(int b)
+{
+    cout << "PIXEL: " << fPixelIdx->value() << " " << b << endl;
+    if (!fInHandler)
+        Dim::SendCommand(b==Qt::Unchecked ?
+                         "FTM_CONTROL/DISABLE_PIXEL" : "FTM_CONTROL/ENABLE_PIXEL",
+                         uint16_t(fPixelIdx->value()));
+}
+
+void MainWindow::on_fEnableTrigger_stateChanged(int b)
+{
+    if (!fInHandler)
+        Dim::SendCommand("FTM_CONTROL/ENABLE_TRIGGER", b==Qt::Checked);
+}
+
+void MainWindow::on_fEnableExt1_stateChanged(int b)
+{
+    if (!fInHandler)
+        Dim::SendCommand("FTM_CONTROL/ENABLE_EXT1", b==Qt::Checked);
+}
+
+void MainWindow::on_fEnableExt2_stateChanged(int b)
+{
+    if (!fInHandler)
+        Dim::SendCommand("FTM_CONTROL/ENABLE_EXT2", b==Qt::Checked);
+}
+
+void MainWindow::on_fEnableClockCond_stateChanged(int b)
+{
+    if (!fInHandler)
+        Dim::SendCommand("FTM_CONTROL/ENABLE_CLOCK_CONDITIONER", b==Qt::Checked);
+}
+
+void MainWindow::on_fEnableVeto_stateChanged(int b)
+{
+    if (!fInHandler)
+        Dim::SendCommand("FTM_CONTROL/ENABLE_VETO", b==Qt::Checked);
 }
 
@@ -307 +304 @@
     SelectTab("FTUs");
 }
+
+void MainWindow::on_fStatusFADLed_clicked()
+{
+    SelectTab("FAD");
+}

trunk/FACT++/gui/MainWindow.h

@@ -34 +34 @@
     void on_fStatusFTULed_clicked();
     void on_fStatusFTMLed_clicked();
+    void on_fStatusFADLed_clicked();
     void on_fStatusLoggerLed_clicked();
     void on_fStatusChatLed_clicked();
@@ -43 +44 @@
 
     // Tab: FTM
-    void on_fEnableTrigger_stateChanged(bool);
-    void on_fEnableExt1_stateChanged(bool);
-    void on_fEnableExt2_stateChanged(bool);
-    void on_fEnableTimeMarker_stateChanged(bool);
-    void on_fEnableVeto_stateChanged(bool);
+    void on_fEnableTrigger_stateChanged(int);
+    void on_fEnableExt1_stateChanged(int);
+    void on_fEnableExt2_stateChanged(int);
+    void on_fEnableClockCond_stateChanged(int);
+    void on_fEnableVeto_stateChanged(int);
 
     void on_fTriggerSeqPed_valueChanged(int)   { SetTriggerSequence(); }
@@ -79 +80 @@
 
     // Tab: Rates
-    void on_fThresholdVal_valueChanged(int v);
+    void on_fPixelEnable_stateChanged(int);
+    void on_fThresholdVal_valueChanged(int);
     virtual void on_fThresholdIdx_valueChanged(int) { }
     virtual void on_fPixelIdx_valueChanged(int) { }
-    void on_fPixelEnable_stateChanged(bool);
+
+    virtual void on_fRatePatch1_valueChanged(int) { }
+    virtual void on_fRatePatch2_valueChanged(int) { }
+    virtual void on_fRateBoard1_valueChanged(int) { }
+    virtual void on_fRateBoard2_valueChanged(int) { }
 
     // Tab: Chat