561 Commits

Author SHA1 Message Date
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +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
f043750f70 Fix errors in workspace dialog 2022-03-25 10:29:36 +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
casper
f31b8051df Fix darkmode issues in the Workspace dialog
CURA-8688
2022-02-28 15:59:56 +01:00
j.spijker@ultimaker.com
ca430c80be
Change imported namespace pySavitar to Savitar
Because we had to rename our Python bindings module from Savitar to
pySavitar we also changed our import downstream (Cura and Uranium). But
in order to limit the changes on our existing code we decided during the
review that we should just import pySavitar as Savitar.

Contributes to CURA-7924
2022-02-28 10:44:16 +01:00
Remco Burema
7511ac843e Changes needed wrt how we build Savitar with Sip 6.
part of CURA-7924
2022-02-25 14:31:51 +01:00
casper
26470440f0 Update buttons in work space dialog
Use Cura-styled buttons
Use dialog accecpt-reject handlers

CURA-8688
2022-02-18 14:21:37 +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
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
Remco Burema
f5604dfb1e
Add 'capabilities' to ignored metadata.
part of CURA-8671
2021-12-02 12:23:57 +01:00
Jaime van Kessel
988de58c4e Fix version upgrader for arachne
CURA-8468
2021-08-09 17:13:40 +02:00
Jaime van Kessel
900db57f0f
Update messages to use the message_types
CURA-8418
2021-07-27 11:54:43 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Remco Burema
8aa071056b
Now unused API field only took integers originally.
We want to keep it this way so people can still make plugins work for older versions of Cura, like 3.6, where the 'api' field with just a single major version, instead of the 'supported_sdk_versions', which can be either a version-string like '7.6.0' or a list of version strings.
2021-06-17 11:15:33 +02:00
Remco Burema
04002056ae
Update SDK/API from 7.5.0 to 7.6.0 for 4.10
CURA-8320
2021-06-15 16:08:07 +02:00
Ghostkeeper
3dc1dbbbdb
Load profile from ContainerRegistry if the stack refers to it
We encountered a case where the version upgrade changed the quality profile to a new one which was specific to the printer rather than a global profile. As the upgraded stack was being read from the project file, it would go look for the new quality profile in the workspace. That ID wouldn't be present in there, and so it would crash and pretend the project file is plain 3MF.
This change makes it fallback to the built-in profiles, for precisely such cases as when a version upgrade changes the stack.

Contributes to issue CURA-8212.
2021-06-03 17:13:22 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Kostas Karmas
00ade8be3a Fix crashing if the quality_type_to_apply is None
Fixes sentry issue CURA-24D
2021-04-16 16:35:44 +02:00
Ghostkeeper
08be77adad
Increment SDK version to 7.5.0
The Cura 4.9 release will have expanded functionality. If you have a plug-in that uses this functionality, marking it as using SDK 7.5.0 will notify older Cura releases that they can't use that plug-in.
2021-04-06 13:28:08 +02:00
Ghostkeeper
b815d63096
Add cura: namespace before setting keys, and store the rest in um_node.metadata
This retains per-node metadata entries.

Contributes to issue CURA-7615.
2021-02-08 17:37:38 +01:00
Ghostkeeper
c89a397e59
Merge branch 'master' into CURA-7615_store_metadata 2021-02-08 16:27:38 +01:00
Ghostkeeper
06086dfaaf
Fix reading per-object settings from 3MF object resources
This metadata has been changed to contain other information. Readers of information from 3MF need to adjust their stance too to filter out the information they need from the metadata of the metadata.

Contributes to issue CURA-7615.
2021-02-08 15:07:33 +01:00
Remco Burema
b97b7d6fa9
Set empty project hint back to false before reading.
CURA-7996
2021-02-04 13:04:00 +01:00
Remco Burema
6256bf3a4d
Possible to distinguish between empty and corrupt 3MF.
Otherwise the user could infer valid, but empty workspace is corrupt.

CURA-7996
2021-02-03 09:27:58 +01:00
Jaime van Kessel
f442417ac6
Dont try to set unknown settings as per object settings when loading 3mf
CURA-7615
2020-12-23 16:31:25 +01:00
Jaime van Kessel
f338acd4f3
Read & write all generic metadata items from 3mf
CURA-7615
2020-12-23 13:49:52 +01:00
Ghostkeeper
eeecd545db
Catch errors for corrupted zip files when reading project files
Fixes Sentry issue CURA-1DG.
2020-11-18 01:57:49 +01:00
Ghostkeeper
558a789289
Use Cura's own ComboBox element for combo boxes
This one displays a tooltip if the text is too long and gets elided, so that you can still read the printer or profile name.

