Skip to content

Improve UI of movement panel #505

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

Merged
chrishamm merged 2 commits into from
Oct 31, 2025
Merged

Improve UI of movement panel #505

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ddb1f3
Improve UI of movement panel
blaggacao Aug 25, 2025
e5ca255
fix: jog button order and spaces
blaggacao Sep 5, 2025
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
202 changes: 132 additions & 70 deletions src/components/panels/CNCMovementPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,143 @@
</v-card-title>
<v-card-text v-show="visibleAxes.length">
<v-row dense>
<v-col cols="6" order="1" md="2" order-md="1">
<v-col cols="6" order="2" md="3" order-md="3">
<code-btn block v-show="visibleAxes.length" color="primary" code="G28"
:title="$t('button.home.titleAll')" class="ml-0 move-btn">
{{ $t("button.home.captionAll") }}
</code-btn>
</v-col>
<v-col cols="6" order="2" md="8" order-md="2">
<v-col cols="12" order="3" md="6" order-md="2">
<v-btn color="warning" @click="goToWorkplaceZero" tile block class="move-btn">
{{ $t("panel.movement.workzero") }}
</v-btn>
</v-col>
<v-col cols="6" order="1" md="3" order-md="1">
<v-btn @click="setWorkplaceZero" block class="move-btn">
{{ $t("panel.movement.setWorkXYZ") }}
</v-btn>
</v-col>
</v-row>

<v-row v-for="(axis, axisIndex) in visibleAxes" :key="axisIndex" dense>
<!-- Regular home buttons -->
<v-col cols="4" order="1" sm="4" md="1" order-md="1">
<v-row dense>
<v-col>
<code-btn color="warning" tile block :code="`G10 L20 P${currentWorkplace} ${axis.letter}0`"
class="move-btn">
{{ $t("panel.movement.set", [axis.letter]) }}
</code-btn>
</v-col>
</v-row>
<v-divider class="my-4 d-md-none" />
</v-col>

<!-- Decreasing movements -->
<v-col cols="6" order="3" md="5" order-md="2">
<v-row dense>
<v-col
v-for="index in numMoveSteps"
:key="index"
:class="[
getMoveCellClass(index - 1),
(index === numMoveSteps ? 'd-none d-md-flex' : '')
]"
>
<code-btn
:code="getMoveCode(axis, index - 1, true)"
no-wait
@contextmenu.prevent="showMoveStepDialog(axis.letter, index - 1)"
block
tile
class="move-btn"
>
<v-icon>mdi-chevron-left</v-icon>
{{ axis.letter + showSign(-moveSteps(axis.letter)[index - 1]) }}
</code-btn>
</v-col>
</v-row>
<v-row dense class="d-md-none">
<v-col v-if="numMoveSteps > 0" :class="getMoveCellClass(numMoveSteps - 1)">
<code-btn
:code="getMoveCode(axis, numMoveSteps - 1, true)"
no-wait
@contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - 1)"
block
tile
class="move-btn"
>
<v-icon>mdi-chevron-left</v-icon>
{{ axis.letter + showSign(-moveSteps(axis.letter)[numMoveSteps - 1]) }}
</code-btn>
</v-col>
</v-row>
</v-col>

<!-- Increasing movements -->
<v-col cols="6" order="4" md="5" order-md="3">
<v-row dense>
<v-col
v-for="index in numMoveSteps"
:key="index"
:class="[
getMoveCellClass(numMoveSteps - index),
(index === 1 ? 'd-none d-md-flex' : '')
]"
>
<code-btn
:code="getMoveCode(axis, numMoveSteps - index, false)"
no-wait
@contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - index)"
block
tile
class="move-btn"
>
{{ axis.letter + showSign(moveSteps(axis.letter)[numMoveSteps - index]) }}
<v-icon>mdi-chevron-right</v-icon>
</code-btn>
</v-col>
</v-row>
<v-row dense class="d-md-none">
<v-col v-if="numMoveSteps > 0" :class="getMoveCellClass(numMoveSteps - 1)">
<code-btn
:code="getMoveCode(axis, numMoveSteps - 1, false)"
no-wait
@contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - 1)"
block
tile
class="move-btn"
>
{{ axis.letter + showSign(moveSteps(axis.letter)[numMoveSteps - 1]) }}
<v-icon>mdi-chevron-right</v-icon>
</code-btn>
</v-col>
</v-row>
</v-col>

