Changeset 11175 for trunk/FACT++/gui

Timestamp:

06/24/11 14:19:43 (14 years ago)

Author:

tbretz

Message:

Removed some obsolete stuff

File:

• trunk/FACT++/gui/FactGui.h (modified) (4 diffs)

trunk/FACT++/gui/FactGui.h

@@ -390 +390 @@
     DimStampedInfo fDimFadConnections;
     DimStampedInfo fDimFadFwVersion;
-    DimStampedInfo fDimFadPllLock;
-    DimStampedInfo fDimFadDrsEnabled;
     DimStampedInfo fDimFadStatus;
     DimStampedInfo fDimFadStatistics;
@@ -1115 +1113 @@
         SetLedColor(fFadLedFwVersion, d.qos?kLedGreen:kLedOrange, d.time);
     }
-/*
-    void handleFadPllLock(const DimData &d)
-    {
-        if (!CheckSize(d, 41*sizeof(uint8_t)))
-            return;
-
-//        SetLedColor(fFadLedPllLock, d.qos?kLedGreen:kLedOrange, d.time);
-
-        const uint8_t *ptr = d.ptr<uint8_t>();
-
-        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>"
-                    << (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>";
-            }
-            tip << "</tr>";
-        }
-        tip << "</table>";
-
-        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());
-
-    }
-*/
+
     void SetFadLed(QPushButton *led, const DimData &d, uint16_t bitmask)
     {
@@ -2024 +1956 @@
             return PostInfoHandler(&FactGui::handleFadFwVersion);
 
-//        if (getInfo()==&fDimFadPllLock)
-//            return PostInfoHandler(&FactGui::handleFadPllLock);
-
-//        if (getInfo()==&fDimFadDrsEnabled)
-//            return PostInfoHandler(&FactGui::handleFadDrsEnabled);
-
         if (getInfo()==&fDimFadStatus)
             return PostInfoHandler(&FactGui::handleFadStatus);
@@ -2474 +2400 @@
         fDimFadConnections     ("FAD_CONTROL/CONNECTIONS",      (void*)NULL, 0, this),
         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),
         fDimFadStatus          ("FAD_CONTROL/STATUS",           (void*)NULL, 0, this),
         fDimFadStatistics      ("FAD_CONTROL/STATISTICS",       (void*)NULL, 0, this)