This commit is contained in:
sanjayk03-dev
2023-12-30 04:21:34 +05:30
parent ca3c2e24d3
commit 5a438dbcb0
3 changed files with 38 additions and 24 deletions

View File

@@ -13,20 +13,20 @@ module.exports = {
} }
}, },
components: { components: {
"axis-control": require("./axis-control"),
"path-viewer": require("./path-viewer"),
"gcode-viewer": require("./gcode-viewer") "gcode-viewer": require("./gcode-viewer")
}, },
computed:{ computed:{
is_ready: function() { is_ready: function() {
console.log("is_ready: ",this); console.log("is_ready: ",this.mach_state);
return this.mach_state == "READY"; return this.mach_state == "READY";
}, },
}, },
methods:{ methods:{
print: function(){
console.log(this.template);
},
open: function() { open: function() {
utils.clickFileInput("gcode-file-input"); utils.clickFileInput("gcode-file-input");
console.log("utils done");
}, },
getMacrosList : function (){ getMacrosList : function (){
return no_of_macros; return no_of_macros;

View File

@@ -1,23 +1,16 @@
script#macros-template(type="text/x-template") script#macros-template(type="text/x-template")
#macros #macros
h1 Macros Configuration h1 Macros Configuration
input(type="text",id="inputField") .macros-form
button.printVariable(title="print Varibale", @click='print', h3 Name
style="height:100px;width:100px;font-weight:normal") PrintVariable input.input-name(type="text",id="macros-name",value="e.g Macros 1 ")
h3 {{no_of_macros}} .macros-form
//- button.pure-button(title="Upload a new GCode program.", @click="open", h3 Select/Upload G-Code
//- :disabled="!is_ready",style="height:100px;width:100px;font-weight:normal") button.pure-button(title="Upload a new GCode program.", @click="open",
//- .fa.fa-folder-open :disabled="!is_ready",style="height:100px;width:100px;font-weight:normal")
.fa.fa-folder-open
//- select(title="Select previously uploaded GCode programs.", select(title="Select previously uploaded GCode programs.",
//- v-model="state.selected", @change="load", :disabled="!is_ready", v-model="state.selected", @change="load", :disabled="!is_ready",
//- style="max-width:100%") style="max-width:100%")
//- option(v-for="file in state.files", :value="file") {{file}} option(v-for="file in state.files", :value="file") {{file}}
gcode-viewer
//- .progress(v-if="toolpath_progress && toolpath_progress < 1",
//- title="Simulating GCode to check for errors, calculate ETA and " +
//- "generate 3D view. You can run GCode before the simulation " +
//- "finishes.")
//- div(:style="'width:' + (toolpath_progress || 0) * 100 + '%'")
//- label Simulating {{(toolpath_progress || 0) | percent}}
gcode-viewer

View File

@@ -1033,3 +1033,24 @@ tt.save
.pure-form-aligned .pure-control-group label.extra .pure-form-aligned .pure-control-group label.extra
width 8em width 8em
.macros
padding 30px
.macros-form
padding 10px
.input-name
width 300px
height 40px
border-radius 8px
border-width 1px
border-color #434242
padding-left 10px
button
border-radius 8px
border-width 1px
border-color #434242
padding-left 10px