Skip to content

Commit 907fdc1

Browse files
committed
refactor: bed size is always defined
Signed-off-by: Pedro Lamas <[email protected]>
1 parent 7e3442a commit 907fdc1

File tree

5 files changed

+9
-37
lines changed

5 files changed

+9
-37
lines changed

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

+1-8
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,7 @@ export default class CustomParkPositionSettings extends Mixins(StateMixin) {
108108
}
109109
110110
get bedSize (): BedSize {
111-
const bedSize: BedSize | undefined = this.$store.getters['printer/getBedSize']
112-
113-
return bedSize ?? {
114-
minX: -Infinity,
115-
minY: -Infinity,
116-
maxX: Infinity,
117-
maxY: Infinity
118-
}
111+
return this.$store.getters['printer/getBedSize']
119112
}
120113
121114
get settings (): TimelapseSettings {

src/components/widgets/bedmesh/BedMeshChart.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default class BedMeshChart extends Mixins(BrowserMixin) {
4545
return this.$store.state.mesh.flatSurface
4646
}
4747
48-
get bedSize (): BedSize | undefined {
48+
get bedSize (): BedSize {
4949
return this.$store.getters['printer/getBedSize']
5050
}
5151
@@ -205,14 +205,14 @@ export default class BedMeshChart extends Mixins(BrowserMixin) {
205205
},
206206
xAxis3D: {
207207
type: 'value',
208-
min: this.bedSize?.minX,
209-
max: this.bedSize?.maxX,
208+
min: this.bedSize.minX,
209+
max: this.bedSize.maxX,
210210
...axisCommon
211211
},
212212
yAxis3D: {
213213
type: 'value',
214-
min: this.bedSize?.minY,
215-
max: this.bedSize?.maxY,
214+
min: this.bedSize.minY,
215+
max: this.bedSize.maxY,
216216
...axisCommon
217217
},
218218
zAxis3D: {

src/components/widgets/gcode-preview/GcodePreview.vue

+1-8
Original file line numberDiff line numberDiff line change
@@ -560,14 +560,7 @@ export default class GcodePreview extends Mixins(StateMixin, BrowserMixin) {
560560
}
561561
562562
get bedSize (): BedSize {
563-
const bedSize: BedSize | undefined = this.$store.getters['printer/getBedSize']
564-
565-
return bedSize ?? {
566-
minX: 0,
567-
minY: 0,
568-
maxX: 100,
569-
maxY: 100
570-
}
563+
return this.$store.getters['printer/getBedSize']
571564
}
572565
573566
get viewBox (): BBox {

src/components/widgets/toolhead/ToolheadControlCircle.vue

+1-8
Original file line numberDiff line numberDiff line change
@@ -753,14 +753,7 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
753753
}
754754
755755
get bedSize (): BedSize {
756-
const bedSize: BedSize | undefined = this.$store.getters['printer/getBedSize']
757-
758-
return bedSize ?? {
759-
minX: 0,
760-
minY: 0,
761-
maxX: 0,
762-
maxY: 0
763-
}
756+
return this.$store.getters['printer/getBedSize']
764757
}
765758
766759
get bedCenter () {

src/store/printer/getters.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1020,16 +1020,9 @@ export const getters: GetterTree<PrinterState, RootState> = {
10201020
].includes(kinematics)
10211021
},
10221022

1023-
getBedSize: (state): BedSize | undefined => {
1023+
getBedSize: (state): BedSize => {
10241024
const { axis_minimum, axis_maximum } = state.printer.toolhead
10251025

1026-
if (
1027-
axis_minimum.length < 2 ||
1028-
axis_maximum.length < 2
1029-
) {
1030-
return undefined
1031-
}
1032-
10331026
const [minX, minY] = axis_minimum
10341027
const [maxX, maxY] = axis_maximum
10351028

0 commit comments

Comments
 (0)