Changeset 13768 for trunk/FACT++/www

Timestamp:

05/17/12 20:22:25 (12 years ago)

Author:

tbretz

Message:

Unified the command script name and the page name; do not output graphs if they have only a single point

File:

• trunk/FACT++/www/smartfact/index.js (modified) (5 diffs)

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

@@ -299 +299 @@
     var inputs = document.getElementsByTagName("input");
 
-    var args = "start="+script;
+    var args = "start="+script+".dim";
     for (var i=0; i<inputs.length; i++)
         args += "&"+inputs[i].name+"="+inputs[i].value;
@@ -329 +329 @@
     }
 
-    var title = lines[0].split('/');
+    var title  = lines[0];
+    var is_cmd = title[0]=='*';
+    if (is_cmd)
+        title = title.substr(1);
 
     var table = $("table"+z);
@@ -411 +414 @@
     sp2.setAttribute("data-color", "3");
     sp0.appendChild(document.createTextNode(" \u2022 "));
-    sp1.appendChild(document.createTextNode(title[0]));
+    sp1.appendChild(document.createTextNode(title));
     sp2.appendChild(document.createTextNode(" \u2022 "));
-    if (title[1]!=undefined)
-    {
-        // sp1.onclick = function() { this.style.backgroundColor='rgba(0,0,0,0.77)'; loadPage('fact', z, -1); }
+    if (is_cmd)
+    {
+        sp1.onclick = function() { this.style.backgroundColor='rgba(0,0,0,0.77)'; submit(name); this.style.backgroundColor=''; }
     }
     else
@@ -426 +429 @@
     div1.id = "reporttime"+z;
     div1.appendChild(document.createTextNode("---"));
+
+    div1.onclick = function() { this.style.backgroundColor='rgba(0,0,0,0.77)'; sendCommand('stop'); this.style.backgroundColor=''; }
 
     htd0.appendChild(sp0);
@@ -1286 +1291 @@
 
     // --- data ---
-    ctx.beginPath();
-    ctx.moveTo(ml, ch-mb-data.charCodeAt(0)/128*h);
-    for (var i=1; i<data.length; i++)
-        ctx.lineTo(ml+w/(data.length-1)*i, ch-mb-data.charCodeAt(i)/128*h);
-
-    // --- finalize data ---
-    ctx.lineTo(cw-mr, ch-mb);
-    ctx.lineTo(ml,    ch-mb);
-    ctx.fillStyle = "#"+color(100);
-    ctx.stroke();
-    ctx.fill();
+    if (data.length>1)
+    {
+        ctx.beginPath();
+        ctx.moveTo(ml, ch-mb-data.charCodeAt(0)/128*h);
+        for (var i=1; i<data.length; i++)
+            ctx.lineTo(ml+w/(data.length-1)*i, ch-mb-data.charCodeAt(i)/128*h);
+
+        // --- finalize data ---
+        ctx.lineTo(cw-mr, ch-mb);
+        ctx.lineTo(ml,    ch-mb);
+        ctx.fillStyle = "#"+color(100);
+        ctx.stroke();
+        ctx.fill();
+    }
 
     ctx.beginPath();