689 Commits

Author SHA1 Message Date
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
Jaime van Kessel
c8771124ad
Change function name to better reflect what it does
CURA-7609
2020-08-05 14:56:39 +02:00
Kostas Karmas
4e20c7dddc Rework the open project dialog to contain only 1 dropdown
With the caveat that the qtQuickControls had to be updated to 2.3, due to a qt bug in 1.x that did
not update the dropdown popup list according to the ListModel.
This leads to a different look in the dropdowns and in the buttons of the open project dialog,
compaired to the rest of the application.

CURA-7609
2020-08-04 16:33:11 +02:00
Kostas Karmas
e5d3271698 Fix mypy complaining that Application has no createQmlComponent
Using CuraApplication instead fixes the problem

CURA-7609
2020-08-03 17:43:14 +02:00
Kostas Karmas
9ad046654a Add typing in WorkspaceDialog.py
In response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309170

CURA-7609
2020-08-03 17:31:21 +02:00
Kostas Karmas
6c59616e39 Process feedback comments
Comments https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309980 and https://github.com/Ultimaker/Cura/pull/8142#discussion_r464310281

CURA-7609
2020-08-03 17:30:21 +02:00
Kostas Karmas
60cfb6a8be Change name of updatable_machines to updatable_machine_names
Since it is a list of name strings and not a list of machines.

Response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464307564

CURA-7609
2020-08-03 17:28:44 +02:00
Kostas Karmas
949837f041 Fix crashing when opening project files without materials 2020-08-03 16:20:44 +02:00
Kostas Karmas
a6d779e722 Sort materials based on extruder position in the open project dialog
From eCCB
2020-08-03 16:20:29 +02:00
Kostas Karmas
ce72bb1a0b Fix creating new machine being reverted to overridde in some cases
CURA-7609
2020-08-03 15:47:01 +02:00
Kostas Karmas
9793c2cfde Fix crashing when opening project files without materials 2020-08-03 14:54:44 +02:00
Kostas Karmas
9f6b4f0255 Sort materials based on extruder position in the open project dialog
From eCCB
2020-08-03 14:34:45 +02:00
Kostas Karmas
37febc9f60 Remove comment
CURA-7609
2020-08-03 09:24:40 +02:00
Kostas Karmas
db857c8c20 Add extra spacing between categories in the open project dialog
CURA-7609
2020-08-03 09:21:16 +02:00
Kostas Karmas
ff4e4ccf55 Change text in the combobox
Since it was anyway truncated

CURA-7609
2020-08-03 09:07:20 +02:00
Kostas Karmas
52ea3e8fcc Change variable names (available -> updatable)
CURA-7609
2020-07-29 17:19:24 +02:00
Kostas Karmas
98cc87d1cf Allow picking any printer of the same type when opening project file
A ComboBox was added under the "Update existing" combobox which will display all the available
printers that are of the same type with the printer in the project file. With this feature, the
user will be able to select any same-type preexisting printer in Cura to be updated, instead of
always create a new one when the project file's printer is not in Cura.

CURA-7609
2020-07-29 13:02:34 +02:00
Kostas Karmas
daa66a89f3 Ignore machine network metadata when reading a project file
CURA-7608
2020-07-28 11:18:04 +02:00
Jaime van Kessel
38256f7a98
Add cast so that mypy doesn't choke 2020-07-08 11:05:46 +02:00
Jaime van Kessel
91690524c0
Ensure that the 3mf reader doesn't make groups of one 2020-07-08 10:39:33 +02:00
Kostas Karmas
4f97089e47 Fix losing global quality changes when reading a 3MF with a CFFF
By using "pass" when the IndexError occured while reading the quality changes, empty quality
changes containers were added to the registry. These empty quality changes were then used as
"global" quality_changes, since the container registry was simply picking the first quality
changes instance container that had an empty extruder stack. Therefore, the correct global
quality changes (that actually had the global settings that were changed, like the support)
was just ignored in the whole process.

CURA-7549
2020-07-07 10:43:02 +02:00
Kostas Karmas
572ded8c95 Fix crash while reading 3mf if extruder list is empty
CURA-7527
2020-06-25 14:52:07 +02:00
Ghostkeeper
85bfb02228
Show an error if trying to open a project file with unknown machine
Previously it would crash.

Fixes Sentry issue CURA-Y1.
2020-06-18 14:31:47 +02:00