Fixes #8773.
2020-11-17 10:56:12 +01:00
Ghostkeeper
b740fda491
Catch environment errors when reading 3MF archive metadata
The file could get deleted in the meanwhile.

Fixes Sentry issue CURA-1CK.
2020-11-04 14:25:39 +01:00
Kostas Karmas
03dc8d00fe Up the SDK version to 7.4.0
In preparation for release of the 4.8.

CURA-7795
2020-10-22 11:29:25 +02:00
Kostas Karmas
12aa114483 Surround the addition the convexHull with try-except when loading a 3mf
The buildplate meshes can be in .3mf format. When Cura is loading a printer, it may try to load
its mesh from a 3mf file. At the moment cura is starting up there is no build volume yet, so adding
a convexHull to the printer's 3mf buildplate mesh is not possible. By surrounding the addition of
the convexHull with a try-except, loading of 3mf buildplate meshes on startup doesn't cause issues.

Fixes https://github.com/Ultimaker/Cura/issues/8585
2020-10-21 15:31:34 +02:00
Kostas Karmas
82fc05c915 Always add a ConvexHullDecorator to objects loaded from 3MF
When loading from 3mf, objects outside the buildplate had no ConvexHullDecorator.

CURA-7780
2020-10-16 11:31:32 +02:00
Kostas Karmas
4e87f37791 Fix visual issues with long labels in the open project dialog
The following issues are fixed:
 * Printer/Quality/Material names will be wrapped if they are too long
 * The width of the window is determined based on the content of the dialog.
	With that there will not longer be overlap between the dialog content and the buttons.
2020-08-21 14:50:00 +02:00
Ghostkeeper
9ea418c0a1
Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""
This reverts commit 28f4d8513db7efce17bfd8b80fa7c8b237fd1c18.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
2020-08-20 16:35:52 +02:00
Ghostkeeper
28f4d8513d
Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"
This reverts commit 7f47f12bf0a9cf305542b6c21600ce9b804c1dfd, reversing
changes made to dd42c87da762d2030ee2220bc6f0a3e44cf85c28.
2020-08-20 16:01:46 +02:00
Jaime van Kessel
7f47f12bf0
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-14 10:01:26 +02:00
Kostas Karmas
01d5e846aa Document possible theoretical issue when loading a project file
The issue will happen only if the machine_extruder_count is a formula.
In this case, the project loading will not work properly if "Create new" printer is selected,
as the settings of all extruders but the first one will not be applied.
Workaround in this case will be to load the project again and select to update the existing
printer, in which case all settings will load properly.

CURA-7646
2020-08-11 12:37:34 +02:00
Kostas Karmas
0feeccff85 Appease mypy complaints for AttributeErrors
CURA-7646
2020-08-10 15:30:55 +02:00
Kostas Karmas
f8a15ea29e Display only the relevant materials when opening a project
Ignore the materials of the extruders that are not visible when opening a project file with a CFFF.

CURA-7646
2020-08-10 15:00:08 +02:00
Kostas Karmas
61cc8c9a95 Remove reference to JIRA ticket in comments
CURA-7646
2020-08-10 14:58:59 +02:00
Kostas Karmas
b9d5f0dc15 Take the machine_extruder_count into consideration when opening project
CURA-7646
2020-08-10 14:56:37 +02:00
Ghostkeeper
1f09ea58cc
Merge branch '4.7' 2020-08-10 11:26:25 +02:00
Ghostkeeper
fc6ea28352
Don't crash if CuraStackBuilder failed to create a stack
If it failed to create a global stack, the extruder_stack_dict variable would not be defined, and Cura crashes. It may fail to create a stack because of an indexerror in a malformed project file.

Fixes Sentry issue CURA-137.
2020-08-10 11:25:55 +02:00
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7
CURA-7641
2020-08-07 11:12:27 +02:00
Jaime van Kessel
3cdf5a82a4
Use correct property to search container stack
CURA-7609
2020-08-06 15:26:32 +02:00
Jaime van Kessel
ebdab94b98
Merge branch 'CURA-7609_Pick_any_printer_when_opening_a_project_file_single_dropdown' of github.com:Ultimaker/Cura 2020-08-06 15:26:16 +02:00