Skip to content

Commit 121e36c

Browse files
committed
feat: allow toggle for temp chart
1 parent 94602e5 commit 121e36c

7 files changed

Lines changed: 65 additions & 23 deletions

File tree

src/components/cards/TemperatureCard.vue

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
11
<template>
22
<v-card color="tertiary" class="mb-4">
3-
<v-card-title class="quaternary">
4-
<v-icon left>{{ icons.fire }}</v-icon>
5-
<span class="font-weight-light">Temperatures</span>
3+
<v-card-title class="quaternary py-3">
4+
5+
<v-col cols="12" lg="auto" class="pa-0">
6+
<v-icon left>{{ icons.fire }}</v-icon>
7+
<span class="font-weight-light">Temperatures</span>
8+
</v-col>
9+
10+
<v-col class="pa-0 d-inline-flex justify-start justify-md-end flex-wrap">
11+
<v-btn
12+
@click="chartVisible = !chartVisible"
13+
color="secondary"
14+
class="ml-0 ml-md-2 mr-2 mr-md-0 my-1">
15+
<v-icon small class="mr-1">{{ icons.chart }}</v-icon>
16+
<span>Chart</span>
17+
</v-btn>
18+
</v-col>
619
</v-card-title>
720
<v-divider></v-divider>
821

922
<temperature-targets-widget></temperature-targets-widget>
1023

11-
<v-card-text class="chart-container">
24+
<v-card-text class="chart-container" v-if="chartVisible">
1225
<temperature-chart-widget v-if="chartReady && klippyConnected" :chart-data="chartData" :styles="chartStyles"></temperature-chart-widget>
1326
</v-card-text>
1427
</v-card>
@@ -54,6 +67,14 @@ export default class TemperatureCard extends Mixins(UtilsMixin) {
5467
this.chartData = this.allChartData
5568
this.chartReady = true
5669
}
70+
71+
get chartVisible (): boolean {
72+
return this.$store.state.config.localConfig.chartVisible
73+
}
74+
75+
set chartVisible (val: boolean) {
76+
this.$store.dispatch('config/saveLocalStorage', { chartVisible: val })
77+
}
5778
}
5879
</script>
5980

src/components/cards/ToolheadCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<v-card color="tertiary" class="mb-4">
33
<v-card-title class="quaternary">
44
<v-icon left>{{ icons.printer3dNozzle }}</v-icon>
5-
<span class="font-weight-light">Toolhead</span>
5+
<span class="font-weight-light">Tool</span>
66
<v-spacer />
77
<v-btn
88
v-if="!printerPrinting"

src/components/widgets/TemperatureTargetsWidget.vue

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,39 @@
55
Actual
66
</v-col>
77
<v-col class="py-0 px-2 text-subtitle-1 grey--text text--darken-1">
8-
Target
9-
<!-- <v-menu bottom :offset-y="true">
10-
<template v-slot:activator="{ on, attrs }">
11-
<v-btn small v-bind="attrs" v-on="on" icon color="grey"><v-icon>mdi-chevron-down</v-icon></v-btn>
12-
</template>
13-
<v-list nav dense transition="slide-y-transition">
14-
<v-list-item>
15-
<v-list-item-title>Off</v-list-item-title>
16-
</v-list-item>
17-
<v-list-item>
18-
<v-list-item-title>Set ABS</v-list-item-title>
19-
</v-list-item>
20-
<v-list-item>
21-
<v-list-item-title>Set PLA</v-list-item-title>
22-
</v-list-item>
23-
</v-list>
24-
</v-menu> -->
8+
<v-layout>
9+
Target
10+
<v-spacer></v-spacer>
11+
<!-- <v-menu bottom left :offset-y="true" :min-width="150">
12+
<template v-slot:activator="{ on, attrs }">
13+
<v-btn
14+
:min-width="40"
15+
v-bind="attrs" v-on="on"
16+
color="secondary"
17+
small
18+
class="pa-0">
19+
<v-icon>{{ icons.chevronDown }}</v-icon>
20+
</v-btn>
21+
</template>
22+
<v-list
23+
nav
24+
dense
25+
color="secondary">
26+
<v-list-item link>
27+
<v-list-item-title>Off</v-list-item-title>
28+
</v-list-item>
29+
<v-list-item link>
30+
<v-list-item-title>Preheat</v-list-item-title>
31+
</v-list-item>
32+
<v-list-item link>
33+
<v-list-item-title>ABS</v-list-item-title>
34+
</v-list-item>
35+
<v-list-item link>
36+
<v-list-item-title>PLA</v-list-item-title>
37+
</v-list-item>
38+
</v-list>
39+
</v-menu> -->
40+
</v-layout>
2541
</v-col>
2642
</v-row>
2743

src/globals.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ import {
5454
mdiCogs,
5555
mdiContentSaveOutline,
5656
mdiAlert,
57-
mdiPowerPlug
57+
mdiPowerPlug,
58+
mdiChartBellCurve
5859
} from '@mdi/js'
5960

6061
/**
@@ -71,6 +72,7 @@ export const Globals = Object.freeze({
7172
})
7273

7374
export const Icons = Object.freeze({
75+
chart: mdiChartBellCurve,
7476
power: mdiPowerPlug,
7577
home: mdiHome,
7678
close: mdiClose,

src/store/config/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export const state: ConfigState = {
1414
unsavedChanges: false,
1515
localConfig: {
1616
cameraVisible: false,
17+
chartVisible: true,
1718
darkMode: true
1819
},
1920
fileConfig: {

src/store/config/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export interface ConfigState {
1111
export interface LocalConfig {
1212
[key: string]: string | boolean | number;
1313
cameraVisible: boolean;
14+
chartVisible: boolean;
1415
darkMode: boolean;
1516
}
1617

todo.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
- add a widget to configure ztilt (needed?)
4949

5050
## User wants
51+
- another request to have the current temps above the macors etc during a print, but not while not printing.
5152
- draggable dashboard panels?
5253
- maybe look at tightening the mobile ui. have fan's as a value, that you can click
5354
on which then makes a popout to adjust fan?

0 commit comments

Comments
 (0)