Skip to content

refactor: move compensation menu so it can be relocated added elsewhere #508

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

Open
wants to merge 1 commit into
base: v3.7-dev
Choose a base branch
from
Open

refactor: move compensation menu so it can be relocated added elsewhere #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
101 changes: 101 additions & 0 deletions src/components/misc/CompensationMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<template>
<div>
<v-menu offset-y left :disabled="uiFrozen">
<template #activator="{ on }">
<v-btn v-show="visibleAxes.length" color="primary" block class="mx-0 move-btn" v-on="on" :disabled="uiFrozen">
{{ $t("panel.movement.compensation") }}
<v-icon>mdi-menu-down</v-icon>
</v-btn>
</template>

<v-card>
<v-list>
<div v-show="isCompensationEnabled">
<v-list-item>
<v-spacer />
{{ $t("panel.movement.compensationInUse", [compensationType]) }}
<v-spacer />
</v-list-item>

<v-divider />
</div>

<v-list-item @click="sendCode('G32')">
<v-icon class="mr-1">mdi-format-vertical-align-center</v-icon>
{{ $t(isDelta ? "panel.movement.runDelta" : "panel.movement.runBed") }}
</v-list-item>
<v-list-item :disabled="!isCompensationEnabled" @click="sendCode('M561')">
<v-icon class="mr-1">mdi-border-none</v-icon>
{{ $t("panel.movement.disableBedCompensation") }}
</v-list-item>

<v-divider />

<v-list-item @click="sendCode('G29')">
<v-icon class="mr-1">mdi-grid</v-icon>
{{ $t("panel.movement.runMesh") }}
</v-list-item>
<v-list-item @click="showMeshEditDialog = true">
<v-icon class="mr-1">mdi-pencil</v-icon>
{{ $t("panel.movement.editMesh") }}
</v-list-item>
<v-list-item @click="sendCode('G29 S1')">
<v-icon class="mr-1">mdi-content-save</v-icon>
{{ $t("panel.movement.loadMesh") }}
</v-list-item>
<v-list-item :disabled="!isCompensationEnabled" @click="sendCode('G29 S2')">
<v-icon class="mr-1">mdi-grid-off</v-icon>
{{ $t("panel.movement.disableMeshCompensation") }}
</v-list-item>
</v-list>
</v-card>
</v-menu>
<mesh-edit-dialog :shown.sync="showMeshEditDialog" />
</div>
</template>

<script lang="ts">
import Vue from "vue";
import { Axis, KinematicsName, MoveCompensationType } from "@duet3d/objectmodel";
import store from "@/store";
interface CompensationMenuData {
showMeshEditDialog: boolean;
}
export default Vue.extend({
data(): CompensationMenuData {
return {
showMeshEditDialog: false,
};
},
computed: {
uiFrozen(): boolean {
return store.getters["uiFrozen"];
},
isCompensationEnabled(): boolean {
return store.state.machine.model.move.compensation.type !== MoveCompensationType.none;
},
compensationType(): MoveCompensationType {
return store.state.machine.model.move.compensation.type;
},
visibleAxes(): Axis[] {
return store.state.machine.model.move.axes.filter((axis: Axis) => axis.visible);
},
isDelta(): boolean {
return [KinematicsName.delta, KinematicsName.rotaryDelta].includes(store.state.machine.model.move.kinematics.name);
},
},
methods: {
async sendCode(code: string): Promise<void> {
await store.dispatch("machine/sendCode", code);
},
},
watch: {
isConnected() {
// Hide dialogs when the connection is interrupted
this.showMeshEditDialog = false;
},
},
});
</script>
2 changes: 2 additions & 0 deletions src/components/misc/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import NotificationDisplay from "./NotificationDisplay.vue";
import PanelLink from "./PanelLink.vue";
import StatusLabel from "./StatusLabel.vue";
import ThumbnailImg from "./ThumbnailImg.vue";
import CompensationMenu from "./CompensationMenu.vue";

Vue.component("directory-breadcrumbs", DirectoryBreadcrumbs);
Vue.component("job-progress", JobProgress);
Expand All @@ -15,3 +16,4 @@ Vue.component("notification-display", NotificationDisplay);
Vue.component("panel-link", PanelLink);
Vue.component("status-label", StatusLabel);
Vue.component("thumbnail-img", ThumbnailImg);
Vue.component("compensation-menu", CompensationMenu);
60 changes: 2 additions & 58 deletions src/components/panels/CNCMovementPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,57 +29,7 @@
</code-btn>
</v-col>
<v-col cols="6" order="2" md="8" order-md="2">
<v-menu offset-y left :disabled="uiFrozen">
<template #activator="{ on }">
<v-btn v-show="visibleAxes.length" color="primary" block class="mx-0 move-btn"
:disabled="uiFrozen" v-on="on">
{{ $t("panel.movement.compensation") }}
<v-icon>mdi-menu-down</v-icon>
</v-btn>
</template>

