re-enable strain graph on control page
authorJeremy Tan <[email protected]>
Mon, 7 Oct 2013 10:42:06 +0000 (18:42 +0800)
committerJeremy Tan <[email protected]>
Mon, 7 Oct 2013 10:42:06 +0000 (18:42 +0800)
testing/MCTXWeb/public_html/control.html
testing/MCTXWeb/public_html/static/mctx.gui.js

index 0a27efc..ecefd5a 100644 (file)
@@ -33,6 +33,7 @@
          });
 
          $("#errorlog").setErrorLog();
+         $("#strain-graphs").setStrainGraphs();
        });       
       })
 
             <b>Error and warning messages</b><br>
             <textarea id="errorlog" wrap="off" rows="4" cols="30" readonly></textarea>
           </div>
+          <div class="widget">
+            <div class="title">Strain gauges</div>
+            <div id="strain-graphs" class="graph">
+              <!-- Strain graph placeholder -->
+            </div>
+          </div>
         </div>
         <!-- End main content -->
       </div>
index 106a4b4..773fa23 100644 (file)
@@ -218,7 +218,7 @@ $.fn.setStrainGraphs = function () {
       }
       $.plot(graphdiv, data);
       setTimeout(updater, 500);
-    }, function () {alert("It crashed");});
+    }, function () {debugLog("It crashed");});
   };
   
   updater();

UCC git Repository :: git.ucc.asn.au