Blink play button to indicate pause, Many layout tweaks/improvements.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69c3ff56172b17f10533f5d6f92439ca5e503412..3242016232f9674b05aa00a7febb8bf8e9c78ea5 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Buildbotics CNC Controller Firmware Changelog
  - Synchronize file list between browsers.
  - Increased max simulation time to 24hrs.
  - Added button to download current GCode file.
+ - Blink play button to indicate pause.
 
 ## v0.4.2
  - Suppress ``Auto-creating missing tool`` warning.

diff --git a/src/js/control-view.js b/src/js/control-view.js
index 0c48b66c103f74c79bec672539742a9bb1207c30..e756c91fed3faa1c0a2398d8e05921ee54660821 100644 (file)
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -97,9 +97,7 @@ module.exports = {
     },
 
 
-    'state.selected': function () {this.load()},
-    'state.files': function () {
-      console.log('Files changed: ' + JSON.stringify(this.state.files))}
+    'state.selected': function () {this.load()}
   },
 
 

diff --git a/src/js/gcode-viewer.js b/src/js/gcode-viewer.js
index 028de4d4fe4c1104df8c19a0338eb8e8d0d80b56..658382cf2683cf3d5d9ae9994ff9e4f51ce1f7ce 100644 (file)
--- a/src/js/gcode-viewer.js
+++ b/src/js/gcode-viewer.js
@@ -67,7 +67,7 @@ module.exports = {
       rows: [],
       scrollElem: $(this.$el).find('.clusterize-scroll')[0],
       contentElem: $(this.$el).find('.clusterize-content')[0],
-      no_data_text: 'GCode viewer...',
+      no_data_text: 'GCode view...',
       callbacks: {clusterChanged: this.highlight}
     });
   },

