GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 06:09:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,100 Commits 288 Branches 260 Tags
Commit Graph

268 Commits

Author SHA1 Message Date
Remco Burema
25f0460231
Add missing 'material break preparation temperature'. 
part of CURA-6971
 2019-11-22 12:01:46 +01:00
Remco Burema
c3d1ab0931
Small refactor: Rename in UM. 
part of CURA-6856
 2019-11-12 08:40:50 +01:00
Remco Burema
aca7f4551e
Make verified material containers read-only, even for variants. 
part CURA-6856
 2019-10-31 19:01:23 +01:00
Remco Burema
5908ff60ee
Move verification check from plugin to the import of containers. 
part of CURA-6856
 2019-10-31 18:50:24 +01:00
Remco Burema
298eb27c7f
Add possibility to check material-profiles. 
Needed to add the filename to deserialize, feels a bit unsafe as an optional parameter, will discuss tomorrow.
part of CURA-6856
 2019-10-29 17:45:19 +01:00
Lipu Fei
fc0b8185b7 Fix setMetaDataEntry() dependency on ContainerRegistery 
CURA-6920
 2019-10-22 11:38:32 +02:00
Jaime van Kessel
ed6539812e
Ensure that all material profiles get metadata updates 
CURA-6868
 2019-10-09 17:12:06 +02:00
Ghostkeeper
cc27392ab0
Don't use material groups to update metadata 
The material groups are not filled any more in the material manager so this fails.
This might make updating metadata of material profiles slightly slower, but when testing this I noticed no difference.

The function becomes a lot simpler though. And it works again.

Contributes to issue CURA-6600.
 2019-09-13 14:42:27 +02:00
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Jaime van Kessel
7d3a2c60d4
Added some missing typing 2019-09-06 17:38:22 +02:00
Jaime van Kessel
09025edffa
Convert some class functions to static 
Since they didn't access any class attributes, there is no need for them to be classMethods
 2019-09-06 17:22:40 +02:00
Jaime van Kessel
94b6f7864f
Add some tests for XMLMaterialProfile 2019-09-06 17:19:23 +02:00
Jaime van Kessel
608ca3e92a
Convert some functions to static 2019-09-06 15:18:50 +02:00
Ghostkeeper
cb344f9dec
Fix serialising materials without nozzle profile again 
Oops. This is simpler anyway.

Contributes to issue CURA-6600.
 2019-08-27 17:21:21 +02:00
Ghostkeeper
924d4cc13b
Remove unused container_tree variable 
Contributes to issue CURA-6600.
 2019-08-27 17:21:20 +02:00
Ghostkeeper
20be7fd8a1
Don't add to variant-specific mapping if it's not variant-specific 
Otherwise we'll encounter that the variant name is None when serialising that subprofile.

Contributes to issue CURA-6600.
 2019-08-27 16:06:09 +02:00
Ghostkeeper
dabd905853
Fix serialising materials with submaterials in not loaded container trees 
Material profiles need to serialise subprofiles that belong to different printers as well. Some of these materials may not be loaded in the ContainerTree structure. To prevent having to load that as well, we're just not going to use the container tree any more. It turns out that the only reason it was using the container tree was to get the hardware_type metadata from the node in the tree. So just get that from the container itself and we're fine.

Contributes to issue CURA-6600.
 2019-08-27 15:47:42 +02:00
Ghostkeeper
b60b13e5bf
Use container tree to check for variants when serialising 
Not the variant manager, because it's deprecated.

Contributes to issue CURA-6600.
 2019-08-27 15:47:41 +02:00
Jaime van Kessel
2417705dfd Prevent crashes when duplicating a material 
CURA-6600
 2019-08-19 11:42:52 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container 
part of CURA-6600
 2019-08-15 13:40:08 +02:00
Ghostkeeper
6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree 
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
 2019-08-13 14:59:05 +02:00
Ghostkeeper
5bbb44bfdf
Remove buildplate loading of materials and don't check if variant is there 
So now we no longer make material subprofiles per buildplate.
And now we create subprofiles for variants regardless if the variant exists or not.

Contributes to issue CURA-6600.
 2019-08-12 16:49:57 +02:00
Ghostkeeper
1bd287f888
Move getting variant manager out of the loop 
This mostly just makes it easier for me to debug where the manager is obtained from the deprecated singleton signal.

