Skip to content

Commit

Permalink
refactor(MachineSettingsPanel.vue): tweak visual appearance (#784)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dw-0
dw-0 authored May 9, 2022
1 parent eb19afb commit 014a791
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 85 deletions.
4 changes: 2 additions & 2 deletions src/components/panels/MachineSettings/FirmwareRetractionSettings.vue
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<v-card-text>
<v-container>
<v-row>
<v-col class="col-12 col-md-6">
<number-input
Expand Down Expand Up @@ -70,7 +70,7 @@
@submit="sendCmd"></number-input>
</v-col>
</v-row>
</v-card-text>
</v-container>
</template>

<script lang="ts">
Expand Down
26 changes: 15 additions & 11 deletions src/components/panels/MachineSettings/MachineSettingsPanel.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,21 @@
:collapsible="true"
card-class="machine-settings-panel">
<div>
<sub-panel
:title="$t('Panels.MachineSettingsPanel.MotionSettings.Motion').toString()"
sub-panel-class="motion-settings-subpanel">
<motion-settings></motion-settings>
</sub-panel>
<sub-panel
v-if="existsFirmwareRetraction"
:title="$t('Panels.MachineSettingsPanel.FirmwareRetractionSettings.FirmwareRetraction').toString()"
sub-panel-class="firmware-retraction-settings-subpanel">
<firmware-retraction-settings></firmware-retraction-settings>
</sub-panel>
<template v-if="existsFirmwareRetraction">
<sub-panel
:title="$t('Panels.MachineSettingsPanel.MotionSettings.Motion').toString()"
sub-panel-class="motion-settings-subpanel"
class="py-3">
<motion-settings class="pb-0"></motion-settings>
</sub-panel>
<sub-panel
:title="$t('Panels.MachineSettingsPanel.FirmwareRetractionSettings.FirmwareRetraction').toString()"
sub-panel-class="firmware-retraction-settings-subpanel"
class="pb-3">
<firmware-retraction-settings class="pb-0"></firmware-retraction-settings>
</sub-panel>
</template>
<motion-settings v-else></motion-settings>
</div>
</panel>
</template>
Expand Down
149 changes: 79 additions & 70 deletions src/components/panels/MachineSettings/MotionSettings.vue
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,81 @@
<template>
<v-card-text>
<v-row>
<v-col class="col-12 col-md-6">
<number-input
:label="$t('Panels.MachineSettingsPanel.MotionSettings.Velocity').toString()"
param="VELOCITY"
:target="velocity"
:default-value="defaultVelocity"
:output-error-msg="true"
:has-spinner="true"
:spinner-factor="5"
:step="1"
:min="1"
:max="null"
:dec="0"
unit="mm/s"
@submit="sendCmd"></number-input>
</v-col>
<v-col class="col-12 col-md-6">
<number-input
:label="$t('Panels.MachineSettingsPanel.MotionSettings.SquareCornerVelocity').toString()"
param="SQUARE_CORNER_VELOCITY"
:target="squareCornerVelocity"
:default-value="defaultSquareCornerVelocity"
:output-error-msg="true"
:has-spinner="true"
:step="0.1"
:min="0.1"
:max="null"
:dec="1"
unit="mm/s"
@submit="sendCmd"></number-input>
</v-col>
</v-row>
<v-row>
<v-col class="col-12 col-md-6">
<number-input
:label="$t('Panels.MachineSettingsPanel.MotionSettings.Acceleration').toString()"
param="ACCEL"
:target="accel"
:default-value="defaultAccel"
:output-error-msg="true"
:has-spinner="true"
:spinner-factor="100"
:step="1"
:min="1"
:max="null"
:dec="0"
unit="mm/s²"
@submit="sendCmd"></number-input>
</v-col>
<v-col class="col-12 col-md-6">
<number-input
:label="$t('Panels.MachineSettingsPanel.MotionSettings.MaxAccelToDecel').toString()"
param="ACCEL_TO_DECEL"
:target="accelToDecel"
:default-value="defaultAccelToDecel"
:output-error-msg="true"
:has-spinner="true"
:spinner-factor="100"
:step="1"
:min="1"
:max="null"
:dec="0"
unit="mm/s²"
@submit="sendCmd"></number-input>
</v-col>
</v-row>
</v-card-text>
<v-container>
<responsive
:breakpoints="{
small: (el) => el.width < 375,
medium: (el) => el.width >= 375,
}">
<template #default="{ el }">
<v-row>
<v-col :class="{ 'col-12': el.is.small, 'col-6': el.is.medium }">
<number-input
:label="$t('Panels.MachineSettingsPanel.MotionSettings.Velocity').toString()"
param="VELOCITY"
:target="velocity"
:default-value="defaultVelocity"
:output-error-msg="true"
:has-spinner="true"
:spinner-factor="5"
:step="1"
:min="1"
:max="null"
:dec="0"
unit="mm/s"
@submit="sendCmd"></number-input>
</v-col>
<v-col :class="{ 'col-12': el.is.small, 'col-6': el.is.medium }">
<number-input
:label="$t('Panels.MachineSettingsPanel.MotionSettings.SquareCornerVelocity').toString()"
param="SQUARE_CORNER_VELOCITY"
:target="squareCornerVelocity"
:default-value="defaultSquareCornerVelocity"
:output-error-msg="true"
:has-spinner="true"
:step="0.1"
:min="0.1"
:max="null"
:dec="1"
unit="mm/s"
@submit="sendCmd"></number-input>
</v-col>
</v-row>
<v-row>
<v-col :class="{ 'col-12': el.is.small, 'col-6': el.is.medium }">
<number-input
:label="$t('Panels.MachineSettingsPanel.MotionSettings.Acceleration').toString()"
param="ACCEL"
:target="accel"
:default-value="defaultAccel"
:output-error-msg="true"
:has-spinner="true"
:spinner-factor="100"
:step="1"
:min="1"
:max="null"
:dec="0"
unit="mm/s²"
@submit="sendCmd"></number-input>
</v-col>
<v-col :class="{ 'col-12': el.is.small, 'col-6': el.is.medium }">
<number-input
:label="$t('Panels.MachineSettingsPanel.MotionSettings.MaxAccelToDecel').toString()"
param="ACCEL_TO_DECEL"
:target="accelToDecel"
:default-value="defaultAccelToDecel"
:output-error-msg="true"
:has-spinner="true"
:spinner-factor="100"
:step="1"
:min="1"
:max="null"
:dec="0"
unit="mm/s²"
@submit="sendCmd"></number-input>
</v-col>
</v-row>
</template>
</responsive>
</v-container>
</template>

