diff --git a/app/index.html b/app/index.html index c4f2493b..cadf684a 100644 --- a/app/index.html +++ b/app/index.html @@ -498,7 +498,7 @@
-
+
@@ -511,7 +511,7 @@
-
+
+
+
+
+
+
diff --git a/app/js/ui.js b/app/js/ui.js index 774695d8..04f4d862 100644 --- a/app/js/ui.js +++ b/app/js/ui.js @@ -130,8 +130,8 @@ function setJogPanel(val, status) { if (val == 0) { // Not Connected Yet // Show panel and resize editor $("#jogcontrols").slideUp("fast"); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)'); + $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 270 + 'px)'); + $("#console").css('height', 'calc(' + 100 + 'vh - ' + 270 + 'px)'); $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); editor.resize() $('.jogbtn').attr('disabled', true); @@ -141,8 +141,8 @@ function setJogPanel(val, status) { } else if (val == 0 || val == 2) { // Connected, but not Playing yet // Show panel and resize editor $("#jogcontrols").slideDown("fast"); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 450 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 490 + 'px)'); + $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 460 + 'px)'); + $("#console").css('height', 'calc(' + 100 + 'vh - ' + 500 + 'px)'); $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); editor.resize() $('.jogbtn').attr('disabled', false); @@ -151,8 +151,8 @@ function setJogPanel(val, status) { } } else if (val == 3) { // Busy Streaming GCODE // Show panel and resize editor - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 450 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 490 + 'px)'); + $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 460 + 'px)'); + $("#console").css('height', 'calc(' + 100 + 'vh - ' + 500 + 'px)'); $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); editor.resize() $("#jogcontrols").slideDown("fast"); @@ -163,8 +163,8 @@ function setJogPanel(val, status) { } else if (val == 4) { // Paused // Show panel and resize editor $("#jogcontrols").slideDown("fast"); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 450 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 490 + 'px)'); + $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 460 + 'px)'); + $("#console").css('height', 'calc(' + 100 + 'vh - ' + 500 + 'px)'); $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); editor.resize() $('.jogbtn').attr('disabled', true); @@ -174,8 +174,8 @@ function setJogPanel(val, status) { } else if (val == 5) { // Alarm State // Show panel and resize editor $("#jogcontrols").slideUp("fast"); - $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)'); - $("#console").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)'); + $("#editor").css('height', 'calc(' + 100 + 'vh - ' + 270 + 'px)'); + $("#console").css('height', 'calc(' + 100 + 'vh - ' + 270 + 'px)'); $('#console').scrollTop($("#console")[0].scrollHeight - $("#console").height()); editor.resize() $('.jogbtn').attr('disabled', true); diff --git a/app/js/websocket.js b/app/js/websocket.js index 4ee3a267..9314441b 100644 --- a/app/js/websocket.js +++ b/app/js/websocket.js @@ -154,6 +154,14 @@ function initSocket() { } } $('#gcodesent').html("Queue: " + parseInt(data[0])); + + // calc percentage + var left = parseInt(data[0]) + var total = parseInt(data[1]) + var done = total - left; + var donepercent = parseInt(done / total * 100) + var progressbar = $("#progressbar").data("progress"); + progressbar.val(donepercent); // } sduploading = data[2]; if (sduploading) { diff --git a/index.js b/index.js index 51319d50..e47d4777 100644 --- a/index.js +++ b/index.js @@ -2287,7 +2287,7 @@ if (electronApp) { // Create the browser window. jogWindow = new BrowserWindow({ width: 660, - height: 710, + height: 730, fullscreen: false, center: true, resizable: true, diff --git a/package.json b/package.json index cb49f473..bf4a7cc4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsMachineDriver", - "version": "1.0.36", + "version": "1.0.37", "license": "AGPL-3.0", "description": "Machine Interface Driver for OpenBuilds", "author": "github.com/openbuilds ",