Commit graph

233 commits

Author SHA1 Message Date
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