Commit graph

29989 commits

Author SHA1 Message Date
Jaime van Kessel
4ac8229c33
Clean up codestyle violations
Boyscouting! CURA-8463
2022-08-30 10:28:22 +02:00
Jaime van Kessel
506f2b9820
Remove code duplication in createAbstractMachine
This also caused a crash when an abstract machine with multiple extruders was selected

CURA-8463
2022-08-26 14:08:03 +02:00
Jaime van Kessel
46532828a4
Add logging for when setting the active machine failed
CURA-8463
2022-08-26 13:46:01 +02:00
Jaime van Kessel
0516b27f2b
Clean up formatting of documentation
Boyscouting!

CURA-8463
2022-08-26 13:35:13 +02:00
Jaime van Kessel
d842013a76
Simplify onCompleted call in qml
CURA-8463
2022-08-26 13:31:48 +02:00
Jaime van Kessel
36d3a92fc0
Fix gramar mistake in documentation
CURA-8463
2022-08-26 13:27:58 +02:00
Casper Lamboo
fe7960ee73
Merge pull request #13128 from Ultimaker/CURA-9277_CURA-9514_remove_AbstractMachine
Remove AbstractMachine
2022-08-26 11:36:16 +02:00
c.lamboo
ff7c9eddde Add documentation
CURA-9514, CURA-9277
2022-08-26 11:34:34 +02:00
c.lamboo
f000b75661 Move getMachinesWithDefinition to MachinesManager
CURA-9514, CURA-9277
2022-08-26 11:16:10 +02:00
c.lamboo
8b84db7059 Remove AbstractMachine
Having a separate class for the AbstractMachine complicated things; it's behaviour was extremely similar to the GlobalStack so adding one more stack container type in addition to the many similar setting container types we already have adds complexity to the system. Having these different classes for machines and abstract machines also add complexity to the update script as the abstract machines were stored in a separate folder from the machine types.

Because of these reasons we decided to replace the AbstractMachine by a GlobalStack where the is_abstract_machine property metadata property is set to True.

CURA-9514, CURA-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-26 10:45:45 +02:00
Jelle Spijker
d843921c7a
Merge pull request #13106 from digitalfrost/240822
CuraSceneController.py : Fix problem with log message and use f-string
2022-08-24 20:35:54 +02:00
digitalfrost
bb0870008e CuraSceneController.py : Fix problem with log message and use f-string
- Correct log message (we want to log the "selected" build plate)
- Use f-string and debug method for Logger instead of "Old Style" string formatting.
2022-08-24 20:22:20 +02:00
Jaime van Kessel
22baf8f34e
Merge branch 'main' of github.com:Ultimaker/Cura 2022-08-24 16:52:26 +02:00
Jaime van Kessel
03c88c18e6
Bump up the maximum_extrusion_area_deviation
CURA-9524
Fixes #12828
2022-08-24 16:51:47 +02:00
Remco Burema
0063867b4b Fix github workflow for packages on 'modern linux'. 2022-08-24 16:42:40 +02:00
Remco Burema
72e67de978 Fix github workflow for packages on 'modern linux'. 2022-08-24 16:21:02 +02:00
Casper Lamboo
197683c6c6
Merge pull request #13102 from Ultimaker/CURA-9514_collapsable_printers_list
[CURA-9514] Collapsable printers list
2022-08-24 16:07:41 +02:00
Joey de l'Arago
2ffd5b47bb
Update README.md 2022-08-24 15:06:38 +02:00
joeydelarago
d6effa9716 Update README.md, use dark mode or light mode image depending on github theme. 2022-08-24 14:59:18 +02:00
joeydelarago
04580b8fdc Simplify logic by having abstract printers always be online.
CURA-9221
2022-08-24 14:33:04 +02:00
Joey de l'Arago
2013ad6baf
Update resources/qml/PrinterSelector/MachineListButton.qml
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-08-24 14:22:17 +02:00
joeydelarago
b4e5fd8526 Remove debug statement
CURA-9514
2022-08-24 10:24:53 +02:00
joeydelarago
1e898ff930 Remove redundant comment
CURA-9514
2022-08-24 10:23:35 +02:00
joeydelarago
91b8c97dae Subtract online printers from list of all printers instead of searching for offline printers.
This prevents printers without "is_online" in the metadata from being left out, and is generally more defensive for uncertain states.

