CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add option to hide TL gcodes in console (#451)

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2021-12-05 04:45:11 +01:00 committed by GitHub
parent d3ee2f920b
commit dd3c897b75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/panels/MiniconsolePanel.vue
View File

@ -29,6 +29,9 @@
<v-list-item class="minHeight36"> <v-list-item class="minHeight36">
<v-checkbox class="mt-0" v-model="hideWaitTemperatures" hide-details :label="$t('Panels.MiniconsolePanel.HideTemperatures')"></v-checkbox> <v-checkbox class="mt-0" v-model="hideWaitTemperatures" hide-details :label="$t('Panels.MiniconsolePanel.HideTemperatures')"></v-checkbox>
</v-list-item> </v-list-item>
<v-list-item class="minHeight36" v-if="moonrakerComponents.includes('timelapse')">
<v-checkbox class="mt-0" v-model="hideTlCommands" hide-details :label="$t('Panels.MiniconsolePanel.HideTimelapse')"></v-checkbox>
</v-list-item>
<v-list-item class="minHeight36" v-for="(filter, index) in customFilters" v-bind:key="index"> <v-list-item class="minHeight36" v-for="(filter, index) in customFilters" v-bind:key="index">
<v-checkbox class="mt-0" v-model="filter.bool" @change="toggleFilter(filter)" hide-details :label="filter.name"></v-checkbox> <v-checkbox class="mt-0" v-model="filter.bool" @change="toggleFilter(filter)" hide-details :label="filter.name"></v-checkbox>
</v-list-item> </v-list-item>
@ -143,6 +146,14 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
this.$store.dispatch('gui/saveSetting', { name: 'console.hideWaitTemperatures', value: newVal }) this.$store.dispatch('gui/saveSetting', { name: 'console.hideWaitTemperatures', value: newVal })
} }
get hideTlCommands(): boolean {
return this.$store.state.gui.console.hideTlCommands
}
set hideTlCommands(newVal) {
this.$store.dispatch('gui/saveSetting', { name: 'console.hideTlCommands', value: newVal })
}
get customFilters(): any[] { get customFilters(): any[] {
return this.$store.state.gui.console.customFilters return this.$store.state.gui.console.customFilters
} }

2
src/locales/en.json
View File

@ -181,6 +181,7 @@
"SendCode": "Send code...", "SendCode": "Send code...",
"Empty": "Empty", "Empty": "Empty",
"HideTemperatures": "Hide temperatures", "HideTemperatures": "Hide temperatures",
"HideTimelapse": "Hide Timelapse",
"CommandList": "Command list" "CommandList": "Command list"
}, },
"Heightmap": { "Heightmap": {
@ -383,6 +384,7 @@
"Headline": "Console", "Headline": "Console",
"SetupConsole": "Setup Console", "SetupConsole": "Setup Console",
"HideTemperatures": "Hide temperatures", "HideTemperatures": "Hide temperatures",
"HideTimelapse": "Hide Timelapse",
"SendCode": "Send code..." "SendCode": "Send code..."
}, },
"MinSettingsPanel": { "MinSettingsPanel": {

11
src/pages/Console.vue
View File

@ -51,6 +51,9 @@
<v-list-item class="minHeight36"> <v-list-item class="minHeight36">
<v-checkbox class="mt-0" v-model="hideWaitTemperatures" hide-details :label="$t('Console.HideTemperatures')"></v-checkbox> <v-checkbox class="mt-0" v-model="hideWaitTemperatures" hide-details :label="$t('Console.HideTemperatures')"></v-checkbox>
</v-list-item> </v-list-item>
<v-list-item class="minHeight36" v-if="moonrakerComponents.includes('timelapse')">
<v-checkbox class="mt-0" v-model="hideTlCommands" hide-details :label="$t('Console.HideTimelapse')"></v-checkbox>
</v-list-item>
<v-list-item class="minHeight36" v-for="(filter, index) in customFilters" v-bind:key="index"> <v-list-item class="minHeight36" v-for="(filter, index) in customFilters" v-bind:key="index">
<v-checkbox class="mt-0" v-model="filter.bool" @change="toggleFilter(filter)" hide-details :label="filter.name"></v-checkbox> <v-checkbox class="mt-0" v-model="filter.bool" @change="toggleFilter(filter)" hide-details :label="filter.name"></v-checkbox>
</v-list-item> </v-list-item>
@ -131,6 +134,14 @@ export default class PageConsole extends Mixins(BaseMixin) {
this.$store.dispatch('gui/saveSetting', { name: 'console.hideWaitTemperatures', value: newVal }) this.$store.dispatch('gui/saveSetting', { name: 'console.hideWaitTemperatures', value: newVal })
} }
get hideTlCommands(): boolean {
return this.$store.state.gui.console.hideWaitTemperatures
}
set hideTlCommands(newVal) {
this.$store.dispatch('gui/saveSetting', { name: 'console.hideTlCommands', value: newVal })
}
get rows(): number { get rows(): number {
return this.gcode?.split('\n').length ?? 1 return this.gcode?.split('\n').length ?? 1
} }

7
src/store/gui/consolefilters/getters.ts
View File

@ -21,6 +21,13 @@ export const getters: GetterTree<GuiConsolefiltersState, any> = {
if (rootState.gui.console.hideWaitTemperatures) if (rootState.gui.console.hideWaitTemperatures)
output.push('^(?:ok\\s+)?(B|C|T\\d*):') output.push('^(?:ok\\s+)?(B|C|T\\d*):')
if (rootState.gui.console.hideTlCommands) {
output.push('^_TIMELAPSE_NEW_FRAME')
output.push('^TIMELAPSE_TAKE_FRAME')
output.push('^TIMELAPSE_RENDER')
output.push('^_SET_TIMELAPSE_SETUP')
}
Object.keys(state.consolefilters).forEach((id: string) => { Object.keys(state.consolefilters).forEach((id: string) => {
const filter = state.consolefilters[id] const filter = state.consolefilters[id]
if (filter.bool) { if (filter.bool) {

1
src/store/gui/index.ts
View File

@ -127,6 +127,7 @@ export const getDefaultState = (): GuiState => {
}, },
console: { console: {
hideWaitTemperatures: true, hideWaitTemperatures: true,
hideTlCommands: true,
direction: 'table', direction: 'table',
entryStyle: 'default', entryStyle: 'default',
height: 300 height: 300