Changeset 10568


Ignore:
Timestamp:
May 4, 2011, 3:13:15 PM (9 years ago)
Author:
tbretz
Message:
Some small fixes.
Location:
trunk/FACT++/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/gui/MainWindow.cc

    r10557 r10568  
    129129}
    130130
    131 void on_fTriggerInterval_valueChanged(int val)
     131void MainWindow::on_fTriggerInterval_valueChanged(int val)
    132132{
    133     Dim::SendCommand("FTM_CONTROL/SET_TRIGGER_INTERVAL", val);
     133    Dim::SendCommand("FTM_CONTROL/SET_TRIGGER_INTERVAL", val/4-2);
    134134}
    135135
    136 void on_fTriggerDelay_valueChanged(int val)
     136void MainWindow::on_fTriggerDelay_valueChanged(int val)
    137137{
    138     Dim::SendCommand("FTM_CONTROL/SET_TRIGGER_DELAY", val);
     138    Dim::SendCommand("FTM_CONTROL/SET_TRIGGER_DELAY", val/4-2);
    139139}
    140140
    141 void on_fTimeMarkerDelay_valueChanged(int val)
     141void MainWindow::on_fTimeMarkerDelay_valueChanged(int val)
    142142{
    143     Dim::SendCommand("FTM_CONTROL/SET_TIME_MARKER_DELAY", val);
     143    Dim::SendCommand("FTM_CONTROL/SET_TIME_MARKER_DELAY", val/4-2);
    144144}
    145145
    146 void on_fDeadTime_valueChanged(int val)
     146void MainWindow::on_fDeadTime_valueChanged(int val)
    147147{
    148     Dim::SendCommand("FTM_CONTROL/SET_DEAD_TIME", val);
     148    cout << "===> " << val << endl;
     149    Dim::SendCommand("FTM_CONTROL/SET_DEAD_TIME", val/4-2);
    149150}
    150151
     
    188189void MainWindow::on_fStatusFTULed_clicked()
    189190{
    190     SelectTab("FTU");
     191    SelectTab("FTUs");
    191192}
    192193
  • trunk/FACT++/gui/MainWindow.h

    r10557 r10568  
    5151    void on_fTriggerSeqLP2_valueChanged(int) { }
    5252
    53     void on_fTriggerInterval_valueChanged(int) { }
    5453
    5554    void on_fPhysicsCoincidence_valueChanged(int) { }
     
    5958    void on_fCalibWindow_valueChanged(int) { }
    6059
    61     void on_fTriggerDelay_valueChanged(int) { }
    62     void on_fTimeMarkerDelay_valueChanged(int) { }
    63     void on_fDeadTime_valueChanged(int) { }
     60    void on_fTriggerInterval_valueChanged(int);
     61    void on_fTriggerDelay_valueChanged(int);
     62    void on_fTimeMarkerDelay_valueChanged(int);
     63    void on_fDeadTime_valueChanged(int);
    6464
    6565    void on_fClockCondR0_valueChanged(int) { }
Note: See TracChangeset for help on using the changeset viewer.