From: Jeremy Tan <jeremy@jx.tan.fake>
Date: Mon, 7 Oct 2013 10:42:06 +0000 (+0800)
Subject: re-enable strain graph on control page
X-Git-Url: https://git.ucc.asn.au/?p=matches%2FMCTX3420.git;a=commitdiff_plain;h=55c5e1a6f71c64073f74997b070d4873aa423273

re-enable strain graph on control page
---

diff --git a/testing/MCTXWeb/public_html/control.html b/testing/MCTXWeb/public_html/control.html
index 0a27efc..ecefd5a 100644
--- a/testing/MCTXWeb/public_html/control.html
+++ b/testing/MCTXWeb/public_html/control.html
@@ -33,6 +33,7 @@
          });
 
          $("#errorlog").setErrorLog();
+         $("#strain-graphs").setStrainGraphs();
        });       
       })
 
@@ -128,6 +129,12 @@
             <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>
diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js
index 106a4b4..773fa23 100644
--- a/testing/MCTXWeb/public_html/static/mctx.gui.js
+++ b/testing/MCTXWeb/public_html/static/mctx.gui.js
@@ -218,7 +218,7 @@ $.fn.setStrainGraphs = function () {
       }
       $.plot(graphdiv, data);
       setTimeout(updater, 500);
-    }, function () {alert("It crashed");});
+    }, function () {debugLog("It crashed");});
   };
   
   updater();