7710 Commits

Author SHA1 Message Date
Ghostkeeper
efcd00e2f3
Merge branch 'master' into marketplace_redesign
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
2022-01-20 15:57:28 +01:00
Jelle Spijker
74829f5642
Merge pull request #11196 from Ultimaker/CURA-8592_python_3.10
Upgrade to Python 3.10
2022-01-18 12:26:45 +01:00
Casper Lamboo
41f1029dc0
Use updated python type notation 2022-01-14 09:07:41 +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
304f57293d
Adjust build volume depending on new adhesion extruder sub-settings
It should get these settings from the correct extruders even if they are different from one another.

Contributes to issue CURA-8868.
2022-01-12 14:09:57 +01:00
Gabriel Féron
aad41807c3
Remove unused import of sentry_sdk 2022-01-11 20:28:41 +01:00
Ghostkeeper
f4d60b38ee
Shorten two texts of 'Sync materials with printers'
In most languages this doesn't properly fit in the space we have for these buttons.
The same text in the window title and header was not changed. There we do have space for it. The button in the material manager was also not adjusted since it's different and already about as short as can be (but needs to refer to printers instead of materials due to the context of already being in the material manager).

Contributes to issue CURA-8753.
2022-01-10 17:28:45 +01:00
Ghostkeeper
ec5bb444c0
Don't change metadata if there is no global stack
We'll miss that status update then, but the next time Cura starts it'll update the printer status anyway.

Found during testing of CURA-8591.
2022-01-05 17:15:38 +01:00
Jaime van Kessel
6e4143ba59 Merge branch '4.13' of github.com:Ultimaker/Cura 2022-01-05 14:08:00 +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
Ghostkeeper
652043e1d8
Cast bounding box to ints
The version of Sip we're using now cares about this more than the previous one, apparently.

Contributes to issue CURA-8592.
2022-01-03 17:32:33 +01:00
Ghostkeeper
9118f20193
Merge branch 'CURA-8592_python_3.10' of github.com:Ultimaker/Cura into CURA-8592_python_3.10 2022-01-03 16:37:07 +01:00
Ghostkeeper
770eb03d62
Remove references to Shapely
This has been replaced with PyClipper so we don't need to import Shapely any more. Clipper doesn't give any exceptions as far as I know.

Contributes to issue CURA-8592.
2022-01-03 16:34:40 +01:00
Jaime van Kessel
3bfea5b970 Ensure that stored log lines are sent to sentry if they haven't already been logged
CURA-8760
2022-01-03 14:10:36 +01:00
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00
Ghostkeeper
a878cfae7a
Merge branch 'master' into marketplace_redesign 2021-12-31 14:07:51 +01:00
Ghostkeeper
05bbebf2f7
Remove traces of Shapely
It's been replaced by Pyclipper. We were only importing Shapely here, not actually using it.

Contributes to issue CURA-8592.
2021-12-31 14:06:31 +01:00
Remco Burema
b794ad6ed2
Delete old 'Toolbox' in favour of new Marketplace.
part of CURA-8588
2021-12-30 11:51:54 +01:00
Remco Burema
448fbf7408
Qt5->Qt6: Register QML enums as (uncreatable) meta object not type.
part of CURA-8591
2021-12-29 11:37:18 +01:00
Remco Burema
20b435af76
Qt5->Qt6: More renamed stuff.
part of CURA-8591
2021-12-29 11:18:49 +01:00
Remco Burema
97da0b9183
Qt5->Qt6: Fix another stack-overflow error for newer Python/Qt.
part of CURA-8591
2021-12-29 10:15:14 +01:00
Remco Burema
9d7b1e49ee
Qt5->Qt6: Make CrashHandler window show up again.
part of CURA-8591
2021-12-29 09:30:48 +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
6dc6020217
Qt5->Qt6: GUI-attributes and flips params register singletons.
part of CURA-8591
2021-12-28 18:36:28 +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
7021ff0b67
Qt5->Qt6: Replace QT_ENUMS with pyqtEnum.
part of CURA-8591
2021-12-28 14:59:25 +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
6dac500f18 Simplify getAllLocalPackages
CURA-8587
2021-12-20 10:34:37 +01:00
Jaime van Kessel
477f62916c Further simplify the data being sent over to the package manager
CURA-8587
2021-12-16 23:21:44 +01:00
Ghostkeeper
385c02f0bd
Merge branch '4.13' 2021-12-16 17:17:08 +01:00
Ghostkeeper
5a9bafe453
Update SDK version to 7.9.0
This is going to be the new SDK version for Cura 4.13.
2021-12-16 17:15:59 +01:00
Jaime van Kessel
d59cd602ee FIx failing mypy test
CURA-8083
2021-12-16 10:00:11 +01:00
Jaime van Kessel
6c64e08299 Fix typing of scaleAreas
The change in e5be3e56dc4f04df2c6fe44bede285b04c5a5f0e wasn't quite correct

