3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
28446 commits 305 branches 272 tags 787 MiB
Commit graph

6967 commits

Author SHA1 Message Date
Lipu Fei
ddab8e204a Add typing 
CURA-6800
 2019-09-23 11:43:50 +02:00
Ghostkeeper
4bf8ea9332
Merge branch '4.3' 2019-09-23 11:25:31 +02:00
Ghostkeeper
cb045fb0c2
Update default SDK version 
Just in time.
 2019-09-23 11:24:20 +02:00
Lipu Fei
1aa6708677 Fix typing 2019-09-23 10:59:31 +02:00
Remco Burema
cb7d99d2dc Revert "Make 3MF-reader aware of setting-version for introduction Intent." 
This reverts commit 16ea437255.

Should have been (and is now) done in the version upgrade instead.
 2019-09-20 11:56:08 +02:00
Ghostkeeper
4a68e7ec95
Fix favorite materials without material manager 
We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough.

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Ghostkeeper
12043df367
Don't use material manager to find or remove materials 
That remove function in the material manager was very weird...

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Ghostkeeper
cc9115b3d3
Don't use material manager to reset material 
Use the container tree.

Contributes to issue CURA-6776.
 2019-09-20 09:57:35 +02:00
Ghostkeeper
105e782e75
Remove unused imports to MaterialManager 
Contributes to issue CURA-6776.
 2019-09-20 09:57:35 +02:00
Jaime van Kessel
a69a394514
Fix container tree generation for machines that only have global profiles 
CURA-6775
 2019-09-19 17:16:15 +02:00
Jaime van Kessel
fc67090a2f
Fix crash when adding UMO 2019-09-19 16:15:00 +02:00
Jaime van Kessel
7dcf083991
Fix container tree for printers that have no variants but do have qualities & materials 
CURA-6775
 2019-09-19 15:56:06 +02:00
Jaime van Kessel
7016e791c8
Fix containertree for machines without materials but with specific qualities 
CURA-6775
 2019-09-19 15:33:19 +02:00
Jaime van Kessel
830b22e381
Fix crash when adding a machine without materials 
CURA-6775
 2019-09-19 15:12:29 +02:00
Jaime van Kessel
2b4144386f
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-09-19 14:56:12 +02:00
Jaime van Kessel
3e474c1107
Ensure that enabling & disabling an extruder gets handled correctly 
CURA-6775
 2019-09-19 14:54:58 +02:00
Lipu Fei
a3263da3f4
Merge pull request #6338 from Ultimaker/feature_intent_upgrade 
Feature intent upgrade
 2019-09-19 14:44:52 +02:00
Lipu Fei
6e625b2cf8 Fix typing 2019-09-19 14:34:52 +02:00
Jaime van Kessel
3730ea247d
Ensure that intent gets updated when changing quality / material 
CURA-6775
 2019-09-19 14:26:18 +02:00
Lipu Fei
823f7e5921 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-19 14:14:29 +02:00
Jaime van Kessel
c76c183c6b
Remove unused code 2019-09-19 13:45:13 +02:00
Jaime van Kessel
884a3ea819
Fix selection for intents if only one of the extruders has an intent 
CURA-6598
 2019-09-19 09:54:47 +02:00
Jaime van Kessel
49276db073
Fix display of intent in profile selection 
CURA-6598
 2019-09-19 09:39:52 +02:00
Jaime van Kessel
78ab218cc2
No longer reset to default intent when configuration changed 
This caused the intent to be reset every time a change was made.

CURA-6600
 2019-09-18 14:52:51 +02:00
Jaime van Kessel
7693de325a
Add loggin when user tries to change intent 
CURA-6598
 2019-09-18 14:39:06 +02:00
Ghostkeeper
2571f54d3c
Simplify looping over quality groups 
Contributes to issue CURA-6600.
 2019-09-18 14:01:23 +02:00
Ghostkeeper
b460ffeb9b
Use removeMaterial from MaterialManagementModel 
Contributes to issue CURA-6600.
 2019-09-17 17:59:50 +02:00
Ghostkeeper
8710bb77a7
Use MaterialManagementModel to rename materials 
It's the replacement for the deprecation.

Contributes to issue CURA-6600.
 2019-09-17 17:57:32 +02:00
