12aaa0aaa132 — Joe Ulfers 6 years ago
Embed the demo into site
9 files changed, 24 insertions(+), 8 deletions(-)

M _static/default.css
M scenarios/10ppm-apart.txt => _static/scenarios/10ppm-apart.txt
M scenarios/10ppm-cluster.txt => _static/scenarios/10ppm-cluster.txt
M scenarios/early-arrival.txt => _static/scenarios/early-arrival.txt
M scenarios/late-arrival.txt => _static/scenarios/late-arrival.txt
M scenarios/manual.txt => _static/scenarios/manual.txt
M conf.py
M experiment.rst
M model.html
M _static/default.css +5 -0
@@ 105,4 105,9 @@ footer small {
 }
 .toctree-wrapper {
     display: none;
+}
+iframe.model {
+    width: 100%;
+    border: none;
+    height: 1000px;
 }
  No newline at end of file

          
M scenarios/10ppm-apart.txt => _static/scenarios/10ppm-apart.txt +0 -0

M scenarios/10ppm-cluster.txt => _static/scenarios/10ppm-cluster.txt +0 -0

M scenarios/early-arrival.txt => _static/scenarios/early-arrival.txt +0 -0

M scenarios/late-arrival.txt => _static/scenarios/late-arrival.txt +0 -0

M scenarios/manual.txt => _static/scenarios/manual.txt +0 -0

M conf.py +1 -1
@@ 94,7 94,7 @@ html_theme_path = ['.']
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static', 'model.html', 'doors.py']
+html_static_path = ['_static', 'model.html', 'chart.html', 'doors.py']
 
 # -- Options for HTMLHelp output ------------------------------------------
 

          
M experiment.rst +10 -1
@@ 106,4 106,13 @@ installed beside the revolving door in t
 A small notch at the bottom of the swinging door leaves room for the servo arm to glue to the
 swinging door, thus coupling directly to the servo.
 
-.. _model.html: model.html
+Programming
+===========
+
+The whole thing gets hooked up to an Arduino. It has a Web interface to control it and collect data. The `source code is on Bitbucket`_ and you can pretend you're controlling the experiment with this in-browser demo:
+
+.. raw:: html
+
+    <iframe class="model" src="_static/model.html"/>
+
+.. _Source code is on Bitbucket: https://bitbucket.org/julfers/revolvingdoorhoax
  No newline at end of file

          
M model.html +8 -6
@@ 1,11 1,11 @@ 
 <!DOCTYPE html>
 <html>
 <head>
-    <script src="_static/js/lib/jquery-1.11.0.js"></script><!-- Sphinx adds this -->
-    <script src="_static/js/lib/skulpt.min.js"></script>
-    <script src="_static/js/lib/skulpt-stdlib.js"></script>
-    <script src="_static/js/lib/requestAnimationFrame.js"></script>
-    <script src="_static/js/doors.js"></script>
+    <script src="/_static/js/lib/jquery-1.11.0.js"></script>
+    <script src="/_static/js/lib/skulpt.min.js"></script>
+    <script src="/_static/js/lib/skulpt-stdlib.js"></script>
+    <script src="/_static/js/lib/requestAnimationFrame.js"></script>
+    <script src="/_static/js/doors.js"></script>
     <style>
     .faults {
         display: inline-block;

          
@@ 36,6 36,8 @@ 
 <body class="published">
     <script>
     if (/^localhost/.test(window.location.hostname)) {
+        // When on localhost, lack of the "published" class makes this assume it is actually
+        // connected to an Arduino
         $('body').removeClass('published')
     }
     </script>

          
@@ 171,7 173,7 @@ 
                 if (name === 'manual') {
                     row.find('input').prop('checked', true)
                 }
-                return $.get('scenarios/' + name + '.txt', null, null, 'text')
+                return $.get('/_static/scenarios/' + name + '.txt', null, null, 'text')
                     .done(function (stepsFile) {
                         var scenario = doors.scenario(stepsFile)
                         scenarios[name] = scenario