Changeset 11925 for trunk/FACT++

Timestamp:

08/31/11 16:53:11 (13 years ago)

Author:

tbretz

Message:

Updated Bias control stuff, especially removed the sending of commands for the moment.

Location:

trunk/FACT++/gui

Files:

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

trunk/FACT++/gui/MainWindow.cc

@@ -567 +567 @@
 void MainWindow::on_fBiasVoltDac_valueChanged(int val)
 {
-    if (fInHandler)
-        return;
-
+    fBiasVolt->setValue(val*90/4096);
+/*
     if (fBiasApplyGlobal->isChecked())
     {
@@ -582 +581 @@
 
     const uint16_t dat[2] = { ihw, uint16_t(val) };
-    Dim::SendCommand("BIAS_CONTROL/SET_CHANNEL_DAC", dat);
+    Dim::SendCommand("BIAS_CONTROL/SET_CHANNEL_DAC", dat);*/
 }
 
@@ -592 +591 @@
 void MainWindow::on_fBiasApplyReference_clicked()
 {
-    Dim::SendCommand("BIAS_CONTROL/APPLY_REFERENCE_VOLTAGE");
+//    Dim::SendCommand("BIAS_CONTROL/APPLY_REFERENCE_VOLTAGE");
 }
 
 void MainWindow::on_fBiasSetToZero_clicked()
 {
-    Dim::SendCommand("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(0));
+//    Dim::SendCommand("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(0));
 }
 
 void MainWindow::on_fBiasReset_clicked()
 {
-    Dim::SendCommand("BIAS_CONTROL/RESET");
-}
-
-void MainWindow::on_fBiasMin_valueChanged(int min)
-{
-    fBiasCam->SetMin(min);
-}
-
-void MainWindow::on_fBiasMax_valueChanged(int max)
-{
-    fBiasCam->SetMax(max);
+//    Dim::SendCommand("BIAS_CONTROL/RESET");
+}
+
+void MainWindow::on_fBiasVoltMin_valueChanged(int min)
+{
+    fBiasCamV->SetMin(min);
+}
+
+void MainWindow::on_fBiasVoltMax_valueChanged(int max)
+{
+    fBiasCamV->SetMax(max);
+}
+
+void MainWindow::on_fBiasCurrentMin_valueChanged(int min)
+{
+    fBiasCamA->SetMin(min);
+}
+
+void MainWindow::on_fBiasCurrentMax_valueChanged(int max)
+{
+    fBiasCamA->SetMax(max);
 }
 

trunk/FACT++/gui/MainWindow.h

@@ -165 +165 @@
     void on_fBiasVoltDac_valueChanged(int);
 
-    void on_fBiasMin_valueChanged(int); // FIXME: Could be set as slot in the designer
-    void on_fBiasMax_valueChanged(int); // FIXME: Could be set as slot in the designer
+    void on_fBiasVoltMin_valueChanged(int); // FIXME: Could be set as slot in the designer
+    void on_fBiasVoltMax_valueChanged(int); // FIXME: Could be set as slot in the designer
+
+    void on_fBiasCurrentMin_valueChanged(int); // FIXME: Could be set as slot in the designer
+    void on_fBiasCurrentMax_valueChanged(int); // FIXME: Could be set as slot in the designer
 
     void on_fBiasRequestStatus_clicked();
@@ -172 +175 @@
     void on_fBiasSetToZero_clicked();
     void on_fBiasReset_clicked();
+
+    virtual void on_fBiasDispRefVolt_stateChanged(int) = 0;
 
     // Tab: Rates