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

281 Commits

Author SHA1 Message Date
Philip Lorenz
352fef3efa Adapt to Python 3.9 API changes 
Python 3.9 now made the TreeBuilder.start() `attrs` parameter ([1])
mandatory on all implementations. Adapt the plugin accordingly.

[1] https://bugs.python.org/issue39495
 2021-01-10 20:21:40 +01:00
Ghostkeeper
1d5a4f5080
Remove shrinkage percentage setting alias 
This alias shouldn't be written any more since the firmware misinterprets the setting value and errors when it's more than 100%.

Contributes to issue CURA-7724.
 2020-09-18 12:48:02 +02:00
Ghostkeeper
0f3a977a58
Consistent typing with function this is overriding 
The function in the parent class has changed its type in commit 7968fe6d56205b20be9ba47e5a19be9f5914b084. This one should also change type.
 2020-06-15 13:58:12 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
5af9faf5e5 Convert doxygen to rst for X3DReader, XmlMaterialProfile, XRayView 2020-05-28 16:08:51 +02:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports 2020-04-10 13:58:10 +02:00
Jaime van Kessel
0eea73d2a9
Fix typing 
CURA-6255
 2019-12-30 12:57:04 +01:00
Nino van Hooff
9aa5c3cd24 Hardcode plugin id for UsbPrinter and XmlMaterialProfile 
Previous solution was more defensive but also introduced dependencies
and extra files for minor benefit

CURA-6255
 2019-12-30 12:04:41 +01:00
Nino van Hooff
128bfa987e Use plugin Id instead of __file__ for XmlMaterialProfile 
CURA-6255
 2019-12-24 15:42:01 +01:00
Ghostkeeper
8a9b791298
Merge branch '4.4' 
Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
 2019-12-23 16:26:25 +01:00
Remco Burema
f05f4ff244
Fix typo. 
part of CURA-7041
 2019-12-19 11:38:53 +01:00
Nino van Hooff
ff01b1dab9 Add 6 Material Station specific material settings. 
These settings are currently unused by cura, but passed into the PPA
output. Some considerations:
- material_ prepended to all. Even though they are not all
  material specific. The consistency is more developer-friendly imho
- defaults taken from generic_pla
- type is float for all, consistent with what I found in this file

CURA-7041
 2019-12-18 11:46:40 +01:00
Remco Burema
8cc054cecc Add missing 'material break preparation temperature'. 
part of CURA-6971

(cherry picked from commit 25f0460231fd970b73744fb3fe1c004dc68a5dc9)
 2019-12-12 14:09:46 +01:00
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