GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 00:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 290 Branches 260 Tags
Commit Graph

7628 Commits

Author SHA1 Message Date
Remco Burema
95f234679c Placeholder; the selected printer to monitor is abstract, but cloud-capable. 
forms the base of CURA-9422
 2022-08-26 13:10:09 +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
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
digitalfrost
afb90b4b2e Move initialization of found_solution_for_all 
Initialize the variable found_solution_for_all with False and
 don't set it a the exception block.
 2022-08-24 19:52:26 +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
joeydelarago
04580b8fdc Simplify logic by having abstract printers always be online. 
CURA-9221
 2022-08-24 14:33:04 +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
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
digitalfrost
e9172b10af
Use f-string and warn method with Logger 
Use f-string and warn method for Logger instead of "Old Style" string formatting.

Co-authored-by: Jelle Spijker <spijker.jelle@gmail.com>
 2022-08-23 20:01:47 +02:00
digitalfrost
9f3a1cfe0a Use f-string and info method with Logger 
Use f-string and info method for Logger instead of "Old Style" string
formating.
 2022-08-23 19:53:50 +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
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
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
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
joeydelarago
c80dd62169 Fix circular import. 
CURA-9277
 2022-08-22 16:34:18 +02:00
joeydelarago
3413caab62 Set latest.json location back to ultimaker website. 
CURA-9272
 2022-08-22 16:29:08 +02:00
joeydelarago
c016c23d10 Create model from abstract machine list 
CURA-9514
 2022-08-22 16:26:02 +02:00
c.lamboo
5884aa3311 Add comment about circular import 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 15:03:48 +02:00
c.lamboo
f6bf7050fb Revert "Move cura-import to top of the file" 
This reverts commit 5082e64f0c1d60e4820a3ba35fd3ca82c8be3051.
 2022-08-22 15:01:51 +02:00
c.lamboo
5082e64f0c Move cura-import to top of the file 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 14:58:32 +02:00
Casper Lamboo
35502e45fa
Apply suggestions from code review 
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:48:04 +02:00
Casper Lamboo
5761b3f27b
Typing 
CUR-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:35:07 +02:00
Casper Lamboo
77a179be76
Code style 
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:32:59 +02:00
joeydelarago
d83673a972 Use ConnectionType enum 
Move import statement

CURA-9277
 2022-08-22 14:25:17 +02:00
c.lamboo
61ce8dff7d Add the abstract stack to the Resources 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 11:58:05 +02:00
c.lamboo
c4be0e298c Add mime type to AbstractMachine 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 11:57:18 +02:00
joeydelarago
544ac33537 Add resource type for abstract machine so they can be saved. 
CURA-9277
 2022-08-22 10:33:47 +02:00
digitalfrost
50d81225da Improve documentation string 
onCurrentCallbackFinished documentation string:
- Improve clarity
- Fix grammar
- Improve layout and shorten line length
 2022-08-20 19:40:58 +02:00
digitalfrost
d9fb352ee2 Fix typo 2022-08-20 19:27:32 +02:00
digitalfrost
fe2b8ebaf7 Improve triggerNextCallback documentation 
triggerNextCallback documentation:
- Correct grammar
- Shorten lines and improve layout
 2022-08-20 19:22:28 +02:00
digitalfrost
62d05f2350 OnExitCallbackManager.py: Improve docstring layout 
- Reduce line length.
- More logical line breaks.
 2022-08-20 19:12:44 +02:00
digitalfrost
6298bb50ce OnExitCallbackManager.py: Fix grammar 
Grammatical correction of docstring
 2022-08-20 18:58:03 +02:00
digitalfrost
6df4d7677a Fix typo 2022-08-20 18:51:59 +02:00
c.lamboo
963110a9c6 Remove Fix me 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:41:02 +02:00
c.lamboo
f22d446fa4 Implement getMachines function 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:13 +02:00
c.lamboo
d7f119415f Use pretty-printed string for the AbstractMachine name 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:00 +02:00
c.lamboo
761bf3b8fa Fix creating abstract machines on account sync 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 14:44:19 +02:00
joeydelarago
b82f1f4a8c Add new Abstract machine stack type. This represents a type of printers (ultimaker_s3 etc). 
These are created whenever a cloud printer of a new printer type is added.

CURA-9277

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
 2022-08-19 13:53:43 +02:00