Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add profile name field to calibrate bed_mesh dialog #664

Merged
merged 2 commits into from
Feb 20, 2022
Merged

feat: add profile name field to calibrate bed_mesh dialog #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4f7f32
feat: add profile name field to calibrate bed_mesh
meteyou Feb 20, 2022
70e0f3e
Merge branch 'develop' into feat/add-name-field-when-creating-bed_mesh
meteyou Feb 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@
"Rename": "rename",
"BedMeshRemove": "Bed Mesh Remove",
"BedMeshCalibrate": "Bed Mesh Calibrate",
"DoYouReallyWantToCalibrate": "Do you really want to start the bed calibration?",
"DeleteBedMeshProfile": "Delete Bed Mesh Profile",
"DoYouReallyWantToDelete": "Do you really want to delete the profile \"{name}\"?",
"RemoveSaveDescription": "The bed_mesh profile has been registered as deleted. Click on SAVE_CONFIG to remove it from the printer.cfg and restart Klipper.",
Expand Down
44 changes: 35 additions & 9 deletions src/pages/Heightmap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
:loading="loadings.includes('bedMeshCalibrate')"
:disabled="printerIsPrinting"
:title="$t('Heightmap.TitleCalibrate')"
@click="calibrateDialog = true">
@click="openCalibrateMesh">
{{ $t('Heightmap.Calibrate') }}
</v-btn>
</template>
Expand Down Expand Up @@ -317,23 +317,32 @@
</v-card-actions>
</panel>
</v-dialog>
<v-dialog v-model="calibrateDialog" persistent :max-width="400" @keydown.esc="calibrateDialog = false">
<v-dialog
v-model="calibrateDialog.boolShow"
persistent
:max-width="400"
@keydown.esc="calibrateDialog.boolShow = false">
<panel
:title="$t('Heightmap.BedMeshCalibrate')"
icon="mdi-grid"
card-class="heightmap-calibrate-dialog"
:margin-bottom="false">
<template #buttons>
<v-btn icon tile @click="calibrateDialog = false">
<v-btn icon tile @click="calibrateDialog.boolShow = false">
<v-icon>mdi-close-thick</v-icon>
</v-btn>
</template>
<v-card-text>
<p class="mb-0">{{ $t('Heightmap.DoYouReallyWantToCalibrate') }}</p>
<v-text-field
v-model="calibrateDialog.name"
ref="inputFieldCalibrateBedMeshName"
:label="$t('Heightmap.Name')"
@keyup.enter="calibrateMesh"
required></v-text-field>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn text @click="calibrateDialog = false">{{ $t('Heightmap.Abort') }}</v-btn>
<v-btn text @click="calibrateDialog.boolShow = false">{{ $t('Heightmap.Abort') }}</v-btn>
<v-btn color="primary" text @click="calibrateMesh">{{ $t('Heightmap.Calibrate') }}</v-btn>
</v-card-actions>
</panel>
Expand Down Expand Up @@ -435,13 +444,20 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
// eslint-disable-next-line
heightmap: any
inputDialogRenameHeightmapName: HTMLInputElement
inputFieldCalibrateBedMeshName: HTMLInputElement
}

private renameDialog = false
private removeDialogProfile = ''
private removeDialog = false
private saveConfigDialog = false
private calibrateDialog = false
private calibrateDialog: {
boolShow: boolean
name: string
} = {
boolShow: false,
name: 'default',
}
private newName = ''
private oldName = ''

Expand Down Expand Up @@ -1064,10 +1080,20 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
this.$socket.emit('printer.gcode.script', { script: 'BED_MESH_CLEAR' }, { loading: 'bedMeshClear' })
}

openCalibrateMesh() {
this.calibrateDialog.name = 'default'
this.calibrateDialog.boolShow = true

setTimeout(() => {
this.$refs.inputFieldCalibrateBedMeshName?.focus()
}, 200)
}

calibrateMesh(): void {
this.calibrateDialog = false
this.$store.dispatch('server/addEvent', { message: 'BED_MESH_CALIBRATE', type: 'command' })
this.$socket.emit('printer.gcode.script', { script: 'BED_MESH_CALIBRATE' }, { loading: 'bedMeshCalibrate' })
this.calibrateDialog.boolShow = false
const gcode = 'BED_MESH_CALIBRATE PROFILE="' + this.calibrateDialog.name + '"'
this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'bedMeshCalibrate' })
}

saveConfig() {
Expand Down