Cleaning up STL rendering code. Addresses #794

sandialabs · Dec 4, 2017 · 077a144 · 077a144
1 parent 8fc3577
commit 077a144
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/web-server/js/slycat-3d-viewer.js b/web-server/js/slycat-3d-viewer.js
@@ -226,7 +226,7 @@ define('slycat-3d-viewer', ['slycat-server-root', 'knockout', 'knockout-mapping'
         return false;
       });
 
-      $('#slycat-3d-stats-check', $container).on('change', function() {
+      $('.slycat-3d-stats-check', $container).on('change', function() {
         toggleStats(container, viewer, renderer, camera, fps, ms, $(this).is(':checked'), isModel);
       });
 
@@ -350,9 +350,9 @@ define('slycat-3d-viewer', ['slycat-server-root', 'knockout', 'knockout-mapping'
       controls.update();
       renderer.render(scene, camera);
 
-      var x = $('#slycat-3d-x-check', $(container)).is(':checked');
-      var y = $('#slycat-3d-y-check', $(container)).is(':checked');
-      var z = $('#slycat-3d-z-check', $(container)).is(':checked');
+      var x = $('.slycat-3d-x-check', $(container)).is(':checked');
+      var y = $('.slycat-3d-y-check', $(container)).is(':checked');
+      var z = $('.slycat-3d-z-check', $(container)).is(':checked');
 
       if (mesh && x) mesh.rotation.x -= 0.01;
       if (mesh && y) mesh.rotation.y -= 0.01;

diff --git a/web-server/plugins/slycat-parameter-image/css/ui.css b/web-server/plugins/slycat-parameter-image/css/ui.css
@@ -1028,4 +1028,10 @@ a {
 .slick-cell.flashing {
   border-width: 0px !important;
   opacity: 0.5;
+}
+
+slycat-3d-viewer .header-bar {
+  overflow: scroll;
+  height: 37px;
+  white-space: nowrap;
 }
diff --git a/web-server/templates/slycat-3d-viewer.html b/web-server/templates/slycat-3d-viewer.html
@@ -1,15 +1,16 @@
-<div class="bootstrap-styles" style="padding: 10px 0 5px 10px; background-color: white;">
-  <button class="btn btn-warning btn-xs slycat-3d-btn-reset" style="margin-right: 15px;">Reset</button>
-
-  <input id="slycat-3d-x-check" type="checkbox"> x
-  <input id="slycat-3d-y-check" type="checkbox" checked="checked"> y
-  <input id="slycat-3d-z-check" type="checkbox"> z
-  <button class="btn btn-default btn-xs slycat-3d-btn-rotate" style="width: 70px; margin: 0px 15px 0px 5px;">Rotate</button>
+<div class="bootstrap-styles header-bar" style="padding: 10px 0 5px 10px; background-color: white;">
+  <button class="btn btn-warning btn-xs slycat-3d-btn-reset">Reset</button>
+  <button class="btn btn-default btn-xs slycat-3d-btn-settings" data-bind="click: run_settings">Settings</button>
+  <button class="btn btn-default btn-xs slycat-3d-btn-rotate">Rotate</button>
+  <label><input class="slycat-3d-x-check" type="checkbox"> x</label>
+  <label><input class="slycat-3d-y-check" type="checkbox" checked="checked"> y</label>
+  <label><input class="slycat-3d-z-check" type="checkbox"> z</label>
+
 
   <!-- <button class="btn btn-default btn-xs slycat-3d-btn-settings" data-toggle="modal" data-target="#slycat-3d-modal">Settings</button> -->
-  <button class="btn btn-default btn-xs slycat-3d-btn-settings" data-bind="click: run_settings">Settings</button>
+
 
-  <input id="slycat-3d-stats-check" type="checkbox" style="margin-left: 15px"> Display performance statistics
+  <label><input class="slycat-3d-stats-check" type="checkbox" style="margin-left: 15px"> Display performance statistics</label>
 
   <div class="slycat-3d-stats" style="display: none; float: right; margin-right: 25px;">
     Number of faces: <span id="slycat-3d-face3-number"></span>