CURA-8083
2021-12-16 09:58:09 +01:00
casper
e5be3e56dc Use correct definition of Polygons
Only saw this error after the merge so pushing directly to master.

part of CURA-8083
2021-12-15 17:48:20 +01:00
Casper Lamboo
7c7a1016d0
Merge pull request #11075 from Ultimaker/CURA-8083_separate_z_shrinkage_comp
[CURA-8083] Separate Vertical and Horizontal Shrinkage Compensation.
2021-12-15 17:40:27 +01:00
Jelle Spijker
0ffaafc8c0
Revert "Simplify CuraPackageManager"
This reverts commit 33f1bd8c5d2126e0f3045d9c71514dd23788f9c9.
2021-12-15 16:39:02 +01:00
Jelle Spijker
9e1e98bdbd
Revert "Show install button after package has been uninstalled"
This reverts commit c66e17dd9e52987ff75b708557e9037f4d9d66f2.
2021-12-15 16:38:54 +01:00
casper
c66e17dd9e Show install button after package has been uninstalled
CURA-8587
2021-12-15 15:13:38 +01:00
casper
33f1bd8c5d Simplify CuraPackageManager
CURA-8587
2021-12-15 14:18:40 +01:00
Remco Burema
f51cc84a7c
Temporary? solution for UX w.r.t. material shrinkage.
Material shrinkage now alters both the disallowed areas+, and the blue wireframe, toghether repressenting the usable build-volume. This doesn't shrink the build-plate/printer model, still keeping in line with the 'show the size of the result object in Prepare, not the resized one we do print becasue it will shrink later' principle we had originally agreed on enough. Note that the disallowed areas also take the object themzelves into account, so the user could still tell when objects are going to be printed overlapped (as the dissalowed areas of those respective models then overlap -- but not, of course, the models themselves).

part of CURA-8083
2021-12-15 12:50:01 +01:00
Jaime van Kessel
03398422dd Merge branch '4.13' of github.com:Ultimaker/Cura 2021-12-15 12:04:19 +01:00
Jaime van Kessel
998ba3631c Add missing format to error log 2021-12-15 12:03:55 +01:00
Remco Burema
b6c0a49657
Attempt to compensate build-area/volume for material shrinkage.
part of CURA-8083
2021-12-14 17:04:20 +01:00
Ghostkeeper
9140b71b19
Merge branch 'libArachne_rebased'
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
2021-12-14 11:48:58 +01:00
Jaime van Kessel
eb11e92637 Rename local_packages_id to local_packages_ids
CURA-8587
2021-12-13 11:54:13 +01:00
Ghostkeeper
006b5e25b2
Also catch unknown keyring errors
We're confident now that we get it to not crash for most normal cases. If there is a crash here it's due to the internals of Keyring. We're catching all of the others separately anyway.

Fixes Sentry issue CURA-340.
2021-12-13 11:22:37 +01:00
Jaime van Kessel
fe8a3fc61d Prevent crash when setting non default intent category 2021-12-10 09:51:09 +01:00
Jelle Spijker
9874b0c8ba
removed redundant dunders from helper class
Contributes to: CURA-8587
2021-12-09 15:14:20 +01:00
Jelle Spijker
51a77f683d
Moved stateManageButton logic out of the packageModel
Contributes to: CURA-8587
2021-12-09 09:56:41 +01:00