Changeset 224 for Evidence/Edd

Timestamp:

06/17/10 09:00:51 (14 years ago)

Author:

ogrimm

Message:

Message severity encoded now using standard DIM structure, other updates

File:

• Evidence/Edd/Edd.cc (modified) (3 diffs)

Evidence/Edd/Edd.cc

@@ -99 +99 @@
 
 // Update widget
-void EddLineDisplay::Update(QString Name, int Time, QByteArray Array, QString Format, QString Text) {
+void EddLineDisplay::Update(QString Name, int Time, QByteArray, QString Format, QString Text) {
 
   if (ServiceName != Name) return;
@@ -109 +109 @@
     setText("n/a");
     Pal.setColor(QPalette::Base, Qt::lightGray);
-  }
-  else {
-    // Backgound colour determined by last byte
-    switch (Array[Array.size()]) {
+        setPalette(Pal);
+        return;
+  }
+
+  // Message service backgound colour determined by severity 
+  if (Name.endsWith("/Message")) {
+    switch (Text.section(' ', 0, 0).toInt()) {
       case 0:  Pal.setColor(QPalette::Base, Qt::white); break;
       case 1:  Pal.setColor(QPalette::Base, Qt::yellow); break;
@@ -119 +122 @@
       default: break;
     }
-        
-        if (Format[0].toUpper() != 'C') Text = Text.section(' ', Index, Index);
-
-        if (!ShowAsTime) setText(Text);
-        else setText(QDateTime::fromTime_t(Text.toInt()).toString());
-        setCursorPosition(0);
-  }
-  
+        Text = Text.section(' ', 1);
+  }     
+  else if (Format[0].toUpper() != 'C') Text = Text.section(' ', Index, Index);
+
+  if (!ShowAsTime) setText(Text);
+  else setText(QDateTime::fromTime_t(Text.toInt()).toString());
+
+  setCursorPosition(0);  
   setPalette(Pal);
 }