GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,217 Commits 291 Branches 260 Tags
Commit Graph

816 Commits

Author SHA1 Message Date
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
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
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
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
Diego Prado Gesto
bca68c6db0 Merge branch 'feature_intent' into feature_intent_container_tree 2019-09-13 09:02:51 +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
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
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
Jaime van Kessel
a279ee5f22
Fix sync issues when printer was added by cloud 
CURA-6769
 2019-09-12 11:21:09 +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
Jaime van Kessel
b00b8c8c58 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface 2019-08-29 16:28:26 +02:00
Jaime van Kessel
d548404dfd Fix typing issues 2019-08-29 16:23:10 +02:00
Jaime van Kessel
04997fca7f Add property for active intent category 
CURA-6598
 2019-08-29 15:52:02 +02:00
Ghostkeeper
2676c7fa2f
Fix getting container metadata when switching to quality changes profile 
Contributes to issue CURA-6600.
 2019-08-29 09:03:04 +02:00
Ghostkeeper
2647b7e994
Fix latent querying for node_for_global on quality changes 
There are no quality changes nodes any more so this all has to happen through metadata.

Contributes to issue CURA-6600.
 2019-08-28 16:44:10 +02:00
Ghostkeeper
5d8fff69e4
Fix referencing nodes for quality changes 
Contributes to issue CURA-6600.
 2019-08-28 16:32:20 +02:00
Ghostkeeper
619adcb5b3
Fix handling quality_changes_group by metadata 
We only need to access the metadata so this is fine.

Contributes to issue CURA-6600.
 2019-08-28 14:07:49 +02:00
Ghostkeeper
5a7054ecc3
Remove references to quality manager 
The last two remaining here.

Contributes to issue CURA-6600.
 2019-08-28 13:16:39 +02:00
Ghostkeeper
83c8b814d9
Apply intent category when changing to quality changes group 
This essentially makes the quality changes depend on the intent that was active when it was created.

Contributes to issue CURA-6600.
 2019-08-28 10:33:33 +02:00
Ghostkeeper
4fd886f2e8
Use container tree to get current quality groups 
Contributes to issue CURA-6600.
 2019-08-28 09:02:26 +02:00
Remco Burema
745390e51f Fix typing. 
part CURA-6600
 2019-08-27 17:57:11 +02:00
Remco Burema
fbf4d42f06 Active quality group can be None. 
part of CURA-6600
 2019-08-27 15:22:26 +02:00
Jaime van Kessel
8f75a12d27 Fix network config syncing 2019-08-27 14:46:33 +02:00
Ghostkeeper
3f5563514c
Remove _current_quality_changes_group shadow administration 
Get the quality changes group back from whichever one is actually active on the stack. This prevents the two from getting out of sync, which makes the code easier to maintain.

Contributes to issue CURA-6600.
 2019-08-27 13:03:29 +02:00
Ghostkeeper
62395d5503
Remove _current_quality_group shadow administration 
This was causing asynchronicities.

Contributes to issue CURA-6600.
 2019-08-27 12:39:19 +02:00
Ghostkeeper
89a5fe41fe
Fix getting empty quality containers 
Contributes to issue CURA-6600.
 2019-08-27 11:19:02 +02:00
Ghostkeeper
6f67e6b55f
Simplify activeQualityType() and remove dependency on _current_quality_group 
The shadow administration is annoying so I'm removing it.

Contributes to issue CURA-6600.
 2019-08-27 11:16:00 +02:00
Ghostkeeper
84c6ec36dc
Catch case where there is no global stack 
Contributes to issue CURA-6600.
 2019-08-27 11:14:07 +02:00
Ghostkeeper
78db68369e
Simplify activeQualityOrQualityChangesName 
Removed duplicate fallback mechanism if quality is empty. And removed dependency on shadow administration in _current_quality_group.

Contributes to issue CURA-6600.
 2019-08-27 11:11:17 +02:00
Ghostkeeper
01796b99cd
Simplify getting layer height 
The stack already makes it fall through properly, so there's no need to implement the fallback again here.

The only change is that it now displays 0.1mm as default layer height if there is no quality profile active. I don't think this makes a difference since we don't show the layer height then anyway. And technically it would be more correct too.

Contributes to issue CURA-6600.
 2019-08-27 11:06:35 +02:00
Ghostkeeper
0db99e8f21
Get quality groups from container tree 
Rather than from the quality manager.

Contributes to issue CURA-6600.
 2019-08-27 11:03:46 +02:00
Ghostkeeper
3de5aa3307
Remove _initMachineState 
It seems to only set profiles to whatever was already in the stack.

Contributes to issue CURA-6600.
 2019-08-23 14:43:50 +02:00
Ghostkeeper
f1f25e5350
Get Quality Groups from container tree rather than quality manager 
The quality manager is deprecated after all.

Contributes to issue CURA-6600.
 2019-08-23 14:23:18 +02:00
Ghostkeeper
617419ccc6
Use .container property of nodes to switch profiles 
This also fixes a crash when switching nozzles since the variant was set to a list of profiles rather than just one profile.

Contributes to issue CURA-6600.
 2019-08-23 13:51:24 +02:00
Ghostkeeper
8e06786e7b
Use ContainerTree when updating material upon nozzle switch 
Rather than the material manager which is deprecated.

Contributes to issue CURA-6600.
 2019-08-22 17:27:39 +02:00
Jaime van Kessel
e7609fadf4 Deprecated the allActiveMaterialIds and replaced the single location where it was used 
CURA-6600
 2019-08-21 17:08:35 +02:00
Remco Burema
507cb356d2 Remove (all?, most?) deprecated ContainerNode.getMetaDataEntry calls. 
part of CURA-6600
 2019-08-20 15:38:45 +02:00
Remco Burema
9374934d72 Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-08-15 16:47:29 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container 
part of CURA-6600
 2019-08-15 13:40:08 +02:00
Jaime van Kessel
c0f70c447e Ensure that the materials are loaded again 
CURA-6600
 2019-08-15 13:32:42 +02:00
Ghostkeeper
54b46abd0f
Use specific classes instead of ContainerNode superclass 
Also update the usage of these nodes because the getContainer() function is deprecated.

Contributes to issue CURA-6600.
 2019-08-13 17:20:58 +02:00
Ghostkeeper
5738af4bb8
No longer use deprecated MaterialManager when asking for available materials 
Use the ContainerTree structure instead. That's what it's for.

Contributes to issue CURA-6600.
 2019-08-13 17:20:58 +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
447b1b9645
Actually import MaterialManager 
Because this class is being used.

Contributes to issue CURA-6600.
 2019-08-12 17:14:11 +02:00
Jaime van Kessel
e08feb1099 Fix final set of broken tests 
CURA-6600
 2019-08-12 16:32:59 +02:00