Contributes to issue CURA-6600.
 2019-08-12 16:49:57 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues 
They were caused by upgrading to a higher mypy version, which found more mistakes
 2019-07-23 12:58:46 +02:00
Ghostkeeper
02ff433c92
Use set for unordered collections of things 
Contributes to issue CURA-6672.
 2019-07-22 17:07:07 +02:00
Jaime van Kessel
00f21069e7 Ensure that metadata entries in cura namespace are stored correctly 
CURA-6672
 2019-07-22 16:41:08 +02:00
Diego Prado Gesto
9590262f18 Change the name of the original depriming settings 
Change to align with the name in the XML material files.

Contributes to CURA-6662.
 2019-07-16 09:55:50 +02:00
Ghostkeeper
faf256b2f0
Rename deprime settings with the new name 
These have been renamed for greater clarity. We also have to rename them on this side now.

Contributes to issue CURA-6329.
 2019-06-26 16:41:51 +02:00
Ghostkeeper
23abcd6fd6
Merge branch 'master' into CURA-6329_add_crystallinity_setting 2019-06-19 10:49:20 +02:00
Lipu Fei
51dc7b1b8e Fix value update in material profile 
CURA-6590
 2019-06-18 11:23:28 +02:00
Ghostkeeper
36a206b418
Also remove translation for break preparation temperature 
This setting is no longer used. If I don't remove it, it'll complain when syncing materials with the printer because it tries to serialise the material profiles then.

Contributes to issue CURA-6329.
 2019-06-04 17:23:20 +02:00
Ghostkeeper
a0c3738a49
Add translations for deprime settings 
These need to be read for the deprime experiments in the PPA.

Contributes to issue CURA-6329.
 2019-06-04 17:07:59 +02:00
Lipu Fei
3e91f89ffe Add build volume temperature 
CURA-6156
 2019-04-26 07:43:03 +02:00
Ghostkeeper
cf9ab5a5cd
Don't serialize 'compatible' metadata key 
It is already serialised in the 'hardware compatible' settings.
 2019-04-25 10:55:17 +02:00
Ghostkeeper
943503cac7
Fix iterating over 'hardware compatible' keys 
This is both faster and actually functions properly.

Contributes to issue CURA-6272.
 2019-03-05 15:25:39 +01:00
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Remco Burema
f81ad58836 Merge branch 'ppa_contribute_compatible_format' into 4.0 2019-02-20 11:29:24 +01:00
Jaime van Kessel
9a1d8ea5f9 Don't serialize "definition" for material profile 
CURA-5787
 2019-02-20 10:46:49 +01:00
Ghostkeeper
fe9d106332
Remove debug prints 2019-02-19 11:48:10 +01:00
Ghostkeeper
cc94441b54
Fix serialising materials with Ultimaker S5 in it 
Contributes to issue CURA-5787.
 2019-02-14 17:45:25 +01:00
Ghostkeeper
d6f116b156
Don't crash on editing metadata entries of non-registered materials 
Sometimes we need to create a temporary material profile just to save it to file.

Contributes to issue CURA-5787.
 2019-02-14 14:03:38 +01:00
Ghostkeeper
e2a7a68883
Give a warning when you can't update metadata because it's read-only 
This bit me in the bum today.
 2019-02-14 13:26:20 +01:00
Jaime van Kessel
5c94a8223d Added button that is shown when instruction_link is set in the profile 
CURA-5916
 2019-02-07 16:08:50 +01:00
Lipu Fei
1fb6441327 Fix default hardware type NOZZLE in XML material 
CURA-5716
 2018-09-11 11:20:00 +02:00
Jaime van Kessel
d9e23bf02b Fix issue caused by making metadata of containerNode private 2018-09-11 10:42:42 +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
Ian Paschal
8f7370db6c Merge remote-tracking branch 'origin/master' into feature_send_material_profiles 2018-07-02 12:37:56 +02:00
Ghostkeeper
a401c1d64f
Disambiguate between list of metadatas and metadata 
Because MyPy doesn't allow a variable to change its type later.

Contributes to issue CURA-5330.
 2018-06-15 17:03:04 +02:00
Diego Prado Gesto
dc4556647a CURA-5330 Fix code style in XmlMaterialProfile plugin 2018-06-14 16:49:26 +02:00