Index: trunk/FACT++/gui/MainWindow.cc
===================================================================
--- trunk/FACT++/gui/MainWindow.cc (revision 11113)
+++ trunk/FACT++/gui/MainWindow.cc (revision 11114)
@@ -148,50 +148,70 @@
}
-void MainWindow::slot_fFadStartRun_clicked()
+void MainWindow::on_fFadStartRun_clicked()
{
Dim::SendCommand("FAD_CONTROL/START_RUN");
}
-void MainWindow::slot_fFadStopRun_clicked()
+void MainWindow::on_fFadStopRun_clicked()
{
Dim::SendCommand("FAD_CONTROL/STOP_RUN");
}
-void MainWindow::slot_fFadSingleTrigger_clicked()
+void MainWindow::on_fFadDrsOn_clicked()
+{
+ Dim::SendCommand("FAD_CONTROL/ENABLE_DRS", uint8_t(true));
+}
+
+void MainWindow::on_fFadDrsOff_clicked()
+{
+ Dim::SendCommand("FAD_CONTROL/ENABLE_DRS", uint8_t(false));
+}
+
+void MainWindow::on_fFadDwriteOn_clicked()
+{
+ Dim::SendCommand("FAD_CONTROL/ENABLE_DWRITE", uint8_t(true));
+}
+
+void MainWindow::on_fFadDwriteOff_clicked()
+{
+ Dim::SendCommand("FAD_CONTROL/ENABLE_DWRITE", uint8_t(false));
+}
+
+void MainWindow::on_fFadSingleTrigger_clicked()
{
Dim::SendCommand("FAD_CONTROL/SEND_SINGLE_TRIGGER");
}
-void MainWindow::slot_fFadTriggerLineOn_clicked()
-{
- Dim::SendCommand("FAD_CONTROL/ENABLE_TRIGGER", uint8_t(true));
-}
-
-void MainWindow::slot_fFadTriggerLineOff_clicked()
-{
- Dim::SendCommand("FAD_CONTROL/ENABLE_TRIGGER", uint8_t(false));
-}
-
-void MainWindow::slot_fFadContTriggerOn_clicked()
+void MainWindow::on_fFadTriggerLineOn_clicked()
+{
+ Dim::SendCommand("FAD_CONTROL/ENABLE_TRIGGER_LINE", uint8_t(true));
+}
+
+void MainWindow::on_fFadTriggerLineOff_clicked()
+{
+ Dim::SendCommand("FAD_CONTROL/ENABLE_TRIGGER_LINE", uint8_t(false));
+}
+
+void MainWindow::on_fFadContTriggerOn_clicked()
{
Dim::SendCommand("FAD_CONTROL/CONTINOUS_TRIGGER_ON");
}
-void MainWindow::slot_fFadContTriggerOff_clicked()
+void MainWindow::on_fFadContTriggerOff_clicked()
{
Dim::SendCommand("FAD_CONTROL/CONTINOUS_TRIGGER_OFF");
}
-void MainWindow::slot_fFadStart_clicked()
+void MainWindow::on_fFadStart_clicked()
{
Dim::SendCommand("FAD_CONTROL/START");
}
-void MainWindow::slot_fFadStop_clicked()
+void MainWindow::on_fFadStop_clicked()
{
Dim::SendCommand("FAD_CONTROL/STOP");
}
-void MainWindow::slot_fFadAbort_clicked()
+void MainWindow::on_fFadAbort_clicked()
{
Dim::SendCommand("FAD_CONTROL/ABORT");
@@ -200,4 +220,5 @@
void MainWindow::slot_fFadLED_clicked()
{
+ cout << "clicked" << endl;
for (int32_t i=0; i<40; i++)
if (sender()==fFadLED[i])
Index: trunk/FACT++/gui/MainWindow.h
===================================================================
--- trunk/FACT++/gui/MainWindow.h (revision 11113)
+++ trunk/FACT++/gui/MainWindow.h (revision 11114)
@@ -47,16 +47,18 @@
// Tab: FAD
- void slot_fFadStartRun_clicked();
- void slot_fFadStopRun_clicked();
- void slot_fFadSingleTrigger_clicked();
- void slot_fFadTriggerLineOn_clicked();
- void slot_fFadTriggerLineOff_clicked();
- void slot_fFadContTriggerOn_clicked();
- void slot_fFadContTriggerOff_clicked();
- void slot_fFadStart_clicked();
- void slot_fFadStop_clicked();
- void slot_fFadAbort_clicked();
- void slot_fFadConnect_clicked();
- void slot_fFadDisconnect_clicked();
+ void on_fFadStartRun_clicked();
+ void on_fFadStopRun_clicked();
+ void on_fFadDrsOn_clicked();
+ void on_fFadDrsOff_clicked();
+ void on_fFadDwriteOn_clicked();
+ void on_fFadDwriteOff_clicked();
+ void on_fFadSingleTrigger_clicked();
+ void on_fFadTriggerLineOn_clicked();
+ void on_fFadTriggerLineOff_clicked();
+ void on_fFadContTriggerOn_clicked();
+ void on_fFadContTriggerOff_clicked();
+ void on_fFadStart_clicked();
+ void on_fFadStop_clicked();
+ void on_fFadAbort_clicked();
// Tab: FTM
Index: trunk/FACT++/gui/design.ui
===================================================================
--- trunk/FACT++/gui/design.ui (revision 11113)
+++ trunk/FACT++/gui/design.ui (revision 11114)
@@ -3497,4 +3497,11 @@
+ -
+
+
+ Run
+
+
+
@@ -5026,16 +5033,4 @@
QAbstractSpinBox::NoButtons
-
- QDateTimeEdit::HourSection
-
-
- hh:mm:ss
-
-
- false
-
-
- Qt::OffsetFromUTC
-
+
+
+ QDateTimeEdit::HourSection
+
+
+ hh:mm:ss
+
+
+ false
+
+
+ Qt::OffsetFromUTC
@@ -5168,16 +5175,4 @@
QAbstractSpinBox::NoButtons
-
- QDateTimeEdit::HourSection
-
-
- hh:mm:ss
-
-
- false
-
-
- Qt::OffsetFromUTC
-
+
+
+ QDateTimeEdit::HourSection
+
+
+ hh:mm:ss
+
+
+ false
+
+
+ Qt::OffsetFromUTC
@@ -6502,5 +6509,5 @@
223
- 320
+ 349
@@ -6675,5 +6682,5 @@
- -
+
-
@@ -6682,5 +6689,5 @@
- -
+
-
@@ -6707,5 +6714,5 @@
- -
+
-
@@ -6745,5 +6752,5 @@
- -
+
-
@@ -6797,5 +6804,5 @@
- -
+
-
@@ -6816,5 +6823,5 @@
- -
+
-
@@ -6867,4 +6874,151 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ FTU
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Offline
+
+
+
+ -
+
+
+ Scheduler
+
+
+
+ -
+
+
+ Offline
+
+
+
+ -
+
+
+
+ 18
+ 16777215
+
+
+
+
+
+
+
+ :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 18
+ 16777215
+
+
+
+
+
+
+
+ :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png
+
+
+
+ 16
+ 16
+
+
+
+ false
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 18
+ 16777215
+
+
+
+
+
+
+
+ :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png
+
+
+
+ 16
+ 16
+
+
+
+ false
+
+
+ true
+
+
+
+ -
+
+
+ Slow Control
+
+
+
+ -
+
+
+ Offline
+
+
+
-
@@ -6887,43 +7041,6 @@
- -
-
-
-
- 0
- 0
-
-
-
- FTU
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Offline
-
-
-
- -
-
-
- Scheduler
-
-
-
- -
-
-
- Offline
-
-
-
-
-
+
@@ -6938,80 +7055,4 @@
:/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png
-
-
- true
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
- 18
- 16777215
-
-
-
-
-
-
-
- :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png
-
-
-
- 16
- 16
-
-
-
- false
-
-
- true
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
- 18
- 16777215
-
-
-
-
-
-
-
- :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png
-
-
-
- 16
- 16
-
-
-
- false