<!-- Set axis-->
<v-col cols="4" order="2" offset="4" sm="4" offset-sm="4" md="1" order-md="4" offset-md="0">
<v-row dense>
<v-col>
<code-btn tile block :color="axis.homed ? 'primary' : 'warning'" :disabled="uiFrozen"
:title="$t('button.home.title', [/[a-z]/.test(axis.letter) ? `'${axis.letter}` : axis.letter])"
:code="`G28 ${/[a-z]/.test(axis.letter) ? '\'' : ''}${axis.letter}`" class="move-btn">
{{ $t("button.home.caption", [axis.letter]) }}
</code-btn>
</v-col>
</v-row>
<v-divider class="my-4 d-md-none" />
</v-col>
<v-col cols="12" class="d-md-none">
<v-divider class="my-4" />
</v-col>
</v-row>
<v-row dense>
<v-col cols="12">
<v-divider class="my-4" />
</v-col>

<v-col cols="12">
<v-menu offset-y left :disabled="uiFrozen">
<template #activator="{ on }">
<v-btn v-show="visibleAxes.length" color="primary" block class="mx-0 move-btn"
Expand Down Expand Up @@ -81,74 +211,6 @@
</v-card>
</v-menu>
</v-col>
<v-col cols="12" order="3" md="2" order-md="3">
<v-btn @click="setWorkplaceZero" block class="move-btn">
{{ $t("panel.movement.setWorkXYZ") }}
</v-btn>
</v-col>
</v-row>

<v-row v-for="(axis, axisIndex) in visibleAxes" :key="axisIndex" dense>
<!-- Regular home buttons -->
<v-col cols="2" order="1" sm="4" md="1" order-md="1">
<v-row dense>
<v-col>
<code-btn tile block :color="axis.homed ? 'primary' : 'warning'" :disabled="uiFrozen"
:title="$t('button.home.title', [/[a-z]/.test(axis.letter) ? `'${axis.letter}` : axis.letter])"
:code="`G28 ${/[a-z]/.test(axis.letter) ? '\'' : ''}${axis.letter}`" class="move-btn">
{{ $t("button.home.caption", [axis.letter]) }}
</code-btn>
</v-col>
</v-row>
</v-col>

<!-- Decreasing movements -->
<v-col cols="6" order="3" md="5" order-md="2">
<v-row dense>
<v-col v-for="index in numMoveSteps" :key="index" :class="getMoveCellClass(index - 1)">
<code-btn :code="getMoveCode(axis, index - 1, true)" no-wait
@contextmenu.prevent="showMoveStepDialog(axis.letter, index - 1)" block tile
class="move-btn">
<v-icon>mdi-chevron-left</v-icon>
{{ axis.letter + showSign(-moveSteps(axis.letter)[index - 1]) }}
</code-btn>
</v-col>
</v-row>
</v-col>

<!-- Increasing movements -->
<v-col cols="6" order="4" md="5" order-md="3">
<v-row dense>
<v-col v-for="index in numMoveSteps" :key="index" :class="getMoveCellClass(numMoveSteps - index)">
<code-btn :code="getMoveCode(axis, numMoveSteps - index, false)" no-wait
@contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - index)" block
tile class="move-btn">
{{ axis.letter + showSign(moveSteps(axis.letter)[numMoveSteps - index]) }}
<v-icon>mdi-chevron-right</v-icon>
</code-btn>
</v-col>
</v-row>
</v-col>

<!-- Set axis-->
<v-col cols="2" order="2" offset="8" sm="4" offset-sm="4" md="1" order-md="4" offset-md="0">
<v-row dense>
<v-col>
<code-btn color="warning" tile block :code="`G10 L20 P${currentWorkplace} ${axis.letter}0`"
class="move-btn">
{{ $t("panel.movement.set", [axis.letter]) }}
</code-btn>
</v-col>
</v-row>
</v-col>
</v-row>

<v-row dense>
<v-col>
<v-btn color="warning" @click="goToWorkplaceZero" tile block class="move-btn">
{{ $t("panel.movement.workzero") }}
</v-btn>
</v-col>
</v-row>
</v-card-text>

Expand Down