35 Commits

Author SHA1 Message Date
Stefan Dej
a24c6bd90e refactor: rename gui/webcam to gui/webcams store
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-11-07 15:58:14 +01:00
Stefan Dej
0338efd914
feature: move webcams to new db namespace (#401)
* refactor: create store for seperate webcam namespace

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* refactor: update settings webcam and webcam panel to new namespace / store modules

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: types in webcam namespace

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feat: hide webcam panel, if no webcam is in the db

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* refactor: remove debug output in settings webcam tab

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: margin between DependenciesPanel.vue and next panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-11-02 22:12:57 +01:00
th33xitus
4d2a61b8b7
bugfix: fix the webcam panel collapsible property (#375)
This fixes a bug where the webcam panel is collapsible even when navigated to the webcam page where the panel should not be collapsible.

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
2021-10-11 21:53:03 +02:00
Stefan Dej
7ce9dc30a6 refactor: change panel buttons to toolbar text/icon buttons
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-10-10 14:04:11 +02:00
Stefan Dej
2144888ef8 refactor: change toolbar buttons to text buttons in WebcamPanel.vue
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-10-10 12:02:39 +02:00
Stefan Dej
3dae42edb0
feature: collapsable and normalize panels (#372)
* feature: add panel component to normalize all panels
* feature: add expand function to panel component
* chore: remove not used computed value
* feature: add slot for override the icon in the panel
* chore: remove unused package (vue2-collapse)
* feature: change StatusPanel.vue to panel component
* feature: add prop to change toolbar color
* feature: change MinSettingsPanel.vue to panel component
* feature: change MoonrakerStatePanel.vue to panel component
* feature: change KlippyStatePanel.vue to panel component
* feature: change KlipperWarningsPanel.vue to panel component
* feature: change ControlPanel.vue to panel component
* feature: change PrintsettingsPanel.vue to panel component
* feature: change MiscellaneousPanel.vue to panel component
* feature: change ToolsPanel.vue to panel component
* feature: change MacrosPanel.vue to panel component
* feature: change MiniconsolePanel.vue to panel component
* feature: change FarmPrinterPanel.vue to panel component
* bugfix: add toolbar zindex to fix panel hover overlay
* bugfix: remove toolbar zindex and modify hover effect
* bugfix: farmprinter loading state (remove debug output)
* feature: add prop to disable margin botton of panel component
* feature: change HistoryListPanel.vue to panel component
* feature: move history statistics in HistoryStatisticsPanel.vue and use panel component
* feature: change ZoffsetPanel.vue to panel component
* feature: add slot after toolbar title in panel component
* feature: change Heightmap.vue to panel component
* feature: change Files.vue to panel component
* feature: change Viewer.vue to panel component
* feature: add buttons before toolbar in panel component
* feature: change ConfigFilesPanel.vue to panel component
* feature: change EndstopPanel.vue to panel component
* chore: fix typo in card class from ConfigFilesPanel.vue
* feature: change LimitsPanel.vue to panel component
* feature: change LogfilesPanel.vue to panel component
* feature: change SystemPanel.vue to panel component
* feature: change UpdatePanel.vue to panel component
2021-10-09 23:39:06 +02:00
Stefan Dej
f1094e9c29
chore(eslint): config and fix eslint rules (#340)
* chore(eslint): init & config eslint

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* chore(eslint): fix eslint rules

Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-08-28 16:08:00 +02:00
Stefan Dej
b6223af123 bugfix: hide webcam until socket is connected
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-08-09 22:05:03 +02:00
Stefan Dej
50dbc468e8
feature: sortable dashboard panels (#319)
* init test setup

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: ts typos

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: better tab system

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add touch support for drag&drop and split components

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: add panel filter to each viewport

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: mjpegstreamerAdaptive dont start with a wront image url

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add i18n support for dashboard settings

Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-08-03 16:22:30 +02:00
Stefan Dej
baa25c4bcd
V2.0.0-beta (#308)
* test vue-echarts and dataset>source instead of series>data

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix disposed state of chart & delete update interval of settings page

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* init TS migation & dashboard

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: dashbaord console

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: add "disabled" status to the filament runout sensor on the dashboard

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix klipper restart process

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix status panel during a print

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert g-code files to typescript

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert history files to typescript

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert machine limits to typescript

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert update manager to typescript

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert endstops & logfiles to typescript

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix temp display in tools panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert machine > config files to TS

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert select printer dialog to TS

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert select printer menu to TS

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert farm page to TS

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix debug output of farm printer getters

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix import webcam streams in farm view

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* better handling when changing printers

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert heightmap to TS

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert heightmap to TS

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* Console QOL (#300)

* CHORE

Signed-off-by: Eike Ahmels <eike.ahmels@tu-dortmund.de>

* NEW: console ts refactor, linux autocomplete, gui helplist, multiline

Signed-off-by: Eike Ahmels <eike.ahmels@tu-dortmund.de>

* FIX: console autocomplete flood fix

Signed-off-by: Eike Ahmels <eike.ahmels@tu-dortmund.de>

* fix merged console

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fixed return of ConsoleTable.vue isCommand

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: add toast after creating file in ConfigFilesPanel.vue

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: file upload message

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add toolbar to files panels

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: disable scrollbars in TempChart.vue

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: sidebar z-index and farm printer toolbar

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: sidebar & topbar z-index and farm printer toolbar

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* update toolbars in gcode-files and history

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: new settings dialog (#302)

* create settings dialog and integrate general, console, control, marcos, presets, webcams

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: renamed webcam gui state variable

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: temperature_fan chamber in farm printers dashboard

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: only display RPM in tools panel, when its available

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: reading empty remote printers list

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: loading additionalSensors in temp panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix: bed_mesh loading
rework heightmap settings
save heightmap settings in moonraker db

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add remote printers to settings

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix types

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add beforeDestroy to echarts

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add heightmap visualMap scaling and format tooltip

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: logo & primary color customizing

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* remove keep-alive in app.vue

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* round tempchart data

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* normalize toolbar buttons

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix series attributes & update echarts-gl

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix hostname in sidebar

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* rework websocket loadings

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix rework websocket loadings

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* Fixes for console QOL PR (#301)

* FIX: command help dialog added

Signed-off-by: Eike Ahmels <eike.ahmels@tu-dortmund.de>

* FIX: console fixes

Signed-off-by: Eike Ahmels <eike.ahmels@tu-dortmund.de>

* rework events store

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: check customFilters if string or array

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: edit preset dont work (existing name check)

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: save webcam with index 0

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: tool combobox input dont work

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: tooltip position & z-index

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* rework console

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix output name of filament sensor

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* store performance updates and StatusPanel.vue optimizing

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* console bugfixes

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix icon-rotate in temperatures panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add auto-grow to console input fields

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix dialog action button colors

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix refreshMetadata of gcocde files

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: add multi fileupload to drag&drop upload

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* convert SystemPanel to TS

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add init and getters for system panels

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add init and getters for system panels

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* finish SystemPanel.vue

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: raspberry throttled flags in topbar

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: fix type in TheThrottledStates.vue

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: add new editor (#307)

* init test

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* theme test

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: switch to codemirror editor

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: fix type in TheThrottledStates.vue

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* reformat flags output and deactivate debug output

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* add types to throttle states

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* display "dirty" in the board firmware version string

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix mini console array cut

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* delete old comment

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* fix config files on small devices

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: display macro description in settings tab

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* change settings icons

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* rename dashboard panel & change slider text in settings

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* responsive optimations for settings

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix throttled state flags filter

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* Code highlighting for codemirror (#309)

* init test

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* theme test

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: switch to codemirror editor

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* NEW: klipper_config editor theme

Signed-off-by: Eike Ahmels <eike.ahmels@tu-dortmund.de>

* NEW: code highlighting for codemirror

Signed-off-by: Eike Ahmels <eike.ahmels@tu-dortmund.de>

Co-authored-by: Stefan Dej <meteyou@gmail.com>

* feature: hide/show jobs with special print status

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* redesign console help modal

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: default state of sidebar was wrong on mobile devices

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: mobile view interface settings

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: optimize mobile view interface settings

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: block empty console commands

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* push version number

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: add current / max flow in status panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* feature: add big gcode thumbnail to status panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: fix favicon and setting tab names

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* cleanup old editor

Signed-off-by: Stefan Dej <meteyou@gmail.com>

* bugfix: add redirect for updates from 1.6.0 to 2.0.0

Signed-off-by: Stefan Dej <meteyou@gmail.com>

Co-authored-by: Eike Ahmels <hui_buh-@gmx.net>
2021-07-16 23:21:37 +02:00
Stefan Dej
97c06c3061 feature: add UV4L-MJPEG webcam support
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-05-18 01:08:47 +02:00
Stefan Dej
36a4fc2805 bugfix: show only one webcam in full screen mode instead of grid view
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-04-04 03:23:41 +02:00
Stefan Dej
88afe071e1 feature: grid view for multi webcam
feature: lazy loading for adaptive mjpegstreamer webcam

Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-04-04 01:40:33 +02:00
Stefan Dej
cae2bfd2cb feature: add ip cam to webcams
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-03-31 01:32:58 +02:00
Stefan Dej
fcbdd18d04 fix webcam panel bottom margin
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-03-31 01:17:17 +02:00
Stefan Dej
c6e6794f0a fix webcam performance
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-03-29 01:02:56 +02:00
Stefan Dej
10ab6ec088 format framerate in webcam
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-03-29 00:26:21 +02:00
Stefan Dej
8af80463c3 fix webcam update state
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-03-29 00:00:47 +02:00
Stefan Dej
cca33770fc cleanup multi webcam
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-03-28 22:58:27 +02:00
eliteSCHW31N
5528988566
Add Multiple Cams (#235)
* add webcam store methodes

* add experimentell multicam panel

* add dev stuff

* update getter

* add stream not found picture workspace

* update button label

* finish webcam setting panel

* remove remote mode, move navbar switch, add multicam support to webcam panel

* fix package-lock

* update url not working picture workspace

* add error messages, add icon to cams, remove picture workspace

* fix spacing

* fix layouts, fix forgotten boolean for nav, fix cam selection

* fix layout

* add url rule

* fix picture format

* replace index with name, add check if selected cam is still configured

* fix default value

* update database layout

* fix database entries

* fix cam url validation

* try other url check methode

* remove url validation

* add experimentell cam migration

* fix cam migration

Co-authored-by: eliteSCHW31N <business@eliteschw31n.de>
Co-authored-by: Stefan Dej <meteyou@gmail.com>
2021-03-27 14:36:10 +01:00
winbin
ef732ebc87 Merge branch 'master' of https://github.com/meteyou/mainsail into LanguageChange
# Conflicts:
#	package.json
#	src/App.vue
#	src/components/ConnectingDialog.vue
#	src/components/SelectPrinterDialog.vue
#	src/components/panels/ControlPanel.vue
#	src/components/panels/ExtruderPanel.vue
#	src/components/panels/Settings/ConfigFilesPanel.vue
#	src/components/panels/Settings/ControlPanel.vue
#	src/components/panels/Settings/EndstopPanel.vue
#	src/components/panels/Settings/GeneralPanel.vue
#	src/components/panels/Settings/LimitsPanel.vue
#	src/components/panels/Settings/UpdatePanel.vue
#	src/components/panels/StatusPanel.vue
#	src/components/panels/ToolsPanel.vue
#	src/components/panels/WebcamPanel.vue
#	src/components/panels/ZOffsetPanel.vue
#	src/main.js
#	src/pages/Files.vue
#	src/store/gui/actions.js
#	src/store/gui/index.js
2021-03-15 16:17:56 +08:00
Stefan Dej
fbdacef932 cleanup adaptive mjpeg-streamer functions
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-02-24 22:41:08 +01:00
Stefan Dej
2be28ab463 cleanup adaptive mjpeg-streamer functions
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-02-22 23:26:00 +01:00
Rejdukien
cbd9d6ea75 Cleanup and change from switch to select element
Signed-off-by: Rejdukien <Rejdukien@users.noreply.github.com>
2021-02-22 22:50:08 +01:00
Rejdukien
b204373dd9 Change from websockets to regular pull-based approach 2021-02-22 22:50:08 +01:00
Rejdukien
5b2dad6c32 PyImageStreamer websocket support 2021-02-22 22:50:08 +01:00
winbin
d6cd1c81fb Add The Language Change And Chinese 2021-02-11 00:57:36 +08:00
Stefan Dej
837f6641d0 bugfix: esp32 cam or ustreamer link fix bypassCache append (fixed #185)
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-02-06 02:20:08 +01:00
Stefan Dej
cc77c47d54 type in WebcamPanel.vue
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-01-23 19:25:40 +01:00
Stefan Dej
6a0f19926e refresh webcam little code cleanup
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2021-01-23 19:25:13 +01:00
Samori Gorse
45198d7d93 feat(refresh-webcam): Refresh webcam view on focus
Computers with agressive power management policies
tend to stop the webcam feed after getting to sleep.

This forces the webcam feed to be restarted on focus.
2021-01-23 18:57:57 +01:00
Stefan Dej
188bce0aa4 bugfixes
Signed-off-by: Stefan Dej <meteyou@gmail.com>
2020-11-26 23:00:27 +01:00
Craig Bassett
b0b25839ca feature: allows flipping the webcam horizontally and vertically 2020-09-11 14:14:24 -05:00
Stefan Dej
bb18992f80 add interface settings and save gui.json on virtual_sdcard 2020-04-14 00:08:52 +02:00
Stefan Dej
101904bd6d console autocomplete;
tempchart target temp;
settings machinelimits
add webcamsupport
2020-04-12 00:13:40 +02:00