Changeset 12002 for trunk/FACT++

Timestamp:

09/07/11 10:58:17 (13 years ago)

Author:

tbretz

Message:

Improved service output for empty services (size==0)

File:

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

trunk/FACT++/gui/FactGui.h

@@ -2796 +2796 @@
         out << "]</font>   <B>" << info.getName() << "</B> - ";
 
-        bool iserr = true;
+        bool iserr = 2;
         if (!conv)
         {
@@ -2805 +2805 @@
             try
             {
-                const string dat = conv.GetString(info.getData(), info.getSize());
+                const string dat = info.getSize()==0 ? "&lt;empty&gt;" : conv.GetString(info.getData(), info.getSize());
                 out << dat;
-                iserr = false;
+                iserr = info.getSize()==0;
             }
             catch (const runtime_error &e)
@@ -2815 +2815 @@
         }
 
+        cout << "=> " << out.str() << endl;
+
         // srand(hash<string>()(string(info.getName())));
         // int bg = rand()&0xffffff;
@@ -2823 +2825 @@
         bg = ~(bg&0x1f1f1f)&0xffffff;
 
-        if (iserr)
+        if (iserr==2)
             bg = 0xffffff;
 
@@ -2829 +2831 @@
         bgcol << hex << setfill('0') << setw(6) << bg;
 
-        const string col = iserr ? "red" : "black";
+        const string col = iserr==0 ? "black" : (iserr==1 ? "#FF6600" : "black");
         const string str = "<table width='100%' bgcolor=#"+bgcol.str()+"><tr><td><font color='"+col+"'>"+out.str()+"</font></td></tr></table>";