GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-19 12:33:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,960 Commits 295 Branches 268 Tags
Commit Graph

901 Commits

Author SHA1 Message Date
Ian Paschal
56a5f59964 Cleaner code 
I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though.

Contributes to CURA-5162, CURA-5378
 2018-08-23 16:39:40 +02:00
Ian Paschal
8da7773600 Remove unused code 
Contributes to CURA-5162, CURA-5378
 2018-08-23 16:04:51 +02:00
Ian Paschal
6225fff1f8 Re-added material detail view 
Contributes to CURA-5378
 2018-08-22 15:58:58 +02:00
Ian Paschal
cb713eea6a Improve models 
Contributes to CURA-5162, CURA-5378
 2018-08-22 12:33:29 +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
Ian Paschal
68bccd8bf7 Improve the Favorites, Base, and Brand materials models (WIP) 
Contribuetes to CURA-5378
 2018-08-20 17:16:54 +02:00
Ian Paschal
e8cda90021 Add favorites to materials menu 
Contributes to CURA-5162
 2018-08-16 13:04:58 +02:00
Ian Paschal
8493948ba1 Add a favorite materials model 
Contributes to CURA-5162
 2018-08-15 14:06:07 +02:00
Diego Prado Gesto
98a0bb5002 CURA-5570 Remove a check that caused empty list of profiles. 2018-08-13 11:15:32 +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
033a00ec20 fixed addNodesToCheck function, wrong max index value 
CURA-5570
 2018-08-09 16:06:09 +02:00
Aleksei S
5eb9ae9177 removed unnecessary variable 2018-08-06 14:32:59 +02:00
Lipu Fei
206a32ae50 Refactor quality lookup 2018-08-03 10:41:36 +02:00
Lipu Fei
e2a97e3a01 Refactor quality lookup table creation 2018-08-03 10:28:21 +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
Lipu Fei
a303f394c8 Move VariantType to VariantType.py 
Less circular dependencies for imports.
 2018-08-02 16:11:55 +02:00
Jack Ha
2bd8350141 Added error checking, added typing, renamed function. CURA-5389 2018-07-12 14:06:34 +02:00
Lipu Fei
af02dc2758 Only use setMetaDataEntry() 2018-07-11 11:14:57 +02:00
Lipu Fei
76417b7fb2 Hide materials belong to a to-be-removed package 2018-07-11 10:57:57 +02:00
Lipu Fei
328fd9081e Merge remote-tracking branch 'origin/master' into remove-package-check 2018-07-10 14:57:46 +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
Jack Ha
111a3556d2 Fixed possible errors and typing error. CURA-5389 2018-07-09 11:42:30 +02:00
Jack Ha
675c5064ed Added checkPackageUsageAndUninstall and the package usage check. No confirmation dialog yet 2018-07-05 11:47:06 +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
f700a39547 CURA-5330 Fix type checking in ContainerNodes 2018-06-13 16:10:11 +02:00
Diego Prado Gesto
6e364f0895 CURA-5330 Fix typing and code-style in the ContainerNode and all the 
related children, and QualityGroup and its children.
Also fix the related calls in the managers.
 2018-06-13 10:55:57 +02:00
Diego Prado Gesto
e6d3fd548d CURA-5330 Fix some typing in the MachineManager 2018-06-12 16:52:10 +02:00
Diego Prado Gesto
5cd464c5de CURA-5330 Fix some typing issues in QualityProfilesDropDownMenuModel and 
SettingInheritanceManager.
 2018-06-12 16:35:46 +02:00
Diego Prado Gesto
2e174e75fa CURA-5330 Add typing checks to the MachineManager 2018-06-12 16:28:39 +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
Diego Prado Gesto
2dfedf3ae4 CURA-5330 Add typing in CuraContainerRegistry and 
QualityProfilesDropDownMenuModel
 2018-06-08 17:02:59 +02:00
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