GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 21:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,324 Commits 287 Branches 260 Tags
Commit Graph

306 Commits

Author SHA1 Message Date
Paul Kuiper
99b6fd7616 Adjusted code to filter out the abstract colors per machine. 
CURA-11634
 2024-09-26 14:51:22 +02:00
Paul Kuiper
2c63e33b01 Prevent abstract color profiles to be filtered out for machines that support them. 
CURA-11634
 2024-09-26 13:35:55 +02:00
Erwan MATHIEU
ac8176d91e
Merge branch 'main' into CURA-11761_container_stack_cache 2024-09-05 11:35:17 +02:00
Remco Burema
d0252554c4 Make extra sure cache is emptied when objects get altered. 
See the (new) cachePerInstance decorator in UM/Decorators, and the accompanying CachedMemberFunction handler-class.

part of CURA-11761
 2024-09-03 18:23:41 +02:00
Frederic Meeuwissen
a18da5c9bd Only convert to yes/no if value is a boolean 2024-08-26 13:12:03 +02:00
Remco Burema
ddf4f4c6fe Also move printer name mapping to new FormatMaps utility. 
done as part of CURA-12005
 2024-08-01 14:33:24 +02:00
Remco Burema
b1dcfcb79d XmlMaterial: Don't 'translate' to yes when it's a cura-setting. 
CURA-11940
 2024-07-18 09:00:27 +02:00
c.lamboo
c8f9f179d9 Revert "Revert "Enable prime tower mode according to materials types"" 
This reverts commit b99762776ee6ce3fe0e8bba8724eba9ca68ec4c7.
 2024-02-22 12:50:53 +01:00
c.lamboo
b99762776e Revert "Enable prime tower mode according to materials types" 
This reverts commit 335a54c6d1c432e64784f95c69e77125bd0d57f1.
 2024-02-22 10:47:04 +01:00
Erwan MATHIEU
e642d85fcd Merge remote-tracking branch 'origin/main' into optimized-prime-tower 2024-02-16 09:10:49 +01:00
Erwan MATHIEU
335a54c6d1 Enable prime tower mode according to materials types 2024-02-16 07:57:43 +01:00
Dmitry Gribenchuk
aff37dae3f
fix comment space 2023-12-14 11:00:06 +02:00
Dmitry Gribenchuk
8116df6c21
cleanup unused import and fix comment space 2023-12-13 20:10:28 +02:00
Jaime van Kessel
fbefe42db3
Get abstract color property from metadata not from properties 
Otherwise all the abstract profiles are visible

CURA-10953
 2023-09-15 13:13:23 +02:00
Jaime van Kessel
1a41f2650a
Don't show invisible materials in material selection 
CURA-10953
 2023-09-07 13:24:40 +02:00
Remco Burema
6dc0a24311 Cache and genericize ID to Product table. 
part of CURA-9931
 2022-11-24 15:33:39 +01:00
Jaime van Kessel
12379b15cd Use correct key for serialized setting to keep 
'recommend cleaning after n prints' instead of 'recommended cleaning after n prints'

CURA-9432
 2022-06-30 16:37:26 +02:00
Remco Burema
fab86be909 Keep settings throughout reserilization process. 
Save some settings Cura doesn't use, but other consumers of the file might in the metadata during deserilization, so they can be properly re-serialized whenever exported.

part of CURA-9432
 2022-06-30 14:14:11 +02:00
Ghostkeeper
795814d50b
Store unmapped settings in a separate set 
We don't want to create actual settings for all of these. Just store them in the profile metadata and restore them.
Serialising and deserialising these is a bit more work than what I could do now in 5 minutes so we'll have to do that a bit later, but at least for now we have the complete list.

Contributes to issue CURA-9432.
 2022-06-30 09:45:45 +02:00
Jaime van Kessel
ddb87656ff Add two recently introduced material settings 
CURA-9432
 2022-06-29 16:24:51 +02:00
Joey de l'Arago
094c781b02
Update plugins/XmlMaterialProfile/XmlMaterialProfile.py 
Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com>
 2022-05-31 15:49:57 +02:00
j.delarago
ec60325a3f Move metadata exporting to 3mf 
CURA-8610
 2022-05-31 12:39:00 +02:00
j.delarago
cdc08b5d54 Improve GUID check by parsing xml and getting GUID specifically inside the metadata tag. 
Remove exporting materials from disabled extruders

CURA-8610
 2022-05-31 10:00:25 +02:00
j.delarago
21d59e9349 Write active material metadata to ufp when saving. 
Add function to fetch package_id using only information from XmlMaterialProfile material container.
The only piece of information associating the material container and the package together is the file_name. To find the package that owns a material we have to search each of the material package paths.

It would be great to find a cleaner solution (preferable one that doesn't require invalidating the cached containers).

CURA-8610
 2022-05-30 17:29:59 +02:00
Jaime van Kessel
0501b71e13 Also accept original casing to match with ID for material profile 
This fixes an issue reported by Essentium. They used capitals in their
id, so it could never match that with a material profile
 2022-01-17 10:53:52 +01:00
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