CURA-9514
2022-08-24 10:09:45 +02:00
joeydelarago
17e6bccf51 Create abstract printers when adding lan printers.
CURA-9514
2022-08-24 10:07:17 +02:00
joeydelarago
52b2a8322c Include LAN printers in abstract printers list
Make filtering clearer by splitting it up into multiple lines.

CURA-9514
2022-08-24 10:06:51 +02:00
joeydelarago
721f63b0d1 Give machine selector minimum width so it displays correctly on smaller screens.
CURA-9514
2022-08-24 10:06:03 +02:00
Joey de l'Arago
545291511c
Merge pull request #13011 from digitalfrost/patch-9
setting_properties.md: Reformat text and corrections
2022-08-24 09:05:50 +02:00
Joey de l'Arago
17ba4375e7
Merge pull request #13006 from ElectronicsArchiver/main
Formatted README
2022-08-23 16:47:31 +02:00
joeydelarago
eea8935741 Set minimum width, so that drop down is still readable on small screens
CURA-9514
2022-08-23 16:20:04 +02:00
joeydelarago
db0b668739 Adjust button size according to width
CURA-9514
2022-08-23 16:17:36 +02:00
joeydelarago
90f53bbdc1 Adjust large button size
CURA-9514
2022-08-23 16:01:30 +02:00
joeydelarago
790c373b38 Show icon for offline printers
CURA-9514
2022-08-23 15:57:40 +02:00
joeydelarago
e541890c07 Fix drop down not dynamically resizing width
CURA-9514
2022-08-23 15:56:50 +02:00
joeydelarago
035fb27ab0 Code style
CURA-9514
2022-08-23 15:44:42 +02:00
joeydelarago
93e2bef303 Group printers by section (Connected Printers/Other Printers)
Cleanup redundant code.

CURA-9514
2022-08-23 15:44:16 +02:00
digitalfrost
77cc7787e3
setting_properties.md: Use bold
Use bold for the first part of the description of the property
2022-08-23 15:42:19 +02:00
digitalfrost
09a8a70739
setting_properties.md: use indented bullet points
Use indented bullet points for the text about the properties.
2022-08-23 15:32:10 +02:00
joeydelarago
b18080c332 Rename AbstractStacksModel.py -> MachineListModel.py since this model includes both abstract machine stacks and regular machines
Add machineCount for displaying the number of machines of a type.

MachineSelectorButton is in use in other places, swapped it out for a new Component MachineListButton.

CURA-9514
2022-08-23 14:29:05 +02:00
joeydelarago
bedb76d516 Update comment
CURA-9514
2022-08-23 13:11:17 +02:00
joeydelarago
7ffa770fb4 Searching container registry returns ContainerStacks.
Made typing more generic to work with an ContainerStack to compensate.

Made AbstractMachine getMachines a classmethod so it can be called with ContainerStacks.

CURA-9514
2022-08-23 10:35:00 +02:00
Jelle Spijker
63dc79dca1
Merge pull request #13082 from digitalfrost/200822
OnExitCallbackManager.py: improve documentation
2022-08-23 10:27:21 +02:00
Jelle Spijker
cc9a413a49
Merge pull request #12909 from digitalfrost/310722
Use dataclasses for Peripheral
2022-08-23 10:23:47 +02:00
Jelle Spijker
67c8585c68
Merge pull request #12929 from digitalfrost/020822
MachineErrorChecker.py: Move _error_check_timer initialization to a separate function
2022-08-23 10:19:24 +02:00
joeydelarago
d1ae3136aa Merge branch 'main' into CURA-9514_collapsable_printers_list 2022-08-23 10:07:27 +02:00
Jelle Spijker
896cfb2a7e
Merge pull request #12989 from digitalfrost/090822b
CuraContainerStack.py: improve TypeIndexMap
2022-08-23 09:57:05 +02:00
トトも
651646cac8
Merge branch 'Ultimaker:main' into main 2022-08-23 03:55:16 -04:00
joeydelarago
8d709e6fbe Merge remote-tracking branch 'origin/main' 2022-08-22 17:09:08 +02:00
joeydelarago
21878058eb Fix prerelease string assignment 2022-08-22 17:08:55 +02:00
Jelle Spijker
d262d71b5d
Merge pull request #13089 from Ultimaker/CURA-9277_cloud_printer_types
Cura 9277 cloud printer types
2022-08-22 17:03:58 +02:00