Changeset 11184 for trunk

Timestamp:

06/24/11 16:39:44 (13 years ago)

Author:

tbretz

Message:

Fixed displays of FadLeds

File:

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

trunk/FACT++/gui/FactGui.h

@@ -433 +433 @@
 
         //button->setToolTip("Last change: "+QDateTime::currentDateTimeUtc().toString()+" UTC");
-        button->setToolTip(("Last change: "+t.GetAsStr()+" UTC").c_str());
+        button->setToolTip(("Last change: "+t.GetAsStr()+" (UTC)").c_str());
     }
 
@@ -1096 +1096 @@
 
         ostringstream tip;
-        tip << "<table border='1'><tr><th colspan='11'>" << Time().GetAsStr() << "</th></tr><tr><th></th>";
+        tip << "<table border='1'><tr><th colspan='11'>" << Time().GetAsStr() << " (UTC)</th></tr><tr><th></th>";
         for (int b=0; b<10; b++)
             tip << "<th>" << b << "</th>";
@@ -1143 +1143 @@
     void SetFadLed(QPushButton *led, const DimData &d, uint16_t bitmask)
     {
-        const uint16_t  quality = d.ptr<uint16_t>()[0];
-        const uint16_t  value   = d.ptr<uint16_t>()[1];
+        const bool      quality = d.ptr<uint16_t>()[0]&mask;
+        const bool      value   = d.ptr<uint16_t>()[1]&bitmask;
         const uint16_t *ptr     = d.ptr<uint16_t>()+2;
 
-        SetLedColor(led, quality&bitmask?(value&bitmask?kLedGreen:kLedRed):kLedOrange, d.time);
+        SetLedColor(led, quality?kLedOrange:(value?kLedGreen:kLedRed), d.time);
 
         ostringstream tip;
-        tip << "<table border='1'><tr><th colspan='11'>" << d.time.GetAsStr() << "</th></tr><tr><th></th>";
+        tip << "<table border='1'><tr><th colspan='11'>" << d.time.GetAsStr() << " (UTC)</th></tr><tr><th></th>";
         for (int b=0; b<10; b++)
             tip << "<th>" << b << "</th>";