3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
21201 commits 313 branches 275 tags 718 MiB
Commit graph

5637 commits

Author SHA1 Message Date
Jaime van Kessel
3e474c1107
Ensure that enabling & disabling an extruder gets handled correctly 
CURA-6775
 2019-09-19 14:54:58 +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
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
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
Lipu Fei
e1a52f841f Correct typing 2019-09-16 10:48:39 +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
Jaime van Kessel
55a8d03d42
Fix typing error 2019-09-13 13:16:48 +02:00
Diego Prado Gesto
bca68c6db0 Merge branch 'feature_intent' into feature_intent_container_tree 2019-09-13 09:02:51 +02:00
Diego Prado Gesto
d38e60ce06 Merge branch 'master' into feature_intent 2019-09-13 09:02:30 +02:00
Diego Prado Gesto
d9af8bd6b0 Merge branch '4.3' 2019-09-13 09:00:34 +02:00
Ghostkeeper
f4a2f3efa6
Emit activeStackChanged as documented when containers in the active stack change 
This fixes updating the intent models when you switch nozzles. Among other things, probably.

Contributes to issue CURA-6600.
 2019-09-12 17:27:30 +02:00
Ghostkeeper
603f18ebc9
No need to sort quality groups by type alphabetically 
Like, it would put 'draft' first and 'verydraft' last. Just makes no sense. They have unique layer heights already.

Contributes to issue CURA-6600.
 2019-09-12 16:44:40 +02:00
Ghostkeeper
7d49fd7fa2
Don't import type that's only used for type checking 
Contributes to issue CURA-6600.
 2019-09-12 16:15:03 +02:00
Ghostkeeper
f1299589c9
Remove debug prints 
Contributes to issue CURA-6600.
 2019-09-12 15:49:27 +02:00
Ghostkeeper
92d2686fed
Pick quality changes group from quality changes groups, not quality groups 
Oops.

Probably went wrong when I copied over this code from some other place.

Contributes to issue CURA-6600.
 2019-09-12 15:19:06 +02:00
Ghostkeeper
9a5d45282a
Set intent category of quality changes group correctly 
If any profile has a different intent than default, the entire group becomes that intent. There can only be one intent that's different from default per group.

Contributes to issue CURA-6600.
 2019-09-12 14:54:24 +02:00
Remco Burema
f4395cc647 Correct comment. 2019-09-12 14:04:30 +02:00
Ghostkeeper
ba0ebf044a
Merge branch '4.3' 2019-09-12 13:54:55 +02:00
Nino van Hooff
0cd664975e Remove face selection for a PreviewPass 
Fixes issue where the selected face for the lay-flat feature showed
up in the model thumbail of print jobs.

CURA-6754
 2019-09-12 13:42:19 +02:00
Ghostkeeper
1b9e710f72
Fix exporting with new quality changes groups 
Those groups are starting to become a bit cumbersome...

Contributes to issue CURA-6600.
 2019-09-12 13:40:47 +02:00
Ghostkeeper
4f936f5c23
Fix getting active quality changes group from machine manager 
I have the feeling that we have multiple implementations of this but it's hard to find...

Contributes to issue CURA-6600.
 2019-09-12 13:28:59 +02:00
Ghostkeeper
cb146b586d
Emit ContainerRegistry's containerMetaDataChanged when name changes 
If we properly call the setName() function on the container it'll emit the signal that the metadata changes.

This fixes the updating of the profiles list when you rename a container.

Contributes to issue CURA-6600.
 2019-09-12 13:22:57 +02:00
ChrisTerBeke
558698add7 Merge branch '4.3' 2019-09-12 12:04:01 +02:00
Jaime van Kessel
a279ee5f22
Fix sync issues when printer was added by cloud 
CURA-6769
 2019-09-12 11:21:09 +02:00
Ghostkeeper
d6e010f22b
Fix iterating over all stacks 
Contributes to issue CURA-6600.
 2019-09-11 17:29:10 +02:00
Ghostkeeper
f865151e82
Don't create intent for global stack when duplicating 
Contributes to issue CURA-6600.
 2019-09-11 17:28:42 +02:00
Ghostkeeper
2b96543cd3
Store intent category in metadata of quality_changes as well 
This is necessary in order to restore it properly.

Contributes to issue CURA_6600.
 2019-09-11 16:58:11 +02:00
Ghostkeeper
f8d72b2ea7
Fix crash when adding first quality changes profile 
This dictionary is keyed by position integers, not position strings.

Contributes to issue CURA-6600.
 2019-09-10 15:33:32 +02:00
Ghostkeeper
a313255bc7
Use integer positions to get quality changes per extruder from group 
It's all a mix right now...

Contributes to issue CURA-6600.
 2019-09-10 15:10:42 +02:00
Ghostkeeper
0b92c3f3df
Use .container property rather than deprecated getContainer() function 
Contributes to issue CURA-6600.
 2019-09-10 14:56:16 +02:00
Diego Prado Gesto
190984462b Merge branch '4.3' 2019-09-10 14:17:31 +02:00