diff --git a/src/js/path-viewer.js b/src/js/path-viewer.js
index 2c5bca625a021bf3b6356873a711df54c8634489..2d9a6d5b0e6792faa8cad9f54af62c3fad153ea2 100644 (file)
--- a/src/js/path-viewer.js
+++ b/src/js/path-viewer.js
@@ -224,7 +224,7 @@ module.exports = {
 
       if (this.loading) {
         this.controls.reset();
-        this.camera.position.copy(new THREE.Vector3(0, 0, 1000));
+        this.camera.position.copy(new THREE.Vector3(0, 0, 600));
         this.camera.lookAt(new THREE.Vector3(0, 0, 0));
       }
 
@@ -350,7 +350,7 @@ module.exports = {
 
       var geometry = new THREE.TextGeometry('Loading 3D View...', {
         font: new THREE.Font(font),
-        size: 80,
+        size: 40,
         height: 5,
         curveSegments: 12,
         bevelEnabled: true,

diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 9876e0deb67122262395c50fbac49eac87b0ed0d..3f7b1a6059ee9f908f5e844c91fe6ff15dd197f8 100644 (file)
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -207,7 +207,7 @@ script#control-view-template(type="text/x-template")
 
       section#content1.tab-content.pure-form
         .toolbar.pure-control-group
-          button.pure-button(
+          button.pure-button(:class="{'attention': is_holding}",
             title="{{is_running ? 'Pause' : 'Start'}} program.",
             @click="start_pause", :disabled="!state.selected")
             .fa(:class="is_running ? 'fa-pause' : 'fa-play'")
@@ -271,6 +271,7 @@ script#control-view-template(type="text/x-template")
       section#content2.tab-content
         .mdi.pure-form(title="Manual GCode entry.")
           button.pure-button(:disabled="!can_mdi",
+            :class="{'attention': is_holding}",
             title="{{is_running ? 'Pause' : 'Start'}} command.",
             @click="mdi_start_pause")
             .fa(:class="is_running ? 'fa-pause' : 'fa-play'")

diff --git a/src/pug/templates/indicators.pug b/src/pug/templates/indicators.pug
index 01974a1f24234c382706e4ec4bcfe2dc5acb7958..05697327684bb6ad295658d9fdae8a4ce41bf265 100644 (file)
--- a/src/pug/templates/indicators.pug
+++ b/src/pug/templates/indicators.pug
@@ -257,7 +257,7 @@ script#indicators-template(type="text/x-template")
         th Current
 
     h2 DB25 breakout box
-    img(width=700, src="images/DB25_breakout_box.png")
+    img(src="images/DB25_breakout_box.png")
 
     h2 DB25-M2 breakout
-    img(width=400, src="images/DB25-M2_breakout.png")
+    img(src="images/DB25-M2_breakout.png")

diff --git a/src/resources/images/DB25_breakout_box.png b/src/resources/images/DB25_breakout_box.png
index a1c1b99571c3ae2d27df4bd1dd16748ebe92aedb..b426d370321621545c34a4b791ef6fefa0cd3cd9 100644 (file)
Binary files a/src/resources/images/DB25_breakout_box.png and b/src/resources/images/DB25_breakout_box.png differ

diff --git a/src/stylus/style.styl b/src/stylus/style.styl
index a57d997320dd4b5349f078a8b6a1cf3d5f8fc1b4..1a4ea561563127a06ba414bc1a885b3d931a6228 100644 (file)
--- a/src/stylus/style.styl
+++ b/src/stylus/style.styl
@@ -52,12 +52,8 @@ tt
     &:hover
       border-color #aaa
 
-    &.medium
-      width inherit
-      height 240px
-
     &.large
-      width 794px
+      width 100%
       margin 5px 0
       height inherit
 
@@ -173,6 +169,8 @@ span.unit
 
 
 #main
+  margin-left 0.5em
+
   .content
     h2
       text-transform capitalize
@@ -216,9 +214,11 @@ span.unit
 
 .control-view
   table
-    margin 0.5em 0
     border-collapse collapse
 
+    &:first-child
+      margin 0.5em 0
+
     td, th
       border 1px solid #ddd
 
@@ -402,6 +402,7 @@ span.unit
 
   .toolbar
     clear both
+    padding 0 0.125em
 
     > *
       margin 0.25em 0.125em
@@ -415,7 +416,7 @@ span.unit
       line-height 2em
       border 1px solid #aaa
       border-radius 3px
-      width 300px
+      width 330px
       vertical-align middle
       text-align center
 
@@ -437,7 +438,6 @@ span.unit
 
   .path-viewer
     width 100%
-    max-width 99%
 
     .path-viewer-content
       height 500px
@@ -447,10 +447,7 @@ span.unit
     clear both
     overflow auto
     width 100%
-    max-width 99%
-    min-width 99%
     height 450px
-    padding 0.25em
     white-space nowrap
 
     .clusterize-scroll
@@ -459,6 +456,9 @@ span.unit
     &.placeholder
       color #aaa
 
+  .history
+    padding 0.25em
+
   .gcode ul, .history ul
     margin 0
     padding 0
@@ -487,9 +487,14 @@ span.unit
   .mdi
     clear both
     white-space nowrap
+    padding 0.125em
+    display flex
+
+    > *
+      margin 0.125em
 
     input
-      width 90%
+      flex 2
 
   .jog
     text-align center
@@ -550,14 +555,14 @@ span.unit
   .path-viewer-content
     background-color #333
     background linear-gradient(to bottom, #666 0%, #222 100%);
+    margin-bottom 0.5em
 
   &.small
     .path-viewer-content
-      width 335px
+      width 340px
       height 150px
       float right
-      margin-top -84px
-      border-radius 4px
+      margin-top -88px
 
 .console
   .console-wrapper
@@ -576,6 +581,12 @@ span.unit
       border 1px solid #ddd
       padding 2px
 
+      &:first-child
+        border-left 0
+
+      &:last-child
+        border-right 0
+
     tr
       > td
         margin 0 0.125em
@@ -591,7 +602,7 @@ tr.log-debug td
   color green
 
 .indicators
-  padding 1em 0.75em
+  padding 1em 0
   text-align center
 
   table
@@ -603,6 +614,7 @@ tr.log-debug td
 
     td, th
       padding 4px
+      white-space nowrap
 
     tr:nth-child(odd)
       background #f7f7f7
@@ -882,7 +894,13 @@ tt.save
       height 1em
 
 
-@media only screen and (max-width 48em)
+@media only screen and (max-width 970px)
+  .control-view #control
+    .path-viewer.small .path-viewer-content
+      margin-top inherit
+      float inherit
+
+@media only screen and (max-width 940px)
   .header
     height auto
 
@@ -906,11 +924,5 @@ tt.save
       clear both
       width 99%
 
-    .path-viewer
-      &.small
-        .path-viewer-content
-          margin-top inherit
-          float inherit
-
   .tab_container
     width 98%