Changeset 11935 for trunk

Timestamp:

09/01/11 17:45:15 (13 years ago)

Author:

tbretz

Message:

Enabled button commands for bias control.

Location:

trunk/FACT++/gui

Files:

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

trunk/FACT++/gui/MainWindow.cc

@@ -567 +567 @@
 void MainWindow::on_fBiasVoltDac_valueChanged(int val)
 {
-    fBiasVolt->setValue(val*90/4096);
-/*
-    if (fBiasApplyGlobal->isChecked())
+    fBiasVolt->setValue(val*90./4096);
+}
+
+void MainWindow::on_fBiasRequestStatus_clicked()
+{
+    if (!fInHandler)
+        Dim::SendCommand("BIAS_CONTROL/REQUEST_STATUS");
+}
+
+void MainWindow::on_fBiasApplyReference_clicked()
+{
+    if (!fInHandler)
+        Dim::SendCommand("BIAS_CONTROL/SET_GAPD_REFERENCE_VOLTAGE");
+}
+
+void MainWindow::on_fBiasSetToZero_clicked()
+{
+    if (!fInHandler)
+        Dim::SendCommand("BIAS_CONTROL/SET_ZERO_VOLTAGE");
+}
+
+void MainWindow::on_fBiasReset_clicked()
+{
+    if (!fInHandler)
+        Dim::SendCommand("BIAS_CONTROL/RESET_OVER_CURRENT_STATUS");
+}
+
+void MainWindow::on_fBiasApply_clicked()
+{
+    const uint16_t cmd[2] =
     {
-        Dim::SendCommand("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(val));
-        return;
-    }
-
-    const int b = fBiasHvBoard->value();
-    const int c = fBiasHvChannel->value();
-
-    const uint16_t ihw = b*32+c;
-
-    const uint16_t dat[2] = { ihw, uint16_t(val) };
-    Dim::SendCommand("BIAS_CONTROL/SET_CHANNEL_DAC", dat);*/
-}
-
-void MainWindow::on_fBiasRequestStatus_clicked()
-{
-    Dim::SendCommand("BIAS_CONTROL/REQUEST_STATUS");
-}
-
-void MainWindow::on_fBiasApplyReference_clicked()
-{
-//    Dim::SendCommand("BIAS_CONTROL/APPLY_REFERENCE_VOLTAGE");
-}
-
-void MainWindow::on_fBiasSetToZero_clicked()
-{
-//    Dim::SendCommand("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(0));
-}
-
-void MainWindow::on_fBiasReset_clicked()
-{
-//    Dim::SendCommand("BIAS_CONTROL/RESET");
+        uint16_t(fBiasHvBoard->value()*32+fBiasHvChannel->value()),
+        uint16_t(fBiasVoltDac->value())
+    };
+
+    if (!fInHandler)
+        Dim::SendCommand("BIAS_CONTROL/SET_CHANNEL_DAC", cmd);
+}
+void MainWindow::on_fBiasApplyGlobal_clicked()
+{
+    if (!fInHandler)
+        Dim::SendCommand("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(fBiasVoltDac->value()));
 }
 

trunk/FACT++/gui/MainWindow.h

@@ -172 +172 @@
 
     void on_fBiasRequestStatus_clicked();
+    void on_fBiasApply_clicked();
+    void on_fBiasApplyGlobal_clicked();
     void on_fBiasApplyReference_clicked();
     void on_fBiasSetToZero_clicked();