<v-card>
<v-list>
<div v-show="isCompensationEnabled">
<v-list-item>
<v-spacer />
{{ $t("panel.movement.compensationInUse", [compensationType]) }}
<v-spacer />
</v-list-item>

<v-divider />
</div>

<v-list-item @click="sendCode('G32')">
<v-icon class="mr-1">mdi-format-vertical-align-center</v-icon>
{{ $t(isDelta ? "panel.movement.runDelta" : "panel.movement.runBed") }}
</v-list-item>
<v-list-item :disabled="!isCompensationEnabled" @click="sendCode('M561')">
<v-icon class="mr-1">mdi-border-none</v-icon>
{{ $t("panel.movement.disableBedCompensation") }}
</v-list-item>

<v-divider />

<v-list-item @click="sendCode('G29')">
<v-icon class="mr-1">mdi-grid</v-icon>
{{ $t("panel.movement.runMesh") }}
</v-list-item>
<v-list-item @click="showMeshEditDialog = true">
<v-icon class="mr-1">mdi-pencil</v-icon>
{{ $t("panel.movement.editMesh") }}
</v-list-item>
<v-list-item @click="sendCode('G29 S1')">
<v-icon class="mr-1">mdi-content-save</v-icon>
{{ $t("panel.movement.loadMesh") }}
</v-list-item>
<v-list-item :disabled="!isCompensationEnabled" @click="sendCode('G29 S2')">
<v-icon class="mr-1">mdi-grid-off</v-icon>
{{ $t("panel.movement.disableMeshCompensation") }}
</v-list-item>
</v-list>
</v-card>
</v-menu>
<compensation-menu />
</v-col>
<v-col cols="12" order="3" md="2" order-md="3">
<v-btn @click="setWorkplaceZero" block class="move-btn">
Expand Down Expand Up @@ -162,15 +112,14 @@
{{ $t("panel.movement.noAxes") }}
</v-alert>

<mesh-edit-dialog :shown.sync="showMeshEditDialog" />
<input-dialog :shown.sync="moveStepDialog.shown" :title="$t('dialog.changeMoveStep.title')"
:prompt="$t('dialog.changeMoveStep.prompt')" :preset="moveStepDialog.preset" is-numeric-value
@confirmed="moveStepDialogConfirmed" />
</v-card>
</template>

<script lang="ts">
import { Axis, AxisLetter, KinematicsName, MoveCompensationType } from "@duet3d/objectmodel";
import { Axis, AxisLetter } from "@duet3d/objectmodel";
import Vue from "vue";

