X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=testing%2FMCTXWeb%2Fpublic_html%2Fdata.html;h=0309a35c824c392d7a7dcf074928dab373cc1bec;hb=c93b3c1b0dc67d03e4f60d99785929b8c319ddb6;hp=c4c28073ff3fd9f95643e36ae832cd8250c96808;hpb=e0132025a1df98f88b2415e9e5f75ce7304efb33;p=matches%2FMCTX3420.git diff --git a/testing/MCTXWeb/public_html/data.html b/testing/MCTXWeb/public_html/data.html index c4c2807..0309a35 100644 --- a/testing/MCTXWeb/public_html/data.html +++ b/testing/MCTXWeb/public_html/data.html @@ -22,33 +22,9 @@ $(document).ready(function() { }); }) - - //function to load appropriate graph image depending on drop-down menu - function graphLoad(graphid, folder, newgraph) { - document.getElementById(graphid).src = folder + "/" + newgraph + ".png"; - } - //function to load appropriate graph image depending on drop-down menu - function graphLoad2(graphid, newgraph) { - var exp = document.getElementById("expselect").value; - document.getElementById(graphid).src = exp + "/" + newgraph + ".png"; - } - //function to create appropriate experiment links depending on drop-down menu - function expLoad(expclass, folder, newlink) { - var elems = document.getElementsByClassName(expclass); - for (i = 0; i < elems.length; i++) { - var elem = elems[i]; - elem.href = folder + "/" + newlink; - } - } - //function to update experiment links links depending on drop-down menu - function expLoadTotal(folder) { - expLoad('s1', folder, 'strain1'); - expLoad('s2', folder, 'strain2'); - expLoad('s3', folder, 'strain3'); - expLoad('s4', folder, 'strain4'); - expLoad('p1', folder, 'pressure1'); - expLoad('p2', folder, 'pressure2'); - expLoad('d', folder, 'all.zip'); + //function to load new experiment depending on drop-down menu + function expLoad(expName) { + window.open("api/control?action=load&name=" + expName); } @@ -72,6 +48,7 @@
+
@@ -102,11 +79,18 @@
  • Home
  • Experiment control
  • Experiment graphs
    • +
  • Experiment data (live)
  • Experiment data
  • Pin debugging
  • Help
    • + +
    +
    Help
    +

    To view the desired data as a text file, click on the appropriate link. Dilatometer data and camera data can be viewed on their separate pages. To graph the + data, use the graphs page.

    +

    To view data from previous experiments, select the experiment (sorted by date) by using the drop-down menu.

    @@ -114,136 +98,52 @@
    Experiment Data
    - Current Experiment + Select An Experiment +

    - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - -
    View Sensor DataStrain 1Strain 2Strain 3Strain 4Pressure 1Pressure 2
    Experiment DateDate Lookup
    Save Sensor Data
    DilatometerView Data
    Camera DataView Data
    Graphs -
    - -
    - -
    - -

    Previous Experiments

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - + + + - +
    Select Experiment - - - -
    Experiment DateDATE LOOKUP
    View Sensor DataStrain 1Strain 2Strain 3Strain 4Pressure 1Pressure 2
    Save Sensor DataStrain Data
    Pressure Data
    DilatometerView DataDilatometerView Data
    Camera DataView DataCamera DataView Data
    Graphs -
    - -
    -     		Graphs Page
    -