<script lang="ts">
Expand All @@ -76,9 +84,10 @@ import { Debounce } from 'vue-debounce-decorator'
import BaseMixin from '@/components/mixins/base'
import Panel from '@/components/ui/Panel.vue'
import NumberInput from '@/components/inputs/NumberInput.vue'
import Responsive from '@/components/ui/Responsive.vue'
@Component({
components: { Panel, NumberInput },
components: { Panel, NumberInput, Responsive },
})
export default class MotionSettings extends Mixins(BaseMixin) {
get velocity(): number {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@
"UnretractExtraLength": "Zusätzliche Ausfahrlänge",
"UnretractSpeed": "Ausfahrgeschwindigkeit"
},
"Headline": "Maschinen Einstellungen",
"Headline": "Maschine",
"MotionSettings": {
"Acceleration": "Beschleunigung",
"MaxAccelToDecel": "Max. Beschl. zu Verz.",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@
"UnretractExtraLength": "Unretract Extra Length",
"UnretractSpeed": "Unretract Speed"
},
"Headline": "Machine Settings",
"Headline": "Machine",
"MotionSettings": {
"Acceleration": "Acceleration",
"MaxAccelToDecel": "Max Accel. to Decel.",
Expand Down

0 comments on commit 014a791

Please sign in to comment.