import store from "@/store";
Expand All @@ -180,17 +129,13 @@ export default Vue.extend({
uiFrozen(): boolean { return store.getters["uiFrozen"]; },
moveSteps(): (axisLetter: AxisLetter) => Array<number> { return ((axisLetter: AxisLetter) => store.getters["machine/settings/moveSteps"](axisLetter)); },
numMoveSteps(): number { return store.getters["machine/settings/numMoveSteps"]; },
isCompensationEnabled(): boolean { return store.state.machine.model.move.compensation.type !== MoveCompensationType.none; },
compensationType(): MoveCompensationType { return store.state.machine.model.move.compensation.type; },
visibleAxes(): Array<Axis> { return store.state.machine.model.move.axes.filter(axis => axis.visible); },
isDelta(): boolean { return [KinematicsName.linearDelta, KinematicsName.rotaryDelta].includes(store.state.machine.model.move.kinematics.name); },
unhomedAxes(): Array<Axis> { return store.state.machine.model.move.axes.filter(axis => axis.visible && !axis.homed); },
workCoordinates(): Array<number> { return [...Array(9).keys()].map(i => i + 1); },
workplaceNumber(): number { return store.state.machine.model.move.workplaceNumber; }
},
data() {
return {
showMeshEditDialog: false,
moveStepDialog: {
shown: false,
axis: AxisLetter.X,
Expand Down Expand Up @@ -258,7 +203,6 @@ export default Vue.extend({
watch: {
isConnected() {
// Hide dialogs when the connection is interrupted
this.showMeshEditDialog = false;
this.moveStepDialog.shown = false;
},
workplaceNumber(to: number) {
Expand Down
53 changes: 2 additions & 51 deletions src/components/panels/MovementPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,52 +21,8 @@

<v-spacer />

<v-menu offset-y left>
<template #activator="{ on }">
<v-btn v-show="visibleAxes.length" color="primary" small class="mx-0" :elevation="1" v-on="on">
{{ $t("panel.movement.compensation") }}
<v-icon>mdi-menu-down</v-icon>
</v-btn>
</template>
<compensation-menu />

<v-card>
<v-list>
<template v-show="isCompensationEnabled">
<v-list-item>
<v-spacer />
{{ $t("panel.movement.compensationInUse", [$t(`panel.movement.compensationType.${compensationType}`)]) }}
<v-spacer />
</v-list-item>

<v-divider />
</template>

<v-list-item :disabled="!canHome" @click="sendCode('G32')">
<v-icon class="mr-1">mdi-format-vertical-align-center</v-icon>
{{ isDelta ? $t("panel.movement.runDelta") : $t("panel.movement.runBed") }}
</v-list-item>

<v-divider />

<v-list-item :disabled="!canHome" @click="sendCode('G29')">
<v-icon class="mr-1">mdi-grid</v-icon>
{{ $t("panel.movement.runMesh") }}
</v-list-item>
<v-list-item :disabled="uiFrozen" @click="showMeshEditDialog = true">
<v-icon class="mr-1">mdi-pencil</v-icon>
{{ $t("panel.movement.editMesh") }}
</v-list-item>
<v-list-item :disabled="uiFrozen" @click="sendCode('G29 S1')">
<v-icon class="mr-1">mdi-content-save</v-icon>
{{ $t("panel.movement.loadMesh") }}
</v-list-item>
<v-list-item :disabled="!isCompensationEnabled" @click="sendCode('G29 S2')">
<v-icon class="mr-1">mdi-grid-off</v-icon>
{{ $t("panel.movement.disableMeshCompensation") }}
</v-list-item>
</v-list>
</v-card>
</v-menu>
</v-card-title>

<v-card-text v-show="visibleAxes.length !== 0">
Expand Down Expand Up @@ -129,7 +85,6 @@
</v-row>
</v-card-text>

<mesh-edit-dialog :shown.sync="showMeshEditDialog"></mesh-edit-dialog>
<input-dialog :shown.sync="moveStepDialog.shown" :title="$t('dialog.changeMoveStep.title')"
:prompt="$t('dialog.changeMoveStep.prompt')" :preset="moveStepDialog.preset" is-numeric-value
@confirmed="moveStepDialogConfirmed"></input-dialog>
Expand All @@ -148,7 +103,7 @@
</template>

<script lang="ts">
import { Axis, AxisLetter, KinematicsName, MachineStatus, MoveCompensationType } from "@duet3d/objectmodel";
import { Axis, AxisLetter, MachineStatus, KinematicsName } from "@duet3d/objectmodel";
import Vue from "vue";

import store from "@/store";
Expand All @@ -159,8 +114,6 @@ export default Vue.extend({
uiFrozen(): boolean { return store.getters["uiFrozen"]; },
moveSteps(): (axisLetter: AxisLetter) => Array<number> { return ((axisLetter: AxisLetter) => store.getters["machine/settings/moveSteps"](axisLetter)); },
numMoveSteps(): number { return store.getters["machine/settings/numMoveSteps"]; },
isCompensationEnabled(): boolean { return store.state.machine.model.move.compensation.type !== MoveCompensationType.none; },
compensationType(): MoveCompensationType { return store.state.machine.model.move.compensation.type; },
visibleAxes(): Array<Axis> { return store.state.machine.model.move.axes.filter(axis => axis.visible); },
isDelta(): boolean { return [KinematicsName.linearDelta, KinematicsName.rotaryDelta].includes(store.state.machine.model.move.kinematics.name); },
canHome(): boolean {
Expand All @@ -173,7 +126,6 @@ export default Vue.extend({
},
data() {
return {
showMeshEditDialog: false,
moveStepDialog: {
shown: false,
axis: AxisLetter.X,
Expand Down Expand Up @@ -220,7 +172,6 @@ export default Vue.extend({
watch: {
isConnected() {
// Hide dialogs when the connection is interrupted
this.showMeshEditDialog = false;
this.moveStepDialog.shown = false;
}
}
Expand Down