Changeset 13747 for trunk

Timestamp:

05/16/12 09:09:18 (12 years ago)

Author:

tbretz

Message:

Some littel fixed; added a time-tag to the graphics files; added some possibility to link to the control-section

Location:

trunk/FACT++/www/smartfact

Files:

• index.css (modified) (2 diffs)
• index.js (modified) (11 diffs)

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

@@ -128 +128 @@
    width: 18px;
    height: 18px;
-   zoom: 1.5;
-   display:table-cell;
+   zoom: 1.;
 }
 
@@ -153 +152 @@
 */
 .tfoot {
-        background: #737373 url(gradient.png) bottom left repeat-x;
+        background: #737373 url(img/gradient.png) bottom left repeat-x;
         color: #fff;
         border-color: #525252;

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

@@ -373 +373 @@
     var htd2 = document.createElement("td");
     var htd3 = document.createElement("td");
+    var htd4 = document.createElement("td");
     htd0.setAttribute("class", "tcell1");
     htd1.setAttribute("class", "tcell2");
@@ -379 +380 @@
     htd3.setAttribute("class", "tcell1");
     htd3.setAttribute("width", "1px");
+    htd4.setAttribute("width", "1px");
+    hhtr.appendChild(htd4);
     hhtr.appendChild(htd3);
     hhtr.appendChild(htd0);
@@ -387 +390 @@
     var div2 = document.createElement("div");
     var div3 = document.createElement("div");
+    var div4 = document.createElement("div");
+    div4.id = "warn"+z;
     div2.setAttribute("class", "icon_white");
     div3.setAttribute("class", "icon_white");
+    div4.setAttribute("class", "icon_color");
     div2.setAttribute("style", "background-position:-396px 50%;");
     div3.setAttribute("style", "background-position:-575px 50%;");
+    div4.setAttribute("style", "display:none;background-position:-12px -12px;");
     div3.onclick = function() { this.style.backgroundColor='rgba(0,0,0,0.77)'; loadPage('fact', z, -z); }
     div2.onclick = function() { this.style.backgroundColor='rgba(0,0,0,0.77)'; loadPage(fname, z, -dz); }
@@ -407 +414 @@
     sp2.appendChild(document.createTextNode(" \u2022 "));
     if (title[1]!=undefined)
-        sp1.onclick = function() { submit(title[1]); }
+    {
+        // sp1.onclick = function() { this.style.backgroundColor='rgba(0,0,0,0.77)'; loadPage('fact', z, -1); }
+    }
+    else
+    {
+        if (name!='control')
+            sp1.onclick = function() { this.style.backgroundColor='rgba(0,0,0,0.15)'; loadPage('control', z, +1); }
+    }
 
     div1.setAttribute("style", "font-size:small;");
@@ -422 +436 @@
     if (lines[0]!="FACT")
         htd3.appendChild(div3); // home
+    htd4.appendChild(div4);     // Warning
 
     // -----------------------------------------------------
@@ -587 +602 @@
         if (check.length==0 || check[0]!="input")
         {
-            cell1.appendChild(document.createTextNode(cols[1]));
+            var div = document.createElement("div");
+            div.innerHTML = cols[1];
+            cell1.appendChild(div);
+            //cell1.appendChild(document.createTextNode(cols[1]));
 
             if (cols.length>2 && cols[2].length>0)
@@ -606 +624 @@
                 alert("Argument name missing for'"+check[1]+"'");
 
-            cell1.appendChild(document.createTextNode(opt[0]));
+            var div = document.createElement("div");
+            div.innerHTML = opt[0];
+            cell1.appendChild(div);
+            //cell1.appendChild(document.createTextNode(opt[0]));
 
             var input = document.createElement("input");
@@ -896 +917 @@
     var date1 = new Date();
 
-    if (tokens[0].length!=13)
+    var header = tokens[0].split('\t');
+
+    // File corrupted /should we remove the date?)
+    if (header.length!=2 && header.length!=1 && header[0].length!=13)
     {
         if (date0 != null)
             strike(time, date0.getTime()+60000>date1.getTime());
-        // FIXME: Reset display to "---" values -- no connection
         return;
     }
 
     var date2 = new Date();
-    date2.setTime(tokens[0]);
+    date2.setTime(header[0]);
+
+    $("warn"+z).style.display = header.length!=2 || header[1]=='1' ? "none" : "";
 
     strike(time, date2.getTime()+60000>date1.getTime());
@@ -1320 +1345 @@
 }
 
-var gfxtime0 = null;
-
 function process_eventdata(result)
 {
@@ -1338 +1361 @@
 
     var data = result.split('\n');
-    if (result.length<3)
-        return;
-
-    var l = data[0].length+1+data[1].length+1;
+    if (result.length<4)
+        return;
+
+    var l = data[0].length+1+data[1].length+1+data[2].length+1;
 
     switch (type)
@@ -1347 +1370 @@
         //case "camera": drawCam(result);     break;
     case "hist":
-        drawGraph(canv, data[0], data[1], result.substr(l));
+        drawGraph(canv, data[1], data[2], result.substr(l));
         break;
     case "camera":
         drawFullCam(result.substr(l));
-        drawCamLegend(canv, data[0], data[1]);
+        drawCamLegend(canv, data[1], data[2]);
         break;
     }
 
-    var date = new Date();
-    if (gfxtime0 != null && gfxdate0.getTime()+60000>date.getTime())
-    {
-        ctx.fillStyle = "rgba(255, 255, 255, 0.75)";
+    var now = new Date();
+    var tm  = new Date();
+    tm.setTime(data[0]);
+    if (tm.getTime()+60000<now.getTime())
+    {
+        ctx.fillStyle = "rgba(255, 255, 255, 0.85)";
         ctx.fillRect(0, 0, canv.width, canv.height);
     }