muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed sticky modal issue mostly by removing anims

Browse Source
This commit is contained in:
David Carley
2021-03-03 01:21:01 -08:00
parent e02711eb50
commit 6c525930fe
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/js/control-view.js
View File

@@ -97,13 +97,12 @@ module.exports = {
'state.bitDiameter': { 'state.bitDiameter': {
handler: function (bitDiameter) { handler: function (bitDiameter) {
console.log("New bitDiameter " + bitDiameter); if(this.mach_units == 'IMPERIAL') {
console.log("Units: " + this.mach_units);
if(this.mach_units == 'IMPERIAL')
this.tool_diameter = bitDiameter / 25.4; this.tool_diameter = bitDiameter / 25.4;
else }
else {
this.tool_diameter = bitDiameter; this.tool_diameter = bitDiameter;
console.log("Tool diameter: " + this.tool_diameter); }
}, },
immediate: true immediate: true
}, },
@@ -372,11 +371,11 @@ module.exports = {
let plunge = Math.min(12.7, zoffset * 0.75); let plunge = Math.min(12.7, zoffset * 0.75);
plunge += zlift; // Compensate for the fact that we lift after probing Z plunge += zlift; // Compensate for the fact that we lift after probing Z
xoffset = xoffset.toFixed(5); xoffset = xoffset.toFixed(5);
yoffset = yoffset.toFixed(5); yoffset = yoffset.toFixed(5);
zoffset = zoffset.toFixed(5); zoffset = zoffset.toFixed(5);
slowSeek = slowSeek.toFixed(5); slowSeek = slowSeek.toFixed(5);
fastSeek = fastSeek.toFixed(5); fastSeek = fastSeek.toFixed(5);
plunge = plunge.toFixed(5); plunge = plunge.toFixed(5);
slowSeek = `F${slowSeek}`; slowSeek = `F${slowSeek}`;
@@ -427,8 +426,8 @@ module.exports = {
} }
zoffset = zoffset.toFixed(5); zoffset = zoffset.toFixed(5);
slowSeek = slowSeek.toFixed(5); slowSeek = slowSeek.toFixed(5);
fastSeek = fastSeek.toFixed(5); fastSeek = fastSeek.toFixed(5);
slowSeek = `F${slowSeek}`; slowSeek = `F${slowSeek}`;
fastSeek = `F${fastSeek}`; fastSeek = `F${fastSeek}`;
@@ -478,29 +477,27 @@ module.exports = {
this.toolpath = {}; this.toolpath = {};
if (!file) return; if (!file) return;
if (this.last_file_time != file_time) return; if (this.last_file_time != file_time) return;
this.showGcodeMessage = true; this.showGcodeMessage = true;
let done = false; while (this.showGcodeMessage) {
while (!done) {
const toolpath = await api.get(`path/${file}`); const toolpath = await api.get(`path/${file}`);
this.toolpath_progress = toolpath.progress;
if (typeof toolpath.progress == 'undefined') { if (typeof toolpath.progress == 'undefined') {
done = true; this.showGcodeMessage = false
toolpath.filename = file; toolpath.filename = file;
this.toolpath_progress = 1; this.toolpath_progress = 1;
this.showGcodeMessage = false;
this.toolpath = toolpath; this.toolpath = toolpath;
var state = this.$root.state; const state = this.$root.state;
var bounds = toolpath.bounds; const bounds = toolpath.bounds;
for (var axis of 'xyzabc') { for (let axis of 'xyzabc') {
Vue.set(state, 'path_min_' + axis, bounds.min[axis]); Vue.set(state, 'path_min_' + axis, bounds.min[axis]);
Vue.set(state, 'path_max_' + axis, bounds.max[axis]); Vue.set(state, 'path_max_' + axis, bounds.max[axis]);
} }
} else {
this.toolpath_progress = toolpath.progress;
} }
} }
}, },

2
src/pug/templates/message.pug
View File

@@ -26,7 +26,7 @@
//-///////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
script#message-template(type="text/x-template") script#message-template(type="text/x-template")
.modal-mask(v-show="show", transition="modal") .modal-mask(v-if="show")
.modal-wrapper .modal-wrapper
.modal-container .modal-container
.modal-header .modal-header