Skip to content

Commit a6cf24b

Browse files
pedrolamaspedrolamas
committed
refactor: use v-model where possible
Signed-off-by: Pedro Lamas <[email protected]>
1 parent ebd7b1b commit a6cf24b

15 files changed

+151
-183
lines changed

‎src/components/settings/GcodePreviewSettings.vue‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<app-setting :title="$t('app.setting.label.extrusion_line_width')">
4545
<v-text-field
46-
:value="extrusionLineWidth"
46+
v-model="extrusionLineWidth"
4747
:rules="[
4848
$rules.required,
4949
$rules.numberValid,
@@ -54,15 +54,14 @@
5454
single-line
5555
hide-details="auto"
5656
suffix="mm"
57-
@change="setExtrusionLineWidth"
5857
/>
5958
</app-setting>
6059

6160
<v-divider />
6261

6362
<app-setting :title="$t('app.setting.label.move_line_width')">
6463
<v-text-field
65-
:value="moveLineWidth"
64+
v-model="moveLineWidth"
6665
:rules="[
6766
$rules.required,
6867
$rules.numberValid,
@@ -73,15 +72,14 @@
7372
single-line
7473
hide-details="auto"
7574
suffix="mm"
76-
@change="setMoveLineWidth"
7775
/>
7876
</app-setting>
7977

8078
<v-divider />
8179

8280
<app-setting :title="$t('app.setting.label.retraction_icon_size')">
8381
<v-text-field
84-
:value="retractionIconSize"
82+
v-model="retractionIconSize"
8583
:rules="[
8684
$rules.required,
8785
$rules.numberValid,
@@ -92,7 +90,6 @@
9290
single-line
9391
hide-details="auto"
9492
suffix="mm"
95-
@change="setRetractionIconSize"
9693
/>
9794
</app-setting>
9895

