Jelle Spijker
12ee57e4ad
Merge branch 'master' into CURA-8640_PyQt6
...
# Conflicts:
# cura/UI/CuraSplashScreen.py
2022-03-28 15:02:18 +02:00
Joey de l'Arago
b3eb5270f9
Merge pull request #11706 from Ultimaker/CURA-7810_remove_deprecated_functions
...
Remove deprecated functions
2022-03-25 14:42:20 +00:00
Jaime van Kessel
894615914a
Merge branch 'new-splashscreen' of github.com:Ultimaker/Cura
2022-03-25 10:49:16 +01:00
Jaime van Kessel
1532779d1b
Remove Extruders property from global stack
...
CURA-7810
2022-03-24 14:26:03 +01:00
Jaime van Kessel
74eac8f4b9
Remove printeroutput model
...
CURA-7810
2022-03-24 13:41:10 +01:00
Jaime van Kessel
e925f07aad
Remove old arranger code
...
Major vesion upgrade, time to clean some stuff up!
CURA-7810
2022-03-24 13:37:29 +01:00
Jaime van Kessel
4d02894582
Remove cura.PrinterOutputDevice
...
Since we are moving up a major version, time to clean up deprecation warnings
CURA-7810
2022-03-24 13:27:27 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
...
# Conflicts:
# cura/CuraApplication.py
# resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
# resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
Jaime van Kessel
fa1554a62e
Merge branch 'fix_disallowed_brim_gap_distance' of github.com:Ultimaker/Cura
2022-03-22 15:23:32 +01:00
10r3n20
044c3e9da2
updated splash screens
2022-03-16 17:03:03 +01:00
Jaime van Kessel
daa4c20df4
Use intConversion instead of Str for extruder & optionalExtruder
...
CURA-8981
2022-03-16 11:08:28 +01:00
Jaime van Kessel
1632527651
Prevent crash when switching extruder in profiles page
2022-02-21 15:40:08 +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
Jaime van Kessel
f682f56923
Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2
2022-02-17 15:02:03 +01:00
10r3n20
4383f2ddf2
adjusted colors and size of origin gizmo
2022-02-15 16:45:57 +01:00
Tim Kuipers
c308e2d7d2
fix disallowed areas taking brim_gap into account
2022-02-11 11:26:26 +01:00
Ghostkeeper
7f8591718d
Remove central messageBox in favour of local box
...
The profile import/export was the only place where it was used, in our code base.
Contributes to issue CURA-8687.
2022-02-04 14:31:27 +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
5cc8fdeb7a
Count multiple raft interface layers
...
We need the raft thickness to determine the maximum height of the model. If using multiple interface layers, this height should be reduced.
Contributes to issue CURA-8915.
2022-02-03 15:55:31 +01:00
Ghostkeeper
5c71671585
Make setting names italic if changed in quality-changes profile
...
This was the behaviour before.
Contributes to issue CURA-8686.
2022-01-26 14:00:29 +01:00
Ghostkeeper
5e5e0febb9
Format calculated functions in QualitySettingsModel itself
...
That way we don't have to re-format it in the display in the table.
Contributes to issue CURA-8686.
2022-01-26 11:33:42 +01:00
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