CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

last fixes for control panel customizing

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej
2021-02-09 22:23:20 +01:00
parent 0d2f9bd8d8
commit 9ccc3f69a3
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/panels/ControlPanel.vue
View File

@@ -42,7 +42,7 @@
<v-btn-toggle dense no-gutters class="row no-gutters mx-auto" style="flex-wrap: nowrap;" >
<v-btn @click="doSendMove('Z-'+steps, feedrateZ)" class="btnMinWidthAuto col" v-for="steps of stepsZsorted" v-bind:key="'z-'+steps"><span class="body-2">-{{ steps }}</span></v-btn>
<v-btn @click="doHomeZ" :color="homedAxes.includes('z') ? 'primary' : 'warning'" :loading="loadings.includes('homeZ')" class="font-weight-bold btnHomeAxis">Z</v-btn>
<v-btn @click="doSendMove('Z+'+steps, feedrateZ)" class="btnMinWidthAuto col" v-for="steps of stepsZsortedReverse" v-bind:key="'z+'+steps"><span class="body-2">{{ steps }}</span></v-btn>
<v-btn @click="doSendMove('Z+'+steps, feedrateZ)" class="btnMinWidthAuto col" v-for="steps of stepsZsortedReverse" v-bind:key="'z+'+steps"><span class="body-2">+{{ steps }}</span></v-btn>
</v-btn-toggle>
</v-col>
</v-row>

35
src/components/panels/Settings/ControlPanel.vue
View File

@@ -1,11 +1,9 @@
<style>
.webcamImage {
width: 100%;
}
</style>
<template>
<div>
<v-form ref="formControlExtruder">
<v-card>
<v-toolbar flat dense >
<v-toolbar-title>
@@ -19,18 +17,27 @@
<v-text-field
label="Speed XY"
v-model="feedrateXY"
@blur="blurFeedrateXY"
type="number"
suffix="mm/s"
hide-details="auto"
:rules="[
v => v > 0 || 'Minimum speed is 1'
]"
></v-text-field>
</v-col>
<v-col col-6>
<v-text-field
label="Speed Z"
v-model="feedrateZ"
@blur="blurFeedrateZ"
type="number"
suffix="mm/s"
hide-details="auto"
ref="feedrateZ"
:rules="[
v => v > 1 || 'Minimum speed is 1'
]"
></v-text-field>
</v-col>
</v-row>
@@ -58,7 +65,6 @@
<v-combobox
label="Move distances Z in mm"
v-model="stepsZ"
:items="defaultStepsZ"
hide-selected
hide-details="auto"
multiple
@@ -89,7 +95,6 @@
<v-combobox
label="Move distances E in mm"
v-model="feedamountsE"
:items="defaultFeedamounts"
hide-selected
hide-details="auto"
multiple
@@ -109,7 +114,6 @@
<v-combobox
label="Speed E in mm/s"
v-model="feedratesE"
:items="defaultFeedrates"
hide-selected
hide-details="auto"
multiple
@@ -127,7 +131,7 @@
</v-container>
</v-card-text>
</v-card>
</div>
</v-form>
</template>
<script>
@@ -137,10 +141,7 @@
},
data: function() {
return {
defaultStepsXY: [100,10,1],
defaultStepsZ: [25,1,0.1],
defaultFeedamounts: [ 50, 25, 10, 5, 1 ],
defaultFeedrates: [ 60, 30, 15, 5, 1 ],
}
},
computed: {
@@ -205,8 +206,16 @@
}
},
},
mounted() {
this.$refs.formControlExtruder.validate()
},
methods: {
blurFeedrateXY() {
if (!(this.feedrateXY > 0)) this.feedrateXY = 100
},
blurFeedrateZ() {
if (!(this.feedrateZ > 0)) this.feedrateZ = 25
}
}
}
</script>