Merge branch 'develop' of https://github.com/kwinkunks/modelr_app int…

…o develop

.gitignore

@@ -25,7 +25,8 @@ develop-eggs
 lib
 lib64
 __pycache__
-
+node_modules/
+bower_components/
 # Installer logs
 pip-log.txt
 

index.yaml

@@ -119,6 +119,11 @@ indexes:
   - name: user
   - name: name
 
+- kind: Fluid
+  properties:
+  - name: user
+  - name: user
+
 - kind: Fluid
   ancestor: yes
   properties:
@@ -130,3 +135,13 @@ indexes:
   - name: user
   - name: date
     direction: desc
+
+- kind: ImageModel
+  properties:
+  - name: user
+  - name: user
+
+- kind: Rock
+  properties:
+  - name: user
+  - name: user

page_handlers.py

@@ -1356,7 +1356,7 @@ def get(self, user):
         if self.request.get("error"):
             params.update(error="Invalid image file")
 
-        template = env.get_template('model.html')
+        template = env.get_template('model2.html')
         html = template.render(params)
         self.response.out.write(html)
 

static/css/modelr.css

@@ -1,3 +1,97 @@
+/*   NG      */
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+  display: none !important;
+}
+/*************/
+/* 2D Models */
+.model_info {
+  color: #aaa;
+  font-size: 200%;
+  vertical-align: middle;
+  top:4px;
+}
+
+input {
+  text-align: end;
+}
+
+.seismic-color {
+  height: 10px;
+  margin: 0;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+}
+
+.alert-success {
+  width:50%;
+  height: 60px;
+  position: fixed;
+  right: 10px;
+  top: 10px;
+  z-index: 1000;
+}
+
+.form-control {
+  margin-bottom: 5px;
+}
+
+.flexslider .slides img {
+  max-height: 400px;
+}
+
+canvas {
+  position: absolute;
+}
+
+svg {
+  position: relative;
+  z-index: 3;
+}
+.remove-padding {
+  padding:0;
+}
+
+.bottom-buffer {
+  margin-bottom:20px;
+}
+
+.model_select {
+  text-align: right;
+  float: right;
+  padding-right: 20px;
+}
+
+.flex-direction-nav a {
+  height: 50px;
+}
+
+.dropdown-menu {
+  text-align: center;
+}
+
+.model_button {
+  float: right;
+  margin: 5px;
+}
+
+.model_select {
+  float: right;
+  margin-bottom: 5px;
+}
+
+.rock-color {
+  height: 34px;
+  margin: 0 5px 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+}
+
+/*************/
+
+/* 1D Models */
+
 .tick line{
     opacity: 0.1;
 }
@@ -22,6 +116,8 @@ div.plot {
   stroke: #000;
   shape-rendering: crispEdges;
 }
+/**************/
+
 .ribbon-banner {
    display: block;
    position: absolute;

static/js/1D_model.js

@@ -56,22 +56,22 @@ setup1D = function(rock_div,
 
     var earth_model = rock_core.intervals();
 
-    // var vpPlot = undefined
-    // tPlot = undefined,
-    // rhoPlot = undefined,
-    // vPPlot = undefined,
-    // zPPlot = undefined,
-    // vpLog = undefined,
-    // vsLog = undefined,
-    // rhoLog = undefined,
-    // zPLog = undefined,
-    // synthLog = undefined;
+    var vpPlot = undefined
+    tPlot = undefined,
+    rhoPlot = undefined,
+    vPPlot = undefined,
+    zPPlot = undefined,
+    vpLog = undefined,
+    vsLog = undefined,
+    rhoLog = undefined,
+    zPLog = undefined,
+    synthLog = undefined;
     var vpPlot, tPlot, rhoPlot, vPPlot, VPPlot, vpLog, vsLog, rhoLog, zPLog, SynthLog;
 
     $.ajax(server + "/data.json?type=seismic&script=fluid_sub.py",
        {type: "GET", data: {payload: JSON.stringify({seismic: seismic, earth_model: earth_model})},
         success: function success(data){
-
+          console.log(data);
             var width = 120;
             //Create VP Plot
             vpPlot = g3.plot('.plot')
@@ -220,8 +220,6 @@ setup1D = function(rock_div,
     });
 
 
-    //update_data();
-
     function update_data(){
         var offset = 10;
         var frequency = $("#frequency").val();
@@ -266,4 +264,4 @@ setup1D = function(rock_div,
         }
       );
     }; // end of function update_data
-};
+};