Changeset 231 for Evidence/Edd

Timestamp:

06/24/10 14:25:18 (14 years ago)

Author:

ogrimm

Message:

Bug fixes following previous update

Location:

Evidence/Edd

Files:

• Edd.cc (modified) (7 diffs)
• Edd.h (modified) (1 diff)

Evidence/Edd/Edd.cc

@@ -112 +112 @@
   if (ServiceName != Name) return;
 
+  // Check if service available
   QPalette Pal = palette();  
-
-  // Check if service available
   if (!SetStatus(this, Name, Time, Format, Index)) {
     setText("n/a");
@@ -810 +809 @@
 
   // Connect to DIM handler
-  if (connect(this, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString))) == false) {
+  if (connect(this, SIGNAL(INT(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString))) == false) {
     printf("Failed connection in EddDim()\n");
   }
@@ -843 +842 @@
   New.Name = Name;
   New.ByteArray = QByteArray();
+  New.Count = 1;
   New.DIMService = new DimStampedInfo(Name.toAscii().data(), INT_MAX, NO_LINK, this);
-  New.Count = 1;
   ServiceList.append(New);
 
@@ -936 +935 @@
   // Update statistics only for Dim services
   if (!Name.startsWith("Edd/")) Volume += Data.size();
+  
+  YEP(Name, Time, Data, Format, Text);  
 }
 
@@ -941 +942 @@
 void EddDim::infoHandler() {
 
-  if (!EvidenceServer::ServiceOK(getInfo())) YEP(getInfo()->getName(), -1);
+  if (!EvidenceServer::ServiceOK(getInfo())) INT(getInfo()->getName(), -1);
   else {
-        YEP(getInfo()->getName(),
-                getInfo()->getTimestamp(),
-                QByteArray((char *) getInfo()->getData(), 
-                getInfo()->getSize()), getInfo()->getFormat(),
-                QString::fromStdString(EvidenceServer::ToString(getInfo())));
+        INT(getInfo()->getName(), getInfo()->getTimestamp(), QByteArray((char *) getInfo()->getData(), 
+                getInfo()->getSize()), getInfo()->getFormat(), QString::fromStdString(EvidenceServer::ToString(getInfo())));
   }
 }
@@ -1235 +1233 @@
   Layout->addWidget(Command, 10, 0, 1, 4);    
 
-  EddText *Text = new EddText("Bias/Textout", true);
+  EddText *Text = new EddText("Bias/ConsoleOut", true);
   Text->setFixedWidth(400);
   Layout->addWidget(Text, 11, 0, 4, 4);      
@@ -1623 +1621 @@
 
 
-//---------------------------------------------------------------------
 //**************************** Main program ***************************
-//---------------------------------------------------------------------
-
 int main(int argc, char *argv[]) {
 

Evidence/Edd/Edd.h

@@ -251 +251 @@
   signals:
     void YEP(QString, int, QByteArray = QByteArray(), QString = QString(), QString = QString());
+    void INT(QString, int, QByteArray = QByteArray(), QString = QString(), QString = QString());
 };