diff --git a/src/js/control-view.js b/src/js/control-view.js index e4c3b36..9ea3660 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -204,6 +204,8 @@ module.exports = { }, isMacrosPresent: function(){ if(this.config.macros!=undefined){ + console.log("isMacrosPresent",this.config.macros!=undefined); + console.log(this.config.macros.length!=0); return this.config.macros.length!=0; } return false; diff --git a/src/js/macros.js b/src/js/macros.js index d711d7e..993663c 100644 --- a/src/js/macros.js +++ b/src/js/macros.js @@ -8,7 +8,6 @@ module.exports = { data: function (){ return { - no_of_macros : 0, toolpath_progress: 0, } }, @@ -38,9 +37,6 @@ module.exports = { utils.clickFileInput("gcode-file-input"); console.log("utils done"); }, - getMacrosList : function (){ - return no_of_macros; - }, load: function() { const file_time = this.state.selected_time; console.log('file_time',this.state.selected_time); @@ -67,6 +63,8 @@ module.exports = { name:macrosName, color:macrosColor }) + console.log("Successfully saved"); + console.lof(this.config.macros); }, } } \ No newline at end of file diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index f98b515..020901e 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -207,8 +207,9 @@ script#control-view-template(type="text/x-template") label {{(progress || 0) | percent}} .bar(:style="'width:' + (progress || 0) * 100 + '%'") - .macros-buttons(v-if="this.config.macros!=undefined") -
there is a macro + .macros-div + .macros-buttons(v-if="isMacrosPresent") +
there is a macro .tabs diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug index 626bd92..9446da0 100644 --- a/src/pug/templates/macros.pug +++ b/src/pug/templates/macros.pug @@ -14,6 +14,6 @@ script#macros-template(type="text/x-template") v-model="state.selected", @change="load", :disabled="!is_ready", style="max-width:100%") option(v-for="file in state.files", :value="file") {{file}} - button.submit-macros(title="Save Macros",@click="saveMacros",style="height:100px;width:100px;font-weight:normal") + button.submit-macros(title="Save Macros",@click="saveMacros",style="height:100px;width:100px;font-weight:normal") Save Macros gcode-viewer