Diego Prado Gesto
e6d3fd548d
CURA-5330 Fix some typing in the MachineManager
2018-06-12 16:52:10 +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
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
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
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
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
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
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
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
Lipu Fei
d676b85289
Fix createMaterial() for non-2.85 diameter materials
...
CURA-5113
2018-03-19 11:09:07 +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
3cefacdfcc
Remove root_material_nod is None check in MaterialManager
...
CURA-5056
This will no longer happen.
2018-03-14 09:28:35 +01:00
Diego Prado Gesto
2bf6d071d1
Merge branch 'master' into feature_sync_button
2018-03-13 13:54:22 +01:00
Ghostkeeper
1512a8096b
Require MaterialGroup to always have a base material
...
The material group is loaded lazily whenever the base material is not yet in the dictionary.
Contributes to issue CURA-4606.
2018-03-12 15:43:42 +01:00
Diego Prado Gesto
85d6919ce6
Merge branch 'master' into feature_sync_button
2018-03-09 16:59:18 +01:00
Lipu Fei
de72dd3455
Fix material update upon gcode flavour change
...
CURA-5060
2018-03-09 14:26:53 +01:00
Diego Prado Gesto
b212781a19
Merge branch 'master' into feature_sync_button
2018-03-08 16:57:21 +01:00
Lipu Fei
77e3be68b3
Add removeMaterialByRootId() in MaterialManager
...
CURA-5056
2018-03-07 16:38:24 +01:00
Lipu Fei
29792bbdd8
Reschedule update upon incomplete data in MaterialManager
...
CURA-5056
2018-03-07 16:38:24 +01:00
Diego Prado Gesto
7b772ffad7
Merge branch 'master' into feature_sync_button
2018-03-07 11:49:25 +01:00
Lipu Fei
27cce56467
Add error message for possible bugs in MaterialManager
...
CURA-5056
2018-03-07 11:45:49 +01:00
Diego Prado Gesto
f625fa8a90
CURA-4870 Add function to set the configuration from the printer back to
...
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
2018-03-06 16:08:50 +01:00
Lipu Fei
6db26eaca5
Add getDefaultMaterial() in MaterialManager
2018-03-03 15:29:49 +01:00
Lipu Fei
c93643bc2f
Move createMaterial() to MaterialManager
2018-03-02 17:30:19 +01:00
Lipu Fei
cf2252f4f9
Simplify for loop in duplicateMaterial()
2018-03-02 17:22:19 +01:00
Lipu Fei
5f0bb3a283
Move removeMaterial() to MaterialManager
2018-03-02 17:20:26 +01:00
Lipu Fei
7642afb9fe
Move duplicateMaterial() to MaterialManager
2018-03-02 17:16:35 +01:00
Lipu Fei
c6128ef5ba
Move setMaterialName() into MaterialManager
2018-03-02 16:22:22 +01:00
Lipu Fei
d372fc75e7
Fix type hinting for getFallbackMaterialIdByMaterialType()
2018-03-02 16:16:51 +01:00
Lipu Fei
b4c3536999
Move getAvailableMaterials() into MaterialManager
2018-03-01 15:02:57 +01:00
Lipu Fei
50c61c9934
Document and rename getFallbackMaterialIdByMaterialType()
2018-03-01 11:31:18 +01:00
Lipu Fei
ea2b076dbd
Rename to extruder_variant_name in MaterialManager
2018-03-01 11:19:46 +01:00
Lipu Fei
b8ac5b296b
Add doc for map/tree update/recreation
2018-03-01 11:10:05 +01:00
Lipu Fei
d4cb10b061
Add doc for model update
2018-03-01 11:03:42 +01:00
Lipu Fei
2dd7be1271
Add documentation for timers in Material and Quality managers
2018-03-01 10:59:39 +01:00
Lipu Fei
a0acf8631d
Add copyright headers
2018-02-28 11:18:01 +01:00
Lipu Fei
c143cd97c8
More accurate doc for material maps
2018-02-28 11:15:43 +01:00
Lipu Fei
c5d443109b
Split MaterialGroup and MaterialNode
2018-02-28 11:12:44 +01:00
Lipu Fei
a74f84fce7
Add comment why sorting the material group map
2018-02-26 19:35:56 +01:00
Jack Ha
c7499d6e17
CURA-4606 CURA-5003 fix saving material metadata when switching material; fix crashing on fallback material on materials without fallback
2018-02-22 15:52:02 +01:00
Jack Ha
3591e01b25
CURA-4606 CURA-5002 fix crash with machine with variants, but no variants defined
2018-02-22 09:20:33 +01:00
Jack Ha
1891294079
CURA-4606 fix material manager to exclude custom materials from some lookup tables
2018-02-19 11:04:45 +01:00
Lipu Fei
e0f82fb5c6
WIP: Fix MaterialsManager getAvailableMaterials()
2018-02-16 17:02:32 +01:00
Lipu Fei
96f1264364
WIP: Rework profile management page
2018-02-16 16:40:09 +01:00
Lipu Fei
a5afaab467
WIP: Fix material duplication and metadata update
2018-02-16 14:23:11 +01:00
Lipu Fei
188c0343cf
WIP: Improve map creation in MaterialManager
2018-02-16 14:23:11 +01:00
