From: Justin Kruger <20767264@student.uwa.edu.au> Date: Sat, 12 Oct 2013 11:12:12 +0000 (+0800) Subject: Added data download page and help page (plus test files) X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=53c04ad0c9cfdf6fbebd7efbc829b9da3e22921e;hp=--cc;p=matches%2FMCTX3420.git Added data download page and help page (plus test files) Help page is basically complete and just links to the wiki. Data download page is kind of working, depends how/where we're actually going to store experiment data. Folder of dummy files in "current" is just for testing the download functionality. --- 53c04ad0c9cfdf6fbebd7efbc829b9da3e22921e diff --git a/testing/MCTXWeb/public_html/current/Graph1.png b/testing/MCTXWeb/public_html/current/Graph1.png new file mode 100644 index 0000000..c8484b6 Binary files /dev/null and b/testing/MCTXWeb/public_html/current/Graph1.png differ diff --git a/testing/MCTXWeb/public_html/current/Graph2.png b/testing/MCTXWeb/public_html/current/Graph2.png new file mode 100644 index 0000000..9c73eb3 Binary files /dev/null and b/testing/MCTXWeb/public_html/current/Graph2.png differ diff --git a/testing/MCTXWeb/public_html/current/Graph3.png b/testing/MCTXWeb/public_html/current/Graph3.png new file mode 100644 index 0000000..6948a84 Binary files /dev/null and b/testing/MCTXWeb/public_html/current/Graph3.png differ diff --git a/testing/MCTXWeb/public_html/current/Graph4.png b/testing/MCTXWeb/public_html/current/Graph4.png new file mode 100644 index 0000000..26e9fd4 Binary files /dev/null and b/testing/MCTXWeb/public_html/current/Graph4.png differ diff --git a/testing/MCTXWeb/public_html/current/Graph5.png b/testing/MCTXWeb/public_html/current/Graph5.png new file mode 100644 index 0000000..2e36c98 Binary files /dev/null and b/testing/MCTXWeb/public_html/current/Graph5.png differ diff --git a/testing/MCTXWeb/public_html/current/Graph6.png b/testing/MCTXWeb/public_html/current/Graph6.png new file mode 100644 index 0000000..86fa22a Binary files /dev/null and b/testing/MCTXWeb/public_html/current/Graph6.png differ diff --git a/testing/MCTXWeb/public_html/current/all.zip b/testing/MCTXWeb/public_html/current/all.zip new file mode 100644 index 0000000..a12e55d Binary files /dev/null and b/testing/MCTXWeb/public_html/current/all.zip differ diff --git a/testing/MCTXWeb/public_html/current/dummy files to test download functionality.txt b/testing/MCTXWeb/public_html/current/dummy files to test download functionality.txt new file mode 100644 index 0000000..e69de29 diff --git a/testing/MCTXWeb/public_html/current/nograph.png b/testing/MCTXWeb/public_html/current/nograph.png new file mode 100644 index 0000000..018ba56 Binary files /dev/null and b/testing/MCTXWeb/public_html/current/nograph.png differ diff --git a/testing/MCTXWeb/public_html/current/pressure1 b/testing/MCTXWeb/public_html/current/pressure1 new file mode 100644 index 0000000..380f4ae --- /dev/null +++ b/testing/MCTXWeb/public_html/current/pressure1 @@ -0,0 +1,2 @@ +Would we be able to put files - like stream into the public - mctxweb file so that the cover page can access the file. +wasnt too sure how to go back files without going all the way back to my local filesystem diff --git a/testing/MCTXWeb/public_html/current/pressure2 b/testing/MCTXWeb/public_html/current/pressure2 new file mode 100644 index 0000000..380f4ae --- /dev/null +++ b/testing/MCTXWeb/public_html/current/pressure2 @@ -0,0 +1,2 @@ +Would we be able to put files - like stream into the public - mctxweb file so that the cover page can access the file. +wasnt too sure how to go back files without going all the way back to my local filesystem diff --git a/testing/MCTXWeb/public_html/current/strain1 b/testing/MCTXWeb/public_html/current/strain1 new file mode 100644 index 0000000..380f4ae --- /dev/null +++ b/testing/MCTXWeb/public_html/current/strain1 @@ -0,0 +1,2 @@ +Would we be able to put files - like stream into the public - mctxweb file so that the cover page can access the file. +wasnt too sure how to go back files without going all the way back to my local filesystem diff --git a/testing/MCTXWeb/public_html/current/strain2 b/testing/MCTXWeb/public_html/current/strain2 new file mode 100644 index 0000000..380f4ae --- /dev/null +++ b/testing/MCTXWeb/public_html/current/strain2 @@ -0,0 +1,2 @@ +Would we be able to put files - like stream into the public - mctxweb file so that the cover page can access the file. +wasnt too sure how to go back files without going all the way back to my local filesystem diff --git a/testing/MCTXWeb/public_html/current/strain3 b/testing/MCTXWeb/public_html/current/strain3 new file mode 100644 index 0000000..380f4ae --- /dev/null +++ b/testing/MCTXWeb/public_html/current/strain3 @@ -0,0 +1,2 @@ +Would we be able to put files - like stream into the public - mctxweb file so that the cover page can access the file. +wasnt too sure how to go back files without going all the way back to my local filesystem diff --git a/testing/MCTXWeb/public_html/current/strain4 b/testing/MCTXWeb/public_html/current/strain4 new file mode 100644 index 0000000..380f4ae --- /dev/null +++ b/testing/MCTXWeb/public_html/current/strain4 @@ -0,0 +1,2 @@ +Would we be able to put files - like stream into the public - mctxweb file so that the cover page can access the file. +wasnt too sure how to go back files without going all the way back to my local filesystem diff --git a/testing/MCTXWeb/public_html/data-Justin.html b/testing/MCTXWeb/public_html/data-Justin.html new file mode 100644 index 0000000..41b9e86 --- /dev/null +++ b/testing/MCTXWeb/public_html/data-Justin.html @@ -0,0 +1,265 @@ + + + + + + + + + MCTX3420 Web Interface + + + + + + + + + + + + + + + + + +
+ + + +
+
+
Experiment Data
+ Current Experiment + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
View Sensor DataStrain 1Strain 2Strain 3Strain 4Pressure 1Pressure 2
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 Data
DilatometerView Data
Camera DataView Data
Graphs + +
+ +
+
+ + +
+ + diff --git a/testing/MCTXWeb/public_html/help-Justin.html b/testing/MCTXWeb/public_html/help-Justin.html new file mode 100644 index 0000000..6e87375 --- /dev/null +++ b/testing/MCTXWeb/public_html/help-Justin.html @@ -0,0 +1,182 @@ + + + + MCTX3420 Web Interface + + + + + + + + + + + + + +
+ + + +
+
+
Getting Started
+

Welcome to the MCTX3420 project documentation! On this page, you will find help on how to use the project software, + as well as information about the various hardware components.

+

For a basic introduction to using the experiment, see 'Tutorials'. + System overview provides a general overview of the experiment's hardware, while + Using the web interface provides a tutorial on using the the project software. + For detailed information about the experiment hardware, see the 'Hardware' section. For detailed information about the project software, + see the 'Software' section.

+
Tutorials
+ +
Hardware
+ +
Software
+ +
+ +
+
Project Wiki
+

All of the project's help documentation is stored in its GitHub wiki. This git repository also + stores all of the software code for the project; to access the project code files, visit this link.

+

The following is a list of pages on the GitHub wiki (all of which can be accessed via the categories above):

+

+
+
+ +
+ +