GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,607 Commits 289 Branches 260 Tags
Commit Graph

245 Commits

Author SHA1 Message Date
Jaime van Kessel
1940d45971 Added way to acces inherited files 
CURA-2108
 2016-08-30 16:04:05 +02:00
Jaime van Kessel
7a54f21633 Added inherited_files property 2016-08-30 14:51:27 +02:00
Jaime van Kessel
6a2e5ffe77 Added inheritance support to XML material profile deserialization 
CURA-2108
 2016-08-30 14:48:34 +02:00
Jack Ha
5da6d70163 Fixed duplicate material. CURA-1969 2016-08-29 15:28:09 +02:00
Jack Ha
e0e1147708 Somewhat working materialspage duplicate. Contributes to CURA-1969 2016-08-29 14:40:37 +02:00
Jack Ha
2daf0b1683 Cleanup after mistakenly committing crap. 2016-08-29 09:42:35 +02:00
Jack Ha
6a2c97e4ac Merge 2016-08-29 09:31:28 +02:00
fieldOfView
30a679ddf9 Reduce loadingtime of XmlMaterialProfiles by 25% 
XmlMaterialProfile did a lot of findInstanceContainers() by GUID and base_file. If base_file is always set, matching GUID is superfluous.

This shaved off 20% loading time of the application (43 vs 34 seconds) on a cached load.
 2016-08-26 17:18:35 +02:00
fieldOfView
0e2d35a88d Use parseBool instead of inline variation 
CURA-2138
 2016-08-26 17:02:21 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
Jaime van Kessel
8df5bba6e9 Removing auto rename if certain properties are changed 2016-08-24 17:11:29 +02:00
Jaime van Kessel
3b9a642d02 Disabled renaming if type of material is changed by user 
CURA-1968
 2016-08-24 16:30:13 +02:00
Jaime van Kessel
3a921264fc Explicitly check label xml element if it's none 
For some stupid reason, an XML element evaluates to false.
CURA-1968
 2016-08-24 16:10:21 +02:00
Jaime van Kessel
a904067d7a Added label property to XML profile (as per 1.2 spec) 
CURA-1968
 2016-08-24 15:50:12 +02:00
fieldOfView
d3a0c0fa77 Add documentation 
CURA-2138
 2016-08-24 09:09:09 +02:00
fieldOfView
6b6d763657 Make globally incompatible materials not show up in menus 
CURA-2138
 2016-08-23 22:58:37 +02:00
fieldOfView
eb176847be Implement "hardware compatible" for XmlMaterialProfile 
CURA-2138
 2016-08-23 22:09:56 +02:00
fieldOfView
3671d241d5 Show color + material in menus and Materials page 
CURA-2108
 2016-08-22 17:34:33 +02:00
Jaime van Kessel
286949dad1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-19 09:36:56 +02:00
fieldOfView
86ead22143 Make machine identifiers consistent 
CURA-2136
 2016-08-18 17:18:03 +02:00
Jaime van Kessel
7744ee5f13 Duplicating a material forces unique ID 
CURA-1969
 2016-08-18 12:44:16 +02:00
Jaime van Kessel
7075e438d9 Changing metadata now only targets profiles that share basefile 
CURA-1874
 2016-08-18 11:40:01 +02:00
Jaime van Kessel
37e4b9e940 Duplicating a container no longer forces unique GUID 
CURA-1969
 2016-08-18 10:55:51 +02:00
Arjen Hiemstra
57f63bfc73 Update material container's name when its "material" metadata key changes 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
f49528b71f Do not try to set base_file metadata if it was never set before 
Contributes to CURA-341
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
571523e0ef Ensure an XML material always has a description and adhesion_info metadata entry 
Contributes to CURA-342
 2016-07-07 17:30:39 +02:00
Arjen Hiemstra
fdab77ff6a Also duplicate the base file when duplicating a material profile 
This way serialization will always be correctly performed and we can
generate
a machine/variant specifc ID for the duplicate.

Contributes to CURA-341
 2016-07-07 01:42:05 +02:00
Arjen Hiemstra
f21079b763 Store the base material file as a metadata property of XmlMaterialProfile 
And use the base_file property to check if we should serialize or not.

Contributes to CURA-342
 2016-07-07 01:41:00 +02:00
Arjen Hiemstra
750ecfc2e1 Remove some now-useless code relating to spool weight 
Contributes to CURA-341
 2016-07-05 16:51:28 +02:00
Arjen Hiemstra
2bc3a10776 Properly handle machines that have no variants 
Contributes to CURA-341
 2016-07-05 16:51:02 +02:00
Arjen Hiemstra
827c7b84fd Do not try to set a property of a read-only material 
Contributes to CURA-341
 2016-07-05 16:47:26 +02:00
Arjen Hiemstra
e80a999740 Fix up readOnly property of XmlMaterialProfile 
Contributes to CURA-341
 2016-07-05 16:46:52 +02:00
Arjen Hiemstra
c9b1c36cc3 Add some documentation to XmlMaterialProfile 
Contributes to CURA-342
 2016-07-04 11:00:54 +02:00
Arjen Hiemstra
ded4c89cb5 Ensure metadata changes are propagated to the related containers 
Now we properly serialize the new metadata

Contributes to CURA-342
 2016-06-30 17:32:10 +02:00
Arjen Hiemstra
8badb061da Check for definition_id, not variant name 
Since the dict is supposed to be per definition

Contributes to CURA-342
 2016-06-30 15:08:00 +02:00
Arjen Hiemstra
26f7ba0a74 Fix up XmlMaterialProfile::serialize so we can properly serialize duplicated materials 
We now use GUID to look up all containers belonging to a material. In
addition, we handle the multiple containers better

Contributes to CURA-342
 2016-06-30 01:57:58 +02:00
Arjen Hiemstra
ee0160075e Override InstanceContainer::duplicate in XmlMAterialProfile 
So that we can set a new GUID for the material on duplicate

Contributes to CURA-342
 2016-06-30 01:55:53 +02:00
Arjen Hiemstra
a3ea042d4b Implement serialization of XmlMaterialProfile 
Contributes to CURA-342
 2016-06-22 17:40:17 +02:00
Arjen Hiemstra
eaea940aa2 Add support for some additional properties to XmlMaterialProfile 
Contributes to CURA-339
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
90ac1c1380 Add support for hotend-specfic overrides to XmlMaterialProfile 
Contributes to CURA-339
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
f491405eb1 Use a copy of the metadata for Xml materials 
Contributes to CURA-339
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
e0fab7aa11 Add some logging and documentation to XmlMaterialProfile 
Contributes to CURA-339
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
d5fa6d884f Fix XML material profiles so the global properties are properly set 
Contributes to CURA-339
 2016-05-26 13:32:14 +02:00
Arjen Hiemstra
e29cc5e699 Create machine-specific material containers for machine specific overrides in XML material files 2016-05-25 11:31:19 +02:00
Arjen Hiemstra
e0c7ed8561 Add a plugin that loads XML materials and an example material 2016-05-23 02:19:39 +02:00