@@ -168,7 +165,7 @@ export default class GcodePreviewSettings extends Vue {
168165
return this.$store.state.config.uiSettings.gcodePreview.extrusionLineWidth
169166
}
170167
171-
setExtrusionLineWidth (value: number) {
168+
set extrusionLineWidth (value: number) {
172169
this.$store.dispatch('config/saveByPath', {
173170
path: 'uiSettings.gcodePreview.extrusionLineWidth',
174171
value: +value,
@@ -180,7 +177,7 @@ export default class GcodePreviewSettings extends Vue {
180177
return this.$store.state.config.uiSettings.gcodePreview.moveLineWidth
181178
}
182179
183-
setMoveLineWidth (value: number) {
180+
set moveLineWidth (value: number) {
184181
this.$store.dispatch('config/saveByPath', {
185182
path: 'uiSettings.gcodePreview.moveLineWidth',
186183
value: +value,
@@ -192,7 +189,7 @@ export default class GcodePreviewSettings extends Vue {
192189
return this.$store.state.config.uiSettings.gcodePreview.retractionIconSize
193190
}
194191
195-
setRetractionIconSize (value: number) {
192+
set retractionIconSize (value: number) {
196193
this.$store.dispatch('config/saveByPath', {
197194
path: 'uiSettings.gcodePreview.retractionIconSize',
198195
value: +value,

‎src/components/settings/GeneralSettings.vue‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,30 @@
1111
<app-setting :title="$t('app.setting.label.printer_name')">
1212
<v-text-field
1313
ref="instanceName"
14+
v-model="instanceName"
1415
filled
1516
dense
1617
single-line
1718
hide-details="auto"
1819
:rules="[
1920
$rules.required
2021
]"
21-
:value="instanceName"
2222
:default-value="$globals.APP_NAME"
23-
@change="setInstanceName"
2423
/>
2524
</app-setting>
2625

2726
<v-divider />
2827

2928
<app-setting :title="$t('app.setting.label.language')">
3029
<v-select
30+
v-model="locale"
3131
filled
3232
dense
3333
single-line
3434
hide-details="auto"
3535
:items="supportedLocales"
36-
:value="locale"
3736
item-text="name"
3837
item-value="code"
39-
@change="setLocale"
4038
/>
4139
</app-setting>
4240

@@ -182,25 +180,25 @@ export default class GeneralSettings extends Mixins(StateMixin) {
182180
return this.$store.state.config.uiSettings.general.instanceName
183181
}
184182
185-
setInstanceName (value: string) {
183+
set instanceName (value: string) {
186184
if (this.instanceNameElement.valid) this.$store.dispatch('config/updateInstance', value)
187185
}
188186
189187
get locale () {
190188
return this.$store.state.config.uiSettings.general.locale
191189
}
192190
191+
set locale (value: string) {
192+
this.$store.dispatch('config/onLocaleChange', value)
193+
}
194+
193195
get supportedLocales () {
194196
return [
195197
{ name: 'Browser default', code: 'default' },
196198
...this.$store.state.config.hostConfig.locales
197199
]
198200
}
199201
200-
setLocale (value: string) {
201-
this.$store.dispatch('config/onLocaleChange', value)
202-
}
203-
204202
get dateformat () {
205203
return this.$store.state.config.uiSettings.general.dateformat
206204
}

‎src/components/settings/ToolheadSettings.vue‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
<app-setting :title="$t('app.setting.label.default_extrude_length')">
5656
<v-text-field
57-
:value="defaultExtrudeLength"
57+
v-model="defaultExtrudeLength"
5858
:rules="[
5959
$rules.required,
6060
$rules.numberValid,
@@ -65,15 +65,14 @@
6565
single-line
6666
hide-details="auto"
6767
suffix="mm"
68-
@change="setDefaultExtrudeLength"
6968
/>
7069
</app-setting>
7170

7271
<v-divider />
7372

7473
<app-setting :title="$t('app.setting.label.default_extrude_speed')">
7574
<v-text-field
76-
:value="defaultExtrudeSpeed"
75+
v-model="defaultExtrudeSpeed"
7776
:rules="[
7877
$rules.required,
7978
$rules.numberValid,
@@ -84,15 +83,14 @@
8483
single-line
8584
hide-details="auto"
8685
suffix="mm/s"
87-
@change="setDefaultExtrudeSpeed"
8886
/>
8987
</app-setting>
9088

9189
<v-divider />
9290

9391
<app-setting :title="$t('app.setting.label.default_toolhead_move_length')">
9492
<v-select
95-
:value="defaultToolheadMoveLength"
93+
v-model="defaultToolheadMoveLength"
9694
:items="toolheadMoveDistances"
9795
:rules="[
9896
$rules.required,
@@ -103,15 +101,14 @@
103101
single-line
104102
hide-details="auto"
105103
suffix="mm"
106-
@change="setDefaultToolheadMoveLength"
107104
/>
108105
</app-setting>
109106

110107
<v-divider />
111108

112109
<app-setting :title="$t('app.setting.label.default_toolhead_xy_speed')">
113110
<v-text-field
114-
:value="defaultToolheadXYSpeed"
111+
v-model="defaultToolheadXYSpeed"
115112
:rules="[
116113
$rules.required,
117114
$rules.numberValid,
@@ -122,15 +119,14 @@
122119
single-line
123120
hide-details="auto"
124121
suffix="mm/s"
125-
@change="setDefaultToolheadYXSpeed"
126122
/>
127123
</app-setting>
128124

129125
<v-divider />
130126

131127
<app-setting :title="$t('app.setting.label.default_toolhead_z_speed')">
132128
<v-text-field
133-
:value="defaultToolheadZSpeed"
129+
v-model="defaultToolheadZSpeed"
134130
:rules="[
135131
$rules.required,
136132
$rules.numberValid,
@@ -141,7 +137,6 @@
141137
single-line
142138
hide-details="auto"
143139
suffix="mm/s"
144-
@change="setDefaultToolheadZSpeed"
145140
/>
146141
</app-setting>
147142

@@ -262,7 +257,7 @@ export default class ToolHeadSettings extends Vue {
262257
return this.$store.state.config.uiSettings.general.defaultExtrudeSpeed
263258
}
264259
265-
setDefaultExtrudeSpeed (value: string) {
260+
set defaultExtrudeSpeed (value: string) {
266261
this.$store.dispatch('config/saveByPath', {
267262
path: 'uiSettings.general.defaultExtrudeSpeed',
268263
value: +value,
@@ -274,7 +269,7 @@ export default class ToolHeadSettings extends Vue {
274269
return this.$store.state.config.uiSettings.general.defaultExtrudeLength
275270
}
276271
277-
setDefaultExtrudeLength (value: number) {
272+
set defaultExtrudeLength (value: number) {
278273
this.$store.dispatch('config/saveByPath', {
279274
path: 'uiSettings.general.defaultExtrudeLength',
280275
value: +value,
@@ -286,7 +281,7 @@ export default class ToolHeadSettings extends Vue {
286281
return this.$store.state.config.uiSettings.general.defaultToolheadMoveLength
287282
}
288283
289-
setDefaultToolheadMoveLength (value: number) {
284+
set defaultToolheadMoveLength (value: number) {
290285
this.$store.dispatch('config/saveByPath', {
291286
path: 'uiSettings.general.defaultToolheadMoveLength',
292287
value: +value,
@@ -298,7 +293,7 @@ export default class ToolHeadSettings extends Vue {
298293
return this.$store.state.config.uiSettings.general.defaultToolheadXYSpeed
299294
}
300295
301-
setDefaultToolheadYXSpeed (value: number) {
296+
set defaultToolheadXYSpeed (value: number) {
302297
this.$store.dispatch('config/saveByPath', {
303298
path: 'uiSettings.general.defaultToolheadXYSpeed',
304299
value: +value,
@@ -310,7 +305,7 @@ export default class ToolHeadSettings extends Vue {
310305
return this.$store.state.config.uiSettings.general.defaultToolheadZSpeed
311306
}
312307
313-
setDefaultToolheadZSpeed (value: number) {
308+
set defaultToolheadZSpeed (value: number) {
314309
this.$store.dispatch('config/saveByPath', {
315310
path: 'uiSettings.general.defaultToolheadZSpeed',
316311
value: +value,

‎src/components/settings/timelapse/TimelapseSettings.vue‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
>
5151
<v-text-field
5252
ref="delayCompElement"
53-
:value="delayComp"
53+
v-model="delayComp"
5454
:rules="[
5555
$rules.required,
5656
$rules.numberValid,
@@ -62,7 +62,6 @@
6262
dense
6363
single-line
6464
suffix="ms"
65-
@change="setDelayComp"
6665
/>
6766
</app-setting>
6867

@@ -194,7 +193,7 @@ export default class TimelapseSettings extends Mixins(StateMixin) {
194193
return this.settings?.stream_delay_compensation * 1000
195194
}
196195
197-
setDelayComp (value: number) {
196+
set delayComp (value: number) {
198197
if (this.delayCompElement?.validate()) {
199198
SocketActions.machineTimelapseSetSettings({ stream_delay_compensation: value / 1000 })
200199
}

‎src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
>
88
<v-text-field
99
ref="parkPosXElement"
10-
:value="parkPosX"
10+
v-model="parkPosX"
1111
:rules="[
1212
$rules.required,
1313
$rules.numberValid,
@@ -20,7 +20,6 @@
2020
dense
2121
single-line
2222
suffix="mm"
23-
@change="setParkPosX"
2423
/>
2524
</app-setting>
2625

@@ -31,7 +30,7 @@
3130
>
3231
<v-text-field
3332
ref="parkPosYElement"
34-
:value="parkPosY"
33+
v-model="parkPosY"
3534
:rules="[
3635
$rules.required,
3736
$rules.numberValid,
@@ -44,7 +43,6 @@
4443
dense
4544
single-line
4645
suffix="mm"
47-
@change="setParkPosY"
4846
/>
4947
</app-setting>
5048
</div>
@@ -90,7 +88,7 @@ export default class LayerMacroSettings extends Mixins(StateMixin) {
9088
return this.settings?.park_custom_pos_x
9189
}
9290
93-
setParkPosX (value: number) {
91+
set parkPosX (value: number) {
9492
if (this.parkPosXElement?.validate()) {
9593
SocketActions.machineTimelapseSetSettings({ park_custom_pos_x: value })
9694
}
@@ -100,7 +98,7 @@ export default class LayerMacroSettings extends Mixins(StateMixin) {
10098
return this.settings?.park_custom_pos_y
10199
}
102100
103-
setParkPosY (value: number) {
101+
set parkPosY (value: number) {
104102
if (this.parkPosYElement?.validate()) {
105103
SocketActions.machineTimelapseSetSettings({ park_custom_pos_y: value })
106104
}

0 commit comments

Comments
 (0)