Changeset 12522 for trunk/FACT++/gui

Timestamp:

11/15/11 14:09:51 (13 years ago)

Author:

tbretz

Message:

Added a new service FILE_FORMAT to distribute the file format currently switched on; added controlos and displays to set and see the file format.

Location:

trunk/FACT++/gui

Files:

• FactGui.h (modified) (10 diffs)
• MainWindow.cc (modified) (1 diff)
• MainWindow.h (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -418 +418 @@
     DimStampedInfo fDimFadStatistics1;
     DimStampedInfo fDimFadStatistics2;
+    DimStampedInfo fDimFadFileFormat;
 
     DimStampedInfo fDimFscTemp;
@@ -1390 +1391 @@
         fDrsCalibTrgOffset->setEnabled(fDrsCalibTrgOffset->value()>0);
         fDrsCalibROI->setEnabled(fDrsCalibROI->value()>0);
+
+        fDrsCalibBaseline2->setEnabled(fDrsCalibBaseline->value()>0);
+        fDrsCalibGain2->setEnabled(fDrsCalibGain->value()>0);
+        fDrsCalibTrgOffset2->setEnabled(fDrsCalibTrgOffset->value()>0);
+        fDrsCalibROI2->setEnabled(fDrsCalibROI->value()>0);
+
+        SetLedColor(fFadLedDrsBaseline, fDrsCalibBaseline->value()>0 ?kLedGreen:kLedGray, Time());
+        SetLedColor(fFadLedDrsGain,     fDrsCalibGain->value()>0     ?kLedGreen:kLedGray, Time());
+        SetLedColor(fFadLedDrsTrgOff,   fDrsCalibTrgOffset->value()>0?kLedGreen:kLedGray, Time());
 
         if (d0)//fDrsCalibBaseline->value()==0  || start<0)
@@ -1620 +1630 @@
             fDrsCalibTrgOffset->setValue(-1);
             fDrsCalibROI->setValue(-1);
+
+            fDrsCalibBaseline2->setValue(-1);
+            fDrsCalibGain2->setValue(-1);
+            fDrsCalibTrgOffset2->setValue(-1);
+            fDrsCalibROI2->setValue(-1);
+
             fDrsCalibration.assign(sz, 0);
             DisplayEventData();
@@ -1635 +1651 @@
         fDrsCalibGain->setValue(run[2]);
         fDrsCalibTrgOffset->setValue(run[3]);
+
+        fDrsCalibROI2->setValue(run[0]);
+        fDrsCalibBaseline2->setValue(run[1]);
+        fDrsCalibGain2->setValue(run[2]);
+        fDrsCalibTrgOffset2->setValue(run[3]);
 
         const float *dat = d.ptr<float>(sizeof(uint32_t)*4);
@@ -1946 +1967 @@
          uint8_t  numConn[NBOARDS] ;  //#Sockets succesfully open per board
          */
+    }
+
+    void handleFadFileFormat(const DimData &d)
+    {
+        if (!CheckSize(d, sizeof(uint16_t)))
+            return;
+
+        const uint16_t &fmt = d.get<uint16_t>();
+
+        SetLedColor(fFadLedFileFormatNone,  fmt==FAD::kNone ?kLedGreen:kLedGray, d.time);
+        SetLedColor(fFadLedFileFormatDebug, fmt==FAD::kDebug?kLedGreen:kLedGray, d.time);
+        SetLedColor(fFadLedFileFormatRaw,   fmt==FAD::kRaw  ?kLedGreen:kLedGray, d.time);
+        SetLedColor(fFadLedFileFormatFits,  fmt==FAD::kFits ?kLedGreen:kLedGray, d.time);
+        SetLedColor(fFadLedFileFormatCalib, fmt==FAD::kCalib?kLedGreen:kLedGray, d.time);
     }
 
@@ -2934 +2969 @@
             fStatusDriveLabel->setToolTip(s.comment.c_str());
 
-            bool enable = false;
-
             if (s.index<1) // No Dim connection
                 SetLedColor(fStatusDriveLed, kLedGray, time);
