3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 16:57:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
34356 commits 302 branches 270 tags 770 MiB
Commit graph

2372 commits

Author SHA1 Message Date
Jaime van Kessel
a279ee5f22
Fix sync issues when printer was added by cloud 
CURA-6769
 2019-09-12 11:21:09 +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
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Lipu Fei
3f3aac7ce5
Merge pull request #6289 from Ultimaker/feature_intent_interface 
Feature intent interface
 2019-09-09 16:53:37 +02:00
Lipu Fei
04e2ecde93 Init intent to empty_intent_container for new machine stacks 
CURA-6598
 2019-09-09 16:12:37 +02:00
Ghostkeeper
eb401defdf
Add deprecated marker on extruders: Use extruderList 
Extruders is dangerous because it's a dict of which the values are randomly ordered. The keys are often cast to int so you can't use anything else than integer numbers. And then they are often cast back so if you're not properly counting from 0 you're also in trouble. So please, only use the list. Eventually we can switch the data structure around.
 2019-09-09 14:21:57 +02:00
Jaime van Kessel
db604cdd16
Ensure that PerObjectContainer stack doesn't trigger a save 2019-09-06 11:16:12 +02:00
Ghostkeeper
71b94f6d5b
Create own quality changes profiles instead of asking quality manager 
It was a protected function call on a different class anyway, so that should never have gotten accepted.

Contributes to issue CURA-6600.
 2019-09-05 17:26:48 +02:00
Remco Burema
16ea437255 Make 3MF-reader aware of setting-version for introduction Intent. 2019-09-04 14:52:54 +02:00
Ghostkeeper
2f917c2841
Change definition ID upon reading profile 
Implements CURA-6713.
 2019-09-03 15:38:41 +02:00
Ghostkeeper
c41af1b9a0
Remove user-visible XML tags 
These XML tags are outside of the i18n call and are therefore not removed by gettext. They should not be present there.
 2019-09-03 14:00:09 +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
b9370f864e
Get quality definition from container tree 
Contributes to issue CURA-6600.
 2019-08-28 14:34:00 +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
ae77f9124c
Use container tree to determine quality_definition of profile and printer 
To see if they match.

Contributes to issue CURA-6600.
 2019-08-28 13:55:11 +02:00
Ghostkeeper
61e13087cd
Fix testing for available quality types 
Contributes to issue CURA-6600.
 2019-08-28 13:26:18 +02:00
Ghostkeeper
6dd0333626
Use container tree instead of getMachineDefinitionIdForQualitySearch 
It's in the metadata there, so use it.

Contributes to issue CURA-6600.
 2019-08-28 13:21:23 +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
Jaime van Kessel
d1a8ce54a1 Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-27 14:18:41 +02:00
Jaime van Kessel
1d9d411732 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-08-27 14:17:57 +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
Lipu Fei
69e9dc1313 Allow importing "not supported" profiles 
CURA-6542
 2019-08-27 09:08:19 +02:00
Ghostkeeper
8f34b3dd73
Set quality profiles to preferred quality upon stack creation 
A good default.
Possible bug: If there are multiple matching quality profiles but the preferred quality profiles matches none or multiple of them, a random one is chosen. The random profile for the global stack may not match the random one for the extruder?

Contributes to issue CURA-6600.
 2019-08-27 09:07:23 +02:00
Jaime van Kessel
108b22932b Override saveDirtyContainers with Cura specific logic 2019-08-26 14:55:30 +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
Ghostkeeper
431c8f4900
Build stack using container tree's preferred material/nozzle 
No need to really implement the fallbacks any more for when there are no materials. Only for when the preferred material can't be found.

Contributes to issue CURA-6600.
 2019-08-22 17:03:01 +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