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

245 Commits

Author SHA1 Message Date
Ghostkeeper
a472fd8163
Remove debug print 
Oops again.

Contributes to issue CURA-3427.
 2017-05-12 14:33:44 +02:00
Ghostkeeper
1e4c394b71
Remove getting superfluous material density 
The density is already put in the 'properties' metadata entry. Don't need to put it in there doubly. Turns out that this density line was originally just superfluous.

Contributes to issue CURA-3427 or something.
 2017-05-12 14:12:36 +02:00
Ghostkeeper
c8295434f3
Load setting_version from XML material profile 
The setting_version is translated from the version number. The setting_version number currently happens to be the same as the version number of XML but that won't always be the case so we introduce a translation-step as well.

Contributes to issue CURA-3427.
 2017-05-12 14:04:56 +02:00
Ghostkeeper
38f081539a
Fix deserialising density 
That density variable was never used. Hope this fixes some unaccounted-for bug.

Doesn't contribute to CURA-3427 but I'm listing it as if it does anyway.
 2017-05-12 14:01:06 +02:00
Jaime van Kessel
c20542b7b8 Merge branch 'feature_CURA-3540_upgrade_for_project' of github.com:Ultimaker/Cura 2017-04-18 15:33:53 +02:00
Ghostkeeper
f1ac1bd876
Add JellyBox to XML material printer name translations 
Because the automatic translation removes the underscore, and then the definition can't be found any more.

Contributes to issue CURA-3695.
 2017-04-18 15:11:24 +02:00
Lipu Fei
b3f60c461b Fix type hinting and function name for upgrade profile 
CURA-3540
 2017-04-14 15:40:18 +02:00
Lipu Fei
4f2c76e462 Update a profile when deserializing it 
CURA-3540
 2017-04-14 10:50:42 +02:00
fieldOfView
e92aaca7b6 Filter materials by the (approximate) material diameter of the printer 
If a machine defines material diameter of 2.85mm, there is no use to show the 1.75mm materials and vice-versa
 2017-04-12 23:03:58 +02:00
Lipu Fei
18cf9e3172 CURA-3500 Make sure that material XMLs have utf-8 encoding 2017-03-15 11:47:33 +01:00
Ghostkeeper
b488441d81
Fix link to ContainerRegistry 
This one was forgotten because it is in a comment.

Contributes to issue CURA-2917.
 2017-02-14 17:00:33 +01:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Jaime van Kessel
c18fb02f82 Removed unneeded (and somewhat expensive) checks 
CURA-3311
 2017-02-13 11:06:21 +01:00
Jaime van Kessel
6e7c4711e3 When creating XML profiles, directly set the name 
The setName function is intended if the user changes the name (as by means of the edit material menu).
For deserializing this simply gives too much overhead
 2017-02-10 14:58:22 +01:00
Jaime van Kessel
f4d4fb9001 Material values are now also lazy loaded 
CURA-3311
 2017-02-10 14:50:16 +01:00
Jaime van Kessel
bda818b104 MetaData of material profile is now set in one batch instead of multiple calls 
CURA-3311
 2017-02-10 14:15:35 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
38a7ffa7da Some fixes regarding submodules and imports. 2017-01-16 21:35:28 +01:00
Ghostkeeper
f4fa3ac53f
Add translation for UM3 and UM3E from XML profiles 
Otherwise it would remove all spaces and put everything lowercase, but that didn't work for UM3E.

Contributes to issue CURA-2575.
 2016-12-14 13:50:16 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. 
CURA-2917
 2016-12-12 16:05:35 +01:00
Jack Ha
94ccd4b04b Solve material properties not being saved. CURA-2586 2016-12-08 17:24:25 +01:00
Jaime van Kessel
58e7e6ef5a Added default_printing_temperature property 
CURA-2586
 2016-12-06 11:38:56 +01:00
Jack Ha
b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 2016-11-24 13:55:22 +01:00
Jack Ha
a8d5537487 Fix XmlMaterialProfile setProperty in correct container. Contributes to CURA-2861 2016-11-24 11:19:46 +01:00
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