@@ -3303 +3336 @@
             return PostInfoHandler(&FactGui::handleFadStatistics2);
 
+        if (getInfo()==&fDimFadFileFormat)
+            return PostInfoHandler(&FactGui::handleFadFileFormat);
+
         if (getInfo()==&fDimFadEvents)
             return PostInfoHandler(&FactGui::handleFadEvents);
@@ -3625 +3661 @@
     }
 
+    /*
     void on_fThresholdIdx_valueChanged(int isw)
     {
         // fRatesCanv->SetBold(isw);
         // fRatesCanv->updateGL();
-    }
-
+    }*/
+
+    /*
     void UpdateThresholdIdx()
     {
@@ -3648 +3686 @@
 
         on_fThresholdIdx_valueChanged(isw);
-    }
+    }*/
 
     void on_fPixelIdx_valueChanged(int isw)
@@ -3945 +3983 @@
         fDimFadStatistics1     ("FAD_CONTROL/STATISTICS1",        (void*)NULL, 0, this),
         fDimFadStatistics2     ("FAD_CONTROL/STATISTICS2",        (void*)NULL, 0, this),
+        fDimFadFileFormat      ("FAD_CONTROL/FILE_FORMAT",        (void*)NULL, 0, this),
         //-
         fDimFscTemp            ("FSC_CONTROL/TEMPERATURE",        (void*)NULL, 0, this),

trunk/FACT++/gui/MainWindow.cc

@@ -318 +318 @@
 }
 
+void MainWindow::FadSetFileFormat(uint16_t fmt)
+{
+    Dim::SendCommand("FAD_CONTROL/SET_FILE_FORMAT", fmt);
+}
+
 void MainWindow::on_fFadStart_clicked()
 {

trunk/FACT++/gui/MainWindow.h

@@ -85 +85 @@
     void on_fFadSocket17_clicked();
 
+    void FadSetFileFormat(uint16_t fmt);
+
+    void on_fFadButtonFileFormatNone_clicked()  { FadSetFileFormat(0); }
+    void on_fFadButtonFileFormatDebug_clicked() { FadSetFileFormat(1); }
+    void on_fFadButtonFileFormatFits_clicked()  { FadSetFileFormat(2); }
+    void on_fFadButtonFileFormatRaw_clicked()   { FadSetFileFormat(3); }
+
     void on_fFadPrescalerCmd_valueChanged(int);
     void on_fFadRunNumberCmd_valueChanged(int);
@@ -103 +110 @@
     void on_fDrsCalibStart_clicked();
     void on_fDrsCalibReset_clicked();
+
+    void on_fDrsCalibStart2_clicked() { on_fDrsCalibStart_clicked(); }
+    void on_fDrsCalibReset2_clicked() { on_fDrsCalibReset_clicked(); }
 
     // Tab: Adc
@@ -200 +210 @@
 
     // Tab: Rates
-    virtual void UpdateThresholdIdx() = 0;
+    //virtual void UpdateThresholdIdx() = 0;
     virtual void on_fPixelIdx_valueChanged(int) = 0;
-    void on_fThresholdCrate_valueChanged(int) { UpdateThresholdIdx() ; }
-    void on_fThresholdBoard_valueChanged(int) { UpdateThresholdIdx() ; }
-    void on_fThresholdPatch_valueChanged(int) { UpdateThresholdIdx() ; }
+    //void on_fThresholdCrate_valueChanged(int) { UpdateThresholdIdx() ; }
+    //void on_fThresholdBoard_valueChanged(int) { UpdateThresholdIdx() ; }
+    //void on_fThresholdPatch_valueChanged(int) { UpdateThresholdIdx() ; }
 
     virtual void on_fPixelEnable_stateChanged(int) = 0;
     virtual void on_fThresholdVal_valueChanged(int) = 0;
-    virtual void on_fThresholdIdx_valueChanged(int) = 0;
+    //virtual void on_fThresholdIdx_valueChanged(int) = 0;
 
     virtual void on_fBoardRatesEnabled_toggled(bool) = 0;