7710 Commits

Author SHA1 Message Date
Jaime van Kessel
50954552d2 Fix thumbnail creation
CURA-9120
2022-04-13 16:53:11 +02:00
Jaime van Kessel
204eeaf272 Add extra warnings if it failed to create snapshot
CURA-9120
2022-04-13 16:47:07 +02:00
Jaime van Kessel
c9e625767b Use right enum for message dialog 2022-04-13 16:40:14 +02:00
Jaime van Kessel
111d335743 Give text more room on splashscreen
CURA-9151
2022-04-13 16:36:23 +02:00
Ghostkeeper
d1d45b4f41
Fix enum to FormDataType
Stupid enum change...

Contributes to issue CURA-9119.
2022-04-11 13:23:03 +02:00
Jelle Spijker
fb22a04d4d Add search path for the pyinstaller locations
Contributes to CURA-8640
2022-04-08 20:34:42 +02:00
Jelle Spijker
4abdd675f6
Merge branch 'master' into qt6_beyond_the_splash 2022-04-08 10:26:12 +02:00
Jaime van Kessel
efc5438090 Remove unneeded clear 2022-04-08 09:16:22 +02:00
Jaime van Kessel
9e4798c98b Set ownership of MaterialBrandsModel to cpp
This hopefully prevents the crash for MacOS
2022-04-07 20:10:58 +02:00
Jaime van Kessel
262520f193 Remove setting parent from basematerial 2022-04-07 18:05:27 +02:00
Ghostkeeper
855eaec81c
Scale convex hull only by X/Y shrinkage, and handle 0% gracefully
Only the X/Y shrinkage influences the convex hull collision area. Not the Z, nor the parent setting.

Also, don't scale the collision area to 0. This value is not allowed by the setting system, so it'd indicate an error when slicing, but before slicing the convex hull gets calculated which results in degenerate polygons. Don't do that. Instead, we'll just let it pretend the scale factor is 1.

Contributes to issue CURA-9091.
2022-04-07 14:17:56 +02:00
j.delarago
b2b1961b57 Merge branch 'master' into qt6_beyond_the_splash
# Conflicts:
#	cura/PrinterOutput/PrinterOutputDevice.py
2022-04-06 15:24:30 +02:00
p.kuiper
0a8ef5162e Removed the rather hacky implementation of the shrinkage factor averaging. Issues with dual extrusion were the second extruder is not used should solved in a different way.
Relates to PP-77
2022-04-06 13:28:55 +02:00
j.delarago
aa190024d4 Update enum, this fixes connecting to printers
CURA-8640
2022-04-05 16:01:17 +02:00
Jaime van Kessel
402c53c5f1 Fix warning about Duration 2022-04-01 16:19:35 +02:00
p.kuiper
733447a2dd Removed the settings: "material_shrinkage_percentage" and update code that was using this parameter.
material_shrinkage_percentage_xy and material_shrinkage_percentage_z cannot depend on material_shrinkage_percentage otherwise their resolve function will not execute properly.
I noticed that the shrinkage factors do not get the correct value if a wrong nozzle is chosen for a material. However, in that case the slicer will also not slice, so in practice this is not an issue

Relates to PP-77
2022-04-01 13:00:41 +02:00
Jaime van Kessel
124602d2ad Return account widget to it's former glory 2022-03-31 14:19:41 +02:00
Jaime van Kessel
b4b7e6a2b9 Fix warnings that "instanceContainer" is not a recognised type 2022-03-31 14:03:04 +02:00
Jaime van Kessel
96444dbc09 Use correct keyboard enums 2022-03-31 13:54:24 +02:00
Jaime van Kessel
820734aad7 Merge branch 'CURA-8466_version_upgrade_50' of github.com:Ultimaker/Cura 2022-03-30 10:52:07 +02:00
Jaime van Kessel
42b97d0d73 Prevent crash on setConnectionState when no global stack is set 2022-03-30 09:46:17 +02:00
Ghostkeeper
d9d90ab4b6
Increment setting_version to 20
We've removed a bunch of settings and transformed others. To allow profiles to be checked for these and edited if necessary, we now need to increment this version number.

Contributes to issue CURA-8466.
2022-03-29 15:03:48 +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
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
Tim Kuipers
6da67e3d82 remove special case for prime tower brim disallowed area
It's now handled in CuraEngine
2022-03-17 14:41:57 +01:00
Tim Kuipers
4d146e882e remove skirt/brim adhesion size constraint
it is handled by CuraEngine now.
2022-03-17 14:39:24 +01:00
Tim Kuipers
fb8787f7bd fix: fix wrong placement of prime tower disallowed area
The prime tower should no longer be displaced by the brim width
2022-03-17 11:47:36 +01:00
10r3n20
044c3e9da2 updated splash screens 2022-03-16 17:03:03 +01:00
Tim Kuipers
0339e4f1ca reduce clearance needed between prime tower and models
With the new implementation we don't need that much clearance.
2022-03-16 11:31:40 +01:00
Tim Kuipers
33e3a45b5c fixes for optional skirt_brim_extruder_nr 2022-03-16 11:31:40 +01:00
Tim Kuipers
2698cd76c5 make skirt_brim_extruder_nr an optional_extruder to allow for the brim_per_material feature 2022-03-16 11:31:40 +01:00
Tim Kuipers
f7049ca3ea fix disallowed areas taking brim_gap into account 2022-03-16 11:31:40 +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