GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,013 Commits 290 Branches 260 Tags
Commit Graph

170 Commits

Author SHA1 Message Date
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking). 
CURA-2917
 2016-11-21 21:36:08 +01:00
Jaime van Kessel
aca8110edd Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-21 13:45:04 +01:00
Jaime van Kessel
c1650125e9 The compatible setting is now serialized correctly 
CURA-2940
 2016-11-18 15:43:32 +01:00
Jaime van Kessel
2e1f4e3740 Serialize now uses base_file as well instead of only GUID to find containers to use 
CURA-2467
 2016-11-18 12:39:19 +01:00
Jaime van Kessel
92a4fd7239 Materials are now also handled in conflict resolvement 
CURA-1263
 2016-11-17 11:16:15 +01:00
Jaime van Kessel
db0fb0c652 Compatible metadata entry is now correctly set for each variant & machine 
CURA-2821
 2016-10-28 11:37:09 +02:00
Arjen Hiemstra
e0b926878f Remove code that sets incompatible materials to invalid type 
Instead use the "compatible" metadata entry like we do for nozzles.

Setting the type differently caused all code that looks for materials to
fail because "incompatible_material" is not "material". Since this is
the base file, this meant a lot of materials failed to duplicate
properly which caused crashes.

Contributes to CURA-2821
 2016-10-27 15:45:29 +02:00
fieldOfView
472ba7ed26 Fix exporting materials for machines other than those in the product_id_map 
CURA-2583
 2016-10-10 14:34:53 +02:00
Jaime van Kessel
b707c8d806 XML profile now returns serialization data even if it's read only 
This way exporting read only profiles is possible again.

CURA-2359
 2016-09-13 14:57:00 +02:00
Jack Ha
fb3f03b446 Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159 2016-09-12 13:55:05 +02:00
Jack Ha
df536e158b Fixed XmlMaterialProfile serialize for booleans. Contributes to CURA-2159 2016-09-12 13:30:14 +02:00
Jaime van Kessel
f81a5fe301 Removed very annoying message spam 
CURA-2159
 2016-09-09 13:09:15 +02:00
Jaime van Kessel
d68f6a4e9a Instead of discarding a profile if it's not compatible, we mark it as such. 
The old approach was far to naive. We actually have 3 states;
- Supported (we have a profile)
- Not supported (Don't have a profile)
- Don't do this, lest you awaken the Old Gods (Error)

In case 1 and 3 we now do have a profile.

CURA-2271
 2016-09-09 11:57:34 +02:00
fieldOfView
0828d4f1ca Fix dirty flag of incompatible_materials 2016-09-08 21:11:08 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
c65e79a5db Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-01 16:52:13 +02:00
Jaime van Kessel
697329f5d2 Fixed review issues 
CURA-2108
 2016-09-01 16:43:40 +02:00
fieldOfView
a2d74cc984 Fix documentation 2016-09-01 16:23:06 +02:00
Jaime van Kessel
bef410b4a3 Machines are now flattened before merging them 
This ensures that machines are overwritten correctly

CURA-2108
 2016-09-01 11:26:13 +02:00
Jaime van Kessel
bacac1e42e XML material profile merging is now far less naive. 
It's still a work in progress, as it doesn't succeed in all cases just yet.

CURA-2108
 2016-09-01 11:25:52 +02:00
Jaime van Kessel
cb1a36577c Machines are now flattened before merging them 
This ensures that machines are overwritten correctly

CURA-2108
 2016-09-01 11:18:15 +02:00
Jaime van Kessel
ad22cf4861 XML material profile merging is now far less naive. 
It's still a work in progress, as it doesn't succeed in all cases just yet.

CURA-2108
 2016-08-31 17:18:33 +02:00
Jaime van Kessel
1fda24c43f Removed dead code 
CURA-2108
 2016-08-31 15:09:04 +02:00
Jaime van Kessel
389cea2fcc Merge branch 'duplicate-material' of github.com:Ultimaker/Cura 2016-08-31 14:57:11 +02:00
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