From ce4d2b74f25cbe9988fcf41a7fdacab78adf2881 Mon Sep 17 00:00:00 2001 From: openbuilds-engineer Date: Wed, 24 Apr 2019 19:47:21 +0200 Subject: [PATCH] v1.0.159 --- CHANGELOG.txt | 1 + app/css/buttons.css | 8 + app/css/main.css | 13 +- app/css/mobilejog.css | 13 -- app/index.html | 17 +- app/jog.html | 401 ------------------------------------------ app/js/ui.js | 54 +++--- index.js | 2 +- package.json | 2 +- 9 files changed, 57 insertions(+), 454 deletions(-) delete mode 100644 app/jog.html diff --git a/CHANGELOG.txt b/CHANGELOG.txt index eb77fd7..280c7d5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,4 @@ +v1.0.159: Added Feedrate/Spindle Override Reset Buttons v1.0.158: Improvements to the Mobile Jog UI v1.0.157: Fix Bug#66 -Grbl settings invert display: , Fix Bug#68 - Machine Image for Custom, Fix Bug#69 - Keyboard: disable bindings in Macro Inputs, Improvement: Keyboard Binding for UNLOCK will also close Alarm Dialog now. v1.0.156: Added Job Time Remaining functionality diff --git a/app/css/buttons.css b/app/css/buttons.css index 91dff26..5fbf192 100644 --- a/app/css/buttons.css +++ b/app/css/buttons.css @@ -11,6 +11,14 @@ border: 1px solid lightgray; } +#frocell button { + border: 1px solid lightgray; +} + +#trocell button { + border: 1px solid lightgray; +} + .jogbtn:disabled { pointer-events:none; } diff --git a/app/css/main.css b/app/css/main.css index 00094b0..c2bd7b9 100644 --- a/app/css/main.css +++ b/app/css/main.css @@ -10,9 +10,14 @@ body { supported by Chrome and Opera */ } +#jogcontrols { + /* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */ + height: 190px; +} + #macros { /* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */ - height: calc(100vh - 480px); + height: calc(100vh - 445px); width: 100%; border-top: 1px solid #ccc; /* margin-top: 5px; */ @@ -22,7 +27,7 @@ body { #renderArea { /* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */ - height: calc(100vh - 480px); + height: calc(100vh - 445px); width: 100%; border-top: 1px solid #ccc; /* margin-top: 5px; */ @@ -33,7 +38,7 @@ body { #editor { /* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */ - height: calc(100vh - 480px); + height: calc(100vh - 485px); width: 100%; border-top: 1px solid #ccc; /* margin-top: 5px; */ @@ -43,7 +48,7 @@ body { #console { /*font-family: "Courier New", Courier, monospace;*/ font-family: "Lucida Console", Monaco, monospace; - height: calc(100vh - 505px); + height: calc(100vh - 485px); width: 100%; overflow-y: auto; overflow-x: none; diff --git a/app/css/mobilejog.css b/app/css/mobilejog.css index 3a84fc6..fa9bfdd 100644 --- a/app/css/mobilejog.css +++ b/app/css/mobilejog.css @@ -1,13 +1,3 @@ -/* #svgview { - /* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */ - height: 200px; - width: calc(100vw - 30px); - margin: 10px; - border: 2px dashed #ccc; - border-radius: 10px; - background-color: white; -} - #buttonview { /* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */ padding-top: 2px; @@ -40,9 +30,6 @@ padding-bottom: 3px; } -.title_box #svgview { -} - .dromobile { /* width: calc(100vw - 75px) !important; */ } diff --git a/app/index.html b/app/index.html index 0dfc77c..6b04cac 100644 --- a/app/index.html +++ b/app/index.html @@ -355,7 +355,7 @@
-
+
@@ -509,6 +509,7 @@
+ + + +
@@ -607,15 +608,23 @@
+ +
+
- reset +
- reset +
@@ -849,7 +858,7 @@
Changelog
-
+
diff --git a/app/jog.html b/app/jog.html deleted file mode 100644 index 8e5d4bb..0000000 --- a/app/jog.html +++ /dev/null @@ -1,401 +0,0 @@ - - - - - OpenBuilds CONTROL - - - - - - - - - - - - - - - -
-
- - - OpenBuilds CONTROL -
- - -
-
-
- - - - - -
- - - - -
- - - - -
- -
-
- - - - - - - - - - - - - - - - - -
- - -
-
- - X - - -
-
0.000
- -
-
- - -
-
- - Y - - -
-
0.000
- -
-
- - -
-
- - Z - - -
-
0.000
- -
-
- - - -
-
- - - - - - - - -
-
-
-
- - - - - - -
-
-
-
- Not Connected -
-
-
-
- Not Connected -
-
-
-
- Job Queue: 0 -
-
-
-
-
-
-
-
-
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/js/ui.js b/app/js/ui.js index b15d5d5..3543235 100644 --- a/app/js/ui.js +++ b/app/js/ui.js @@ -215,12 +215,11 @@ function setControlBar(val, status) { function setJogPanel(val, status) { if (val == 0) { // Not Connected Yet // Show panel and resize editor - $("#svgview").css('background-color', '#f5f6f7'); // $("#jogcontrols").slideUp(20); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); - $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); + // $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); + // $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); // $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); if (editor) { editor.resize() @@ -240,11 +239,10 @@ function setJogPanel(val, status) { } else if (val == 1 || val == 2) { // Connected, but not Playing yet // Show panel and resize editor - $("#svgview").css('background-color', '#ffffff'); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); - $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); + // $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); + // $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); // $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); if (editor) { editor.resize() @@ -263,11 +261,10 @@ function setJogPanel(val, status) { } } else if (val == 3) { // Busy Streaming GCODE // Show panel and resize editor - $("#svgview").css('background-color', '#f5f6f7'); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); - $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); + // $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); + // $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); if (editor) { editor.resize() } @@ -283,11 +280,10 @@ function setJogPanel(val, status) { } } else if (val == 4) { // Paused // Show panel and resize editor - $("#svgview").css('background-color', '#f5f6f7'); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); - $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); + // $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); + // $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); if (editor) { editor.resize() } @@ -302,11 +298,10 @@ function setJogPanel(val, status) { } } else if (val == 5) { // Alarm State // Show panel and resize editor - $("#svgview").css('background-color', '#f5f6f7'); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); - $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); + // $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); + // $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); // $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); if (editor) { editor.resize() @@ -322,12 +317,11 @@ function setJogPanel(val, status) { } } else if (val == 6) { // Firmware Upgrade State // Show panel and resize editor - $("#svgview").css('background-color', '#f5f6f7'); // $("#jogcontrols").slideUp(20); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); - $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); + // $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#macros").css('height', 'calc(' + 100 + 'vh - ' + 485 + 'px)'); + // $("#console").css('height', 'calc(' + 100 + 'vh - ' + 505 + 'px)'); + // $("#renderArea").css('height', 'calc(' + 100 + 'vh - ' + 448 + 'px)'); // $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); if (editor) { editor.resize() diff --git a/index.js b/index.js index 5e682fb..0ef5d1c 100644 --- a/index.js +++ b/index.js @@ -2256,7 +2256,7 @@ if (isElectron()) { // Create the browser window. jogWindow = new BrowserWindow({ // 1366 * 768 == minimum to cater for - width: 850, + width: 870, height: 850, fullscreen: false, center: true, diff --git a/package.json b/package.json index 2fa59f8..a9a1730 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.158", + "version": "1.0.159", "license": "AGPL-3.0", "description": "Machine Interface Driver for OpenBuilds", "author": "github.com/openbuilds ",