GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 08:44:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,687 Commits 291 Branches 260 Tags
Commit Graph

88 Commits

Author SHA1 Message Date
Ghostkeeper
6e883c0431
Use default parameter of getMetaDataEntry 
We don't need to do that manually.
 2019-02-14 13:33:01 +01:00
Jaime van Kessel
d928e0979d Handle attempting to remove a favorite material that was already removed 2019-01-09 12:54:33 +01:00
Lipu Fei
d93e19d530 Add getAllMaterialGroups() 
CURA-6035
 2018-12-20 10:45:05 +01:00
Diego Prado Gesto
3ab8568a87
Merge pull request #4679 from fieldOfView/fix_create_new_material 
Use preferred material instead of generic PLA when creating a new material
 2018-11-08 17:16:36 +01:00
Lipu Fei
9c9e81b30c Move InstanceContainer import into type checking closure 
CURA-5898
 2018-11-06 11:04:18 +01:00
Jaime van Kessel
412e5977a6 Fix type issues 2018-11-05 11:30:02 +01:00
Jaime van Kessel
eded0f0297 Make quality manager also include profiles with same GUID in fallback. 
This ensures that if a (duplicated) material does not have a generic variant, that
the material it was copied from will be added to the fallback list.

CURA-5898
 2018-11-05 11:17:39 +01:00
fieldOfView
7899b249fc Use preferred material instead of generic PLA when creating a new material 2018-10-28 12:12:14 +01:00
Remco Burema
fb9d85557e Missed one of the getCompatibleMaterialDiameter typo's in the previous commit. 
part of [CURA-5834]
 2018-10-23 13:57:42 +02:00
Lipu Fei
97e6354c13 Fix material update upon extruder-compatible diameter change 
CURA-5834

Material models and the material container on an extruder need to be
updated when the extruder's compatible diameter gets changes.
 2018-10-19 13:48:52 +02:00
Jaime van Kessel
7310a677ce Clean up more code 
This fixes some typing and moves a property to protected, as it should be
 2018-09-27 16:07:18 +02:00
Ghostkeeper
c46e0e7556
Only print message about excluded materials if there are any 
Otherwise the message is very strange (with double spaces and such) and unnecessary.
 2018-09-24 11:59:02 +02:00
Ghostkeeper
b26c78202b
Consolidate log entries about excluded materials 
I got a log where 80% of the log was this particular message. Let's not do that.
 2018-09-21 13:11:12 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Aleksei S
f0e8746a22 Code style, duplicate material 
CURA-5673
 2018-09-13 13:23:10 +02:00
Aleksei S
5db008f763 New duplicated favorite material will be added to favorite category 
CURA-5673
 2018-09-13 12:56:51 +02:00
Diego Prado Gesto
6d2492e5cb Remove spurious signal, it does the same as materialsUpdated. 
Contributes to CURA-5682.
 2018-09-12 12:59:13 +02:00
Diego Prado Gesto
a909c8f029 Don't emit signal if the favorite list didn't change. 
Contributes to CURA-5682.
 2018-09-11 22:05:39 +02:00
Jaime van Kessel
e7d9f0ce45 Added typing for various setting classes 2018-09-10 15:24:11 +02:00
Ian Paschal
08b325ee04 Correctly load material favorites from preferences 
Contributes to CURA-5378, CURA-5162
 2018-08-22 12:31:48 +02:00
Ian Paschal
6d1fd8281c Add favorites funcitonality to MaterialManager.py 
Contributes to CURA-5378
 2018-08-20 17:17:14 +02:00
Diego Prado Gesto
825a3cd08f CURA-5570 Fix the configuration sync feature. 
It crashed Cura because it was using an outdated signature of the method
getMaterialNodeByType.
 2018-08-13 09:55:57 +02:00
Aleksei S
5eb9ae9177 removed unnecessary variable 2018-08-06 14:32:59 +02:00
Lipu Fei
a7448e4970 Refactor material lookup tree creation 2018-08-03 10:28:01 +02:00
Lipu Fei
066a00653a Add one more layer to the decision tree 2018-08-02 17:15:34 +02:00
Ian Paschal
881449d380 Do not sync only with read_only material groups 
Fixes CURA-5548.
 2018-07-09 14:12:54 +02:00
Diego Prado Gesto
9fa8498162 Fix code-style in MaterialManager 2018-07-03 13:25:39 +02:00
Diego Prado Gesto
8633d75751 Fix error introduced when fixing code-style 2018-07-03 13:14:40 +02:00
Diego Prado Gesto
762a1b1bfd Fix code-style 2018-07-03 12:06:06 +02:00
Jack Ha
3761123513 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-07-02 14:11:24 +02:00
Diego Prado Gesto
e6d3fd548d CURA-5330 Fix some typing in the MachineManager 2018-06-12 16:52:10 +02:00
Jack Ha
5f53195578 CURA-5334 factor out the need for material_diameter in machine definition for getMaterialNodeByType 2018-06-12 11:40:19 +02:00
Jack Ha
44e9d1e334 CURA-5334 factor out the need for material_diameter in machine definition for getDefaultMaterial 2018-06-12 11:25:02 +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