Commit graph

214 commits

Author SHA1 Message Date
Diego Prado Gesto
e1ecbdf8fe CURA-5330 Add typing in QualityGroup 2018-06-08 15:46:24 +02:00
Lipu Fei
bddd32a5b6 Fix branded materials model binding
CURA-5336

When the global stack gets changed, the model should update itself
so it refers to the correct extruder stack.
2018-06-07 15:50:08 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Diego Prado Gesto
a4b46be2c5 CURA-5427 Force the material models to update when the machine changes and so
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
2018-06-01 12:58:08 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Lipu Fei
9627eb0fc1 Only exclude explicitly specified materials in the "exclude_materials" field
CURA-5344
2018-05-29 10:46:42 +02:00
Diego Prado Gesto
b7fe43e68c Merge branch 'master' into WIP_improve_initialization 2018-05-23 11:36:12 +02:00
Diego Prado Gesto
8eea60bada CURA-5358 Fix typos 2018-05-17 14:28:10 +02:00
ChrisTerBeke
c13b77d8a1
Do not load material when no GUID is present instead of crashing Cura 2018-05-16 19:18:09 +02:00
Diego Prado Gesto
e38b31c0eb Merge branch 'master' into WIP_improve_initialization 2018-05-16 16:57:51 +02:00
Diego Prado Gesto
5345bc2867 CURA-5358 Fill the dictionaries also if it's a custom material. But
making difference between those materials that depend on a built-in
material and those that don't depend on others.
2018-05-15 16:08:19 +02:00
Diego Prado Gesto
43657010ba CURA-5164 The Preferences is not a singleton class anymore since in some point
several instances need to be created.

- In the ThreeMFWorkspaceReader we need to create some temporal
instances of Preferences that makes it not singleton anymore.

- The current preferences are kept in the Application class and so all
the calls to the preferences are changed to get the preferences from
Application.

- The method getInstance in Preferences is kept as deprecated since some
external plugins.
2018-05-11 08:50:42 +02:00
Diego Prado Gesto
0d56d72760 CURA-5234 Make use of the function to add wrong containers to the set. 2018-05-03 16:14:08 +02:00
Diego Prado Gesto
24684d5d9c CURA-5234 When adding a material node, first check if the variant exists, otherwise do not create the node. 2018-05-02 16:37:56 +02:00
Lipu Fei
d393316a27
Merge pull request #3638 from fieldOfView/fix_variant_hardware_type_crash
Fix a crash when a variant has no hardware_type
2018-04-26 09:35:33 +02:00
Ghostkeeper
1af56871e2
Don't crash if the number of extruders in setting doesn't match
...with the actual number of extruders. These could misalign with Custom FDM Printer or when any of the extruders was deleted because of a configuration format error.

Contributes to issue #3570.
2018-04-25 09:58:10 +02:00
Ghostkeeper
5648bc82e7
Merge branch '3.3' 2018-04-23 14:07:46 +02:00
Lipu Fei
f62ce1966b Fix material manager to use dict as a fallback
CURA-5266
2018-04-23 11:22:44 +02:00
Ghostkeeper
c49f912276
Merge branch '3.3' 2018-04-18 10:43:31 +02:00
Lipu Fei
1d4a70e839 Show all quality_changes on the quality management page
CURA-5218
2018-04-18 10:35:53 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Lipu Fei
7eba73adc5 Handle excluded_materials in getAvailableMaterials()
CURA-5223

Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
2018-04-12 16:12:07 +02:00
fieldOfView
fcb45b3b82 Fix a crash when a variant has no hardware_type 2018-04-09 12:08:32 +02:00
Jack Ha
c9dc429b2b CURA-5045 solve merge conflicts 2018-03-29 09:22:19 +02:00
Ghostkeeper
4f56221126
Remove catch of RuntimeError
The error is no longer thrown and the function has its own error message.

Contributes to issue CURA-5045.
2018-03-27 14:28:17 +02:00
Ghostkeeper
dd3b49e80d
Remove check for if variant container is a variant container
The filter on type=variant is right above it in the same function, 20 lines of code earlier. I think this check is superfluous then.

Contributes to issue CURA-5045.
2018-03-27 14:26:05 +02:00
Ghostkeeper
bc0a3e7fe2
Show error when finding duplicated variant names
Don't add the second variant we encounter then.

Contributes to issue CURA-5045.
2018-03-27 14:23:54 +02:00
Ghostkeeper
727a164722
Only show error when quality is global with material/nozzle
Don't crash. Only show an error message that indicates that there is a problem with this one.

Contributes to issue CURA-5045.
2018-03-27 14:19:36 +02:00
Ghostkeeper
7af941541b
Check before adding quality changes node
So you don't end up with half a node if we have to abort early. When this happens, show the configuration error message.

Contributes to issue CURA-5045.
2018-03-27 14:15:29 +02:00
Ghostkeeper
027f4b44bb
Don't crash when finding duplicated materials
Only report it to the user.

Contributes to issue CURA-5045.
2018-03-27 13:57:52 +02:00
Ghostkeeper
593c80225d
Show configuration error when failing to find container in ContainerNode
Instead of only logging it.

Contributes to issue CURA-5045.
2018-03-27 09:54:47 +02:00
Ghostkeeper
74a0da14bf
Don't crash if showing this before any machine is added
There must be no quality profiles then.

Contributes to issue CURA-5045.
2018-03-27 09:37:04 +02:00
Aleksei S
2240c38fd7 Exclude HIPS and PETG material for UM
CURA-5149
2018-03-26 17:11:38 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.

Contributes to issue CURA-5045.
2018-03-26 15:48:03 +02:00
Jack Ha
38e15f009f CURA-5149 add possibility to exclude specific items from materials list 2018-03-26 15:20:31 +02:00
Jack Ha
2a39d81a3c Revert "Filter generic list for Ultimaker printers."
This reverts commit 767789d394.
2018-03-26 15:07:37 +02:00
Jack Ha
18e3e084a5 Revert "Check for Ultimaker printers based on manufacturer"
This reverts commit 5b36b4fb84.
2018-03-26 15:07:35 +02:00
Jack Ha
07ac09e878 Revert "Use set for searching"
This reverts commit 80c2b3b7e8.
2018-03-26 15:07:27 +02:00
Lipu Fei
80c2b3b7e8 Use set for searching
CURA-5149
2018-03-26 14:40:25 +02:00
Lipu Fei
5b36b4fb84 Check for Ultimaker printers based on manufacturer
CURA-5149
2018-03-26 14:40:25 +02:00
Aleksei S
767789d394 Filter generic list for Ultimaker printers.
CURA-5149
2018-03-26 13:51:37 +02:00
Lipu Fei
f0dc138b37 Fix visibilty preset update
CURA-5088
2018-03-19 14:14:22 +01:00
Lipu Fei
d676b85289 Fix createMaterial() for non-2.85 diameter materials
CURA-5113
2018-03-19 11:09:07 +01:00
Lipu Fei
43ac565c20 Fix visibility preset initialization
CURA-5088
2018-03-16 15:45:17 +01:00
Lipu Fei
5ca4203940 Remove material types that have no fallbacks from fallback_materials_map
CURA-5098
2018-03-16 15:12:54 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
1f2602a2f4 Move SettingVisibilityPresetsModel to Machines.Models
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
496c8f2f79 Cleanup MachineManagementModel 2018-03-15 10:44:02 +01:00
Jack Ha
98b0559c9a Merge branch 'master' into speedup 2018-03-14 16:14:14 +01:00