Changeset 11419 for trunk

Timestamp:

07/15/11 15:23:12 (13 years ago)

Author:

tbretz

Message:

Added prescaler stuff.

Location:

trunk/FACT++/gui

Files:

• FactGui.h (modified) (5 diffs)
• design.ui (modified) (5 diffs)

trunk/FACT++/gui/FactGui.h

@@ -394 +394 @@
     DimStampedInfo fDimFadDNA;
     DimStampedInfo fDimFadTemperature;
+    DimStampedInfo fDimFadPrescaler;
     DimStampedInfo fDimFadRefClock;
     DimStampedInfo fDimFadStatus;
@@ -1003 +1004 @@
         if (ptr[0]==0)
             fEvtBldFilename->setText("");
-
     }
 
@@ -1293 +1293 @@
     {
         handleFadMinMax<uint32_t, QSpinBox>(d, fFadLedRunNumber, fFadRunNumber);
+    }
+
+    void handleFadPrescaler(const DimData &d)
+    {
+        handleFadMinMax<uint16_t, QSpinBox>(d, fFadLedPrescaler, fFadPrescaler);
     }
 
@@ -2304 +2309 @@
         if (getInfo()==&fDimFadRefClock)
             return PostInfoHandler(&FactGui::handleFadRefClock);
+
+        if (getInfo()==&fDimFadPrescaler)
+            return PostInfoHandler(&FactGui::handleFadPrescaler);
 
         if (getInfo()==&fDimFadStatus)
@@ -2755 +2763 @@
         fDimFadDNA             ("FAD_CONTROL/DNA",              (void*)NULL, 0, this),
         fDimFadTemperature     ("FAD_CONTROL/TEMPERATURE",      (void*)NULL, 0, this),
+        fDimFadPrescaler       ("FAD_CONTROL/PRESCALER",        (void*)NULL, 0, this),
         fDimFadRefClock        ("FAD_CONTROL/REFERENCE_CLOCK",  (void*)NULL, 0, this),
         fDimFadStatus          ("FAD_CONTROL/STATUS",           (void*)NULL, 0, this),

trunk/FACT++/gui/design.ui

@@ -53 +53 @@
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>3</number>
       </property>
       <property name="documentMode">
@@ -2918 +2918 @@
                     <layout class="QGridLayout" name="gridLayout_38">
                      <item row="2" column="1">
-                      <widget class="QPushButton" name="fStatusDNSLed_2">
+                      <widget class="QPushButton" name="fFadLedPrescaler">
                        <property name="enabled">
                         <bool>true</bool>
@@ -3056 +3056 @@
                      </item>
                      <item row="2" column="2">
-                      <widget class="QSpinBox" name="spinBox">
+                      <widget class="QSpinBox" name="fFadPrescaler">
                        <property name="enabled">
-                        <bool>false</bool>
+                        <bool>true</bool>
                        </property>
                        <property name="alignment">
@@ -3068 +3068 @@
                        <property name="buttonSymbols">
                         <enum>QAbstractSpinBox::NoButtons</enum>
+                       </property>
+                       <property name="maximum">
+                        <number>65535</number>
                        </property>
                       </widget>
@@ -3104 +3107 @@
                      </item>
                      <item row="2" column="3">
-                      <widget class="QSpinBox" name="spinBox_18">
+                      <widget class="QSpinBox" name="fFadPrescalerCmd">
                        <property name="enabled">
                         <bool>false</bool>