Changeset 11169 for trunk/FACT++/gui

Timestamp:

06/24/11 13:16:04 (14 years ago)

Author:

tbretz

Message:

Added DrsEnabled

Location:

trunk/FACT++/gui

Files:

• FactGui.h (modified) (6 diffs)
• design.ui (modified) (1 diff)

trunk/FACT++/gui/FactGui.h

@@ -391 +391 @@
     DimStampedInfo fDimFadFwVersion;
     DimStampedInfo fDimFadPllLock;
+    DimStampedInfo fDimFadDrsEnabled;
     DimStampedInfo fDimFadStatistics;
 
@@ -1116 +1117 @@
     void handleFadPllLock(const DimData &d)
     {
-        if (!CheckSize(d, 43*sizeof(uint8_t)))
+        if (!CheckSize(d, 41*sizeof(uint8_t)))
             return;
 
@@ -1135 +1136 @@
             {
                 tip << "<td>"
-                    << (int)(ptr[c*10+b+3]&8)
-                    << (int)(ptr[c*10+b+3]&4)
-                    << (int)(ptr[c*10+b+3]&2)
-                    << (int)(ptr[c*10+b+3]&1)
+                    << (int)(ptr[c*10+b+1]&8)
+                    << (int)(ptr[c*10+b+1]&4)
+                    << (int)(ptr[c*10+b+1]&2)
+                    << (int)(ptr[c*10+b+1]&1)
                     << "</td>";
             }
@@ -1146 +1147 @@
 
         fFadLedPllLock->setToolTip(tip.str().c_str());
+    }
+
+    void handleFadDrsEnabled(const DimData &d)
+    {
+        if (!CheckSize(d, 41*sizeof(uint8_t)))
+            return;
+
+        const uint8_t *ptr = d.ptr<uint8_t>();
+
+        SetLedColor(fFadLedDrsEnabled, d.qos?(ptr[0]?kLedGreen:kLedRed):kLedOrange, d.time);
+
+        ostringstream tip;
+        tip << "<table border='1'><tr><th colspan='11'>" << Time().GetAsStr() << "</th></tr><tr><th></th>";
+        for (int b=0; b<10; b++)
+            tip << "<th>" << b << "</th>";
+        tip << "</tr>";
+
+        for (int c=0; c<4; c++)
+        {
+            tip << "<tr><th>" << c << "</th>";
+            for (int b=0; b<10; b++)
+            {
+                tip << "<td>"
+                    << (ptr[c*10+b+1]?"on":"off")
+                    << "</td>";
+            }
+            tip << "</tr>";
+        }
+        tip << "</table>";
+
+        fFadLedDrsEnabled->setToolTip(tip.str().c_str());
+
     }
 
@@ -1946 +1979 @@
             return PostInfoHandler(&FactGui::handleFadPllLock);
 
+        if (getInfo()==&fDimFadDrsEnabled)
+            return PostInfoHandler(&FactGui::handleFadDrsEnabled);
+
         if (getInfo()==&fDimFadStatistics)
             return PostInfoHandler(&FactGui::handleFadStatistics);
@@ -2388 +2424 @@
         fDimFadFwVersion       ("FAD_CONTROL/FIRMWARE_VERSION", (void*)NULL, 0, this),
         fDimFadPllLock         ("FAD_CONTROL/PLL_LOCK",         (void*)NULL, 0, this),
+        fDimFadDrsEnabled      ("FAD_CONTROL/DRS_ENABLED",      (void*)NULL, 0, this),
         fDimFadStatistics      ("FAD_CONTROL/STATISTICS",       (void*)NULL, 0, this)
     {

trunk/FACT++/gui/design.ui

@@ -3088 +3088 @@
             <layout class="QGridLayout" name="gridLayout_37">
              <item row="1" column="0">
-              <widget class="QPushButton" name="fFadLedDenable">
+              <widget class="QPushButton" name="fFadLedDrsEnabled">
                <property name="enabled">
                 <bool>true</bool>