Ghostkeeper
9392a3553c
Use implementation from MaterialManagementModel 
The material manager is deprecated now.

Contributes to issue CURA-6600.
 2019-09-17 17:54:26 +02:00
Ghostkeeper
0eb3c5c0d6
Refer material manager functions through to material management model 
That's where the materials are duplicated now. So we only maintain one implementation of that.

Contributes to issue CURA-6600.
 2019-09-17 17:50:38 +02:00
Ghostkeeper
963f5e6dd7
Use getApproximateMaterialDiameter rather than getCompatibleMaterialDiameter 
Should we deprecate getCompatibleMaterialDiameter? I don't think the un-rounded diameter should ever be used for compatibility checks.

Contributes to issue CURA-6600.
 2019-09-17 17:03:05 +02:00
Ghostkeeper
80e79f6e7e
Remove TODO 
Was done in previous commit, but I already pushed so no more --amend now.

Contributes to issue CURA-6600.
 2019-09-17 16:58:12 +02:00
Ghostkeeper
fc679758ef
Optimise getting intent categories 
It's in the container tree, so there's no need for separate queries to the container registry.

Contributes to issue CURA-6600.
 2019-09-17 16:57:16 +02:00
Ghostkeeper
3712f9c1f8
Correct parameter name 
It's the base file, not the ID.

Contributes to issue CURA-6600.
 2019-09-17 16:56:00 +02:00
Ghostkeeper
5f4051ab5c
Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter 
There was a function to round it for us already.

Contributes to issue CURA-6600.
 2019-09-17 16:41:32 +02:00
Ghostkeeper
37d54071f0
Don't use material manager any more to sync with printers 
Or to change material from a base file ID.

Contributes to issue CURA-6600.
 2019-09-17 16:35:39 +02:00
Ghostkeeper
5f2e2d5320
Use correct material diameter, rather than always 3 
This function shouldn't be called any more anyway, though.

Contributes to issue CURA-6600.
 2019-09-17 15:58:10 +02:00
Ghostkeeper
614c2970ea
Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter 
So we don't need to round it again.
Also convert both to float to be robust against the ambiguous serialisation of floats getting in the way (e.g. '3' vs. '3.0'). Python does that sometimes.

Contributes to issue CURA-6600.
 2019-09-17 15:50:38 +02:00
Ghostkeeper
b34895703b
Merge branch '4.3' 2019-09-17 13:08:49 +02:00
Diego Prado Gesto
5a95788493 Use the setting's default value when the global variant instance container is empty 
Otherwise it will never show as a matching configuration in the configuration list.
 2019-09-17 09:52:44 +02:00
Ghostkeeper
977beb8dbb
Re-build container tree if has_materials changes during runtime 
A bit of a hack and it'll be very slow. But it should work. Right now this crashes though because it still calls the Material Manager.

Contributes to issue CURA-6600.
 2019-09-17 08:55:29 +02:00
Ghostkeeper
8d21f75c40
Merge branch 'feature_intent_container_tree' into feature_intent_upgrade 2019-09-16 15:20:41 +02:00
Jaime van Kessel
6ff59bf5ab
Fix some more issues with the custom FF printer 2019-09-16 11:48:10 +02:00
Jaime van Kessel
e964035653
Fix adding custom FFF printer 2019-09-16 11:40:32 +02:00
Lipu Fei
e1a52f841f Correct typing 2019-09-16 10:48:39 +02:00
Jaime van Kessel
0f8dfeafc1
fix typo 2019-09-16 09:26:12 +02:00
Jaime van Kessel
0ff9d72c4c
Remove use of deprecated extruders property 2019-09-13 17:27:16 +02:00
Ghostkeeper
2cca95384d
Don't look for quality group for empty material 
Just don't add it to the list of available intents then.

Contributes to issue CURA-6775.
 2019-09-13 16:09:02 +02:00
Ghostkeeper
7942db5147
Give empty material the required material properties 
It needs a GUID, base file and material type to show up in the material nodes in the container tree.

Contributes to issue CURA-6775.
 2019-09-13 16:07:33 +02:00
Ghostkeeper
bb0c9c80dc
Don't use material groups to find just the root container 
Just look it up in the container registry. If you know the ID, this look-up is just a dictionary look-up as well.

Contributes to issue CURA-6600.
 2019-09-13 14:42:27 +02:00