Changeset 13850 for trunk

Timestamp:

05/23/12 21:32:16 (13 years ago)

Author:

tbretz

Message:

Small improvements for the output of the dimctrl messages

Location:

trunk/FACT++

Files:

• src/smartfact.cc (modified) (2 diffs)
• www/smartfact/index.js (modified) (1 diff)

trunk/FACT++/src/smartfact.cc

@@ -475 +475 @@
             return;
 
-        const string str  = fControlMessageHist.size()>0 ? fControlMessageHist.back() : "<pre>  :  :  </pre> ";
-        const string time = "<pre>"+d.GetTimeAsStr("%H:%M:%S")+"</pre> ";
+        const string str  = fControlMessageHist.size()>0 ? fControlMessageHist.back() : "         ";
+        const string time = d.GetTimeAsStr("%H:%M:%S ");
 
         ostringstream tst;
@@ -482 +482 @@
 
         string msg;
-        msg += str.substr(0, time.length())==time ? "<pre>        </pre> " : time;
-        msg += d.Ptr<char>();
+        msg += str.substr(0, time.length())==time ? "--:--:-- " : time;
+        msg += "<->"+string(d.Ptr<char>())+"</->";
 
         fControlMessageHist.push_back(msg);

trunk/FACT++/www/smartfact/index.js

@@ -1011 +1011 @@
         form = form.replace(/<([\+-])>/g, "<font size='$11'>");
         form = form.replace(/<\/([#\+-])>/g, "</font>");
+        form = form.replace(/([0-9][0-9]):([0-9][0-9]):([0-9][0-9])/g,
+                            "<pre>$1</pre>:<pre>$2</pre>:<pre>$3</pre>");
+        form = form.replace(/--:--:--/g, "<pre>  </pre> <pre>  </pre> <pre>  </pre>");
 
         var newe = document.createElement("div");