Merge branch 'master' of github.com:MDPvis/MDPvis.github.io

Author: smcgregor

flask_server.py

@@ -11,6 +11,20 @@
 from flask import Flask, jsonify, request, redirect
 import sys
 
+print """
+Starting Flask Server...
+Note, you may be able to specify a domain at this point by adding it as a
+positional argument.
+"""
+
+# Specify which domain should be selected from the domain bridge.
+# This is an optional argument that is used for domain_bridges that sit
+# atop a collection of MDP domains. You should leave this as the
+# empty string unless you must select between domains.
+domain = ""
+if len(sys.argv) > 1:
+    domain = sys.argv[1]
+
 # Add the parent folder path to the sys.path list so
 # we can include its bridge
 sys.path.insert(0, '..')

index.html

@@ -364,7 +364,14 @@ <h4 class="panel-title">
                       <button type="button" class="btn btn-default"
                         data-open-link="https://github.com/MDPvis/MDPvis.github.io/issues/new?title=Add%20Simulator%20to%20List">
                         <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>
-                        Your Server Here
+                        Open an Issue to be Included
+                      </button>
+                      <div class="form-group">
+                          <label for="customServer">Custom Server</label>
+                          <input type="text" class="form-control" id="customServer" placeholder="http://example.com:80">
+                      </div>
+                      <button id="customServerSubmit" type="submit" class="btn btn-default" data-dismiss="modal">
+                        Open Connection
                       </button>
                     </p>
                   </div>

js/charts/barchart.js

@@ -50,8 +50,10 @@ function BarChart (name, units, rollouts, accessor) {
       return bindex;
     }
     rollouts.forEach(function(rollout) {
-      if ( skipFilter || data.filters.isActiveRollout(rollout) ) {
-        bins[binIndex(rollout)] += 1;
+      if( data.filters.filteredTimePeriod < rollout.length ) {
+        if ( skipFilter || data.filters.isActiveRollout(rollout) ) {
+          bins[binIndex(rollout)] += 1;
+        }
       }
     });
     return bins;

js/index.js

@@ -705,6 +705,11 @@ var MDPVis = {
       MDPVis.server.dataEndpoint = simulatorPath;
       MDPVis.initialize();
     });
+    $("#customServerSubmit").click(function(elem){
+      $(".post-modal-show").show();
+      MDPVis.server.dataEndpoint = $("#customServer").val();
+      MDPVis.initialize();
+    });
     $('#serverSelectionModal').modal();
   }
 

serve.sh

@@ -3,4 +3,5 @@ echo "This script starts a simple Python server that will let you open MDPvis lo
 echo "Once the server starts you can visit http://localhost:8000/index.html in your browser."
 echo "to quit the server you should press ctrl-c."
 echo ""
+echo "You should not use this server to start an MDP domain since this will only serve the visualization."
 python -m SimpleHTTPServer

tornado_server.py

@@ -2,7 +2,12 @@
 from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop
 from flask_server import app
+import sys
 
 http_server = HTTPServer(WSGIContainer(app))
+# There is an optional parameter for selecting between multiple domains in the
+# domain bridge
+if len(sys.argv) > 2:
+    domain = sys.argv[2]
 http_server.listen(5000)
 IOLoop.instance().start()