Commit graph

2303 commits

Author SHA1 Message Date
Jelle Spijker
896cfb2a7e
Merge pull request #12989 from digitalfrost/090822b
CuraContainerStack.py: improve TypeIndexMap
2022-08-23 09:57:05 +02:00
joeydelarago
c80dd62169 Fix circular import.
CURA-9277
2022-08-22 16:34:18 +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 5082e64f0c.
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
c4be0e298c Add mime type to AbstractMachine
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
2022-08-22 11:57:18 +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
digitalfrost
60c8712b10 CuraContainerStack.py: improve TypeIndexMap
Cleaner and more idiomatic way to reverse a dictionary
2022-08-09 11:42:18 +02:00
Ghostkeeper
bd131257fe
Implement sending a signal when changing intent changes quality level
For now it does nothing. But I'm adding a function that should cause the combobox to pulse. That'll be a new feature so I'm implementing it in a separate commit.

Contributes to issue CURA-8849.
2022-06-14 16:00:13 +02:00
j.delarago
a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix.
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.

CURA-8849
2022-06-14 11:41:38 +02:00
j.delarago
ed7ec6ab8f Add intent change signal so intent changes can trigger updates in resolution drop down.
CURA-8849
2022-06-14 09:59:22 +02:00
Ghostkeeper
4a08b88f31
Allow setting metadata subentries that don't exist yet
Otherwise it crashes here. The ContainerManager should be flexible enough to allow that sort of thing.
It works with plain entries, but crashed with subentries (like 'properties/diameter') if those weren't present yet in the metadata.

Fixes Sentry issue CURA-3FH.
2022-06-08 11:24:46 +02:00
Jaime van Kessel
e6551821aa Use intent category if no translation is available
Previously we would only accept intents that had a translation. If we
could not find one, we would use "unknown" as the intent category. However,
we didn't really do this consistently. In some places it would show unkown
and in others we'd show the intent type.

This should make the behavior the same across the board. It will try to get a
translation for the intent category and show that. If it's unable to find that
it will use the category instead. Note that it will use the python title function
to ensure it has nice capitalisation

CURA-9297
2022-06-01 11:07:01 +02:00
Ghostkeeper
d6bd7cce9e
Oops 2022-05-31 13:39:47 +02:00
Ghostkeeper
35147d7f5e
Don't crash if machine_extruder_trains metadata is missing
This old function is only necessary for upgrading from before v3.4. Best not let it crash in any other case, even if that would sometimes make very old machine instances corrupt if I made a mistake in thinking here.

Fixes Sentry issue CURA-3XG.
2022-05-31 11:24:08 +02:00
Jelle Spijker
334fca6691
Merge remote-tracking branch 'origin/gracefully_fail_cloud_printer' into 5.0 2022-05-09 10:54:07 +02:00
Jaime van Kessel
0c98ce2384 Use correct role for standardbutton
Otherwise the no won't register...

CURA-9229
2022-05-04 11:09:49 +02:00
Jaime van Kessel
e4e993a44e Fail gracefully when adding unknown cloud printer 2022-04-19 15:43:31 +02:00
Jaime van Kessel
c9e625767b Use right enum for message dialog 2022-04-13 16:40:14 +02:00
Jaime van Kessel
b4b7e6a2b9 Fix warnings that "instanceContainer" is not a recognised type 2022-03-31 14:03:04 +02:00
Jelle Spijker
12ee57e4ad
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/UI/CuraSplashScreen.py
2022-03-28 15:02:18 +02:00
Jaime van Kessel
1532779d1b Remove Extruders property from global stack
CURA-7810
2022-03-24 14:26:03 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
2022-02-21 11:52:28 +01:00
Ghostkeeper
3534894eeb
Don't mark interface extruder as used when there are none
If there are 0 interface layers, the extruder doesn't necessarily gets used.

Contributes to issue CURA-8915.
2022-02-03 15:59:21 +01:00
Ghostkeeper
403d92a760
Fix getting used and starting extruders with new adhesion extruder settings
Getting more involved than I thought. But it's not complex yet.

Contributes to issue CURA-8868.
2022-01-12 14:29:01 +01:00
Ghostkeeper
ab0c03cf65
Catch KeyError['empty_material'] when evaluating whether there's any profiles
This is currently only used in the pre-read of workspaces. In some cases, the project file may have a material that is not compatible with its own stack using the current rules in Cura, either because the rules changed or because the project file is wrongly crafted/edited. This causes Cura to say there are no quality profiles if the material profile is not compatible with the printer, preventing a crash due to the KeyError.
2022-01-05 10:26:28 +01:00
Remco Burema
6586bcc762
Qt5->Qt6: Fix cause of stack-overflow errors for newer Python/Qt.
part of CURA-8591
2021-12-29 09:23:11 +01:00
Remco Burema
b62e708b87
Qt5->Qt6: (Until) attempted fix Python 3.10 'stack overflow' issue.
part of CURA-8591
2021-12-28 18:12:36 +01:00
Remco Burema
32b52c6166
Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership
part of CURA-8591
2021-12-28 14:54:56 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6.
part of upgrading Qt to v6.2: CURA-8591
2021-12-28 14:46:02 +01:00
Jaime van Kessel
998ba3631c Add missing format to error log 2021-12-15 12:03:55 +01:00
fieldOfView
19dbd1f168 Merge branch 'master' into feature_extruder_warning_icon 2021-11-16 14:56:43 +01:00
Ghostkeeper
ca942a15e8
Don't use infinite lifetimes lightly
This is very annoying if switching profiles. This is not a critical message. The message should disappear after the default amount of time.

Discovered while working on CURA-8584.
2021-11-09 14:45:40 +01:00
Jaime van Kessel
c7c052e51c Fix crash when profile referenced unavailable extruder
CURA-8584
2021-11-05 15:50:24 +01:00
Jaime van Kessel
285a4584e7 Improve speed of the inherit button
A few unneeded conversions were done. Also moved one check to python from JS
2021-10-08 18:12:35 +02:00
Jaime van Kessel
e88ac49fd6 Add global & extruder stack to ignore list for name filters
This prevents the weird spam about "global_stack" not being a plugin ID
2021-09-27 13:41:53 +02:00
Ghostkeeper
58f4d44694
Don't crash when switching to printer with fewer extruders
This seems to have happened with an UM2+C.

Fixes Sentry issue CURA-2R5.
2021-09-21 13:40:40 +02:00
Remco Burema
b2eae08cc7
Merge pull request #10327 from Ultimaker/CURA-6096_profile_database
Store metadata in database
2021-09-09 17:29:40 +02:00
Ghostkeeper
034f62ea2c
Match table name with container type
The table name is used as the container type in the resulting metadata, so we need to use the container type string as table name correctly, or none of the profiles can be found.

Contributes to issue CURA-6096.
2021-09-08 16:40:22 +02:00
Ghostkeeper
057ba8cdeb
Fix setting container type of subclasses
This mistake caused all of the container types to end up as either None or the actual instance itself, which was causing crashes.

Contributes to issue CURA-6096.
2021-09-08 15:46:25 +02:00
Ghostkeeper
adac0af1ec
Revert "Use SQLQueryFactory for container DB"
This reverts commit 571a051041.
2021-09-08 15:10:32 +02:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00