Commit graph

6967 commits

Author SHA1 Message Date
Jaime van Kessel
55a8d03d42
Fix typing error 2019-09-13 13:16:48 +02:00
Jaime van Kessel
1e130637ee
Remove retry action from login
It doesn't work anyway and there is another way that does work (eg; login via the top right)
2019-09-13 10:38:52 +02:00
Lipu Fei
fa8213c601 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-13 10:31:11 +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
Jaime van Kessel
958d3698db
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-12 09:50:39 +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
Jaime van Kessel
d6d06fb85b
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade 2019-09-10 15:07:57 +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
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Jaime van Kessel
e9862fb348
Move version upgrade for intents from 4.1-4.2 to 4.3-4.4
CURA-6599
2019-09-10 10:57:25 +02:00
Remco Burema
c7bae1e8fc Move 'lay flat by face' operation to Uranium. 2019-09-09 23:25:16 +02:00
Ghostkeeper
f561218346
Merge branch '4.3' 2019-09-09 17:37:12 +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
Ghostkeeper
5debdd4cf6
Fix getting extruder list everywhere
Didn't test this beyond my own automated test, it seems.

Contributes to issue CURA-6600.
2019-09-09 16:47:29 +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
Lipu Fei
ea8b7ebd02 Fix remove all nodes for loaded gcode
Fixes the problem caused in UM commit 69057b48a1fc3df7c5c6f3e754a3beb285a94678
2019-09-09 11:49:25 +02:00
Ghostkeeper
8bcd9b339a
Use GlobalStack.extrudersList instead of GlobalStack.extruders to iterate
Otherwise the iteration can happen in any arbitrary order (due to the dict) and this can cause the result to not match to the desired combination of configurations per extruder.

Contributes to issue CURA-6600.
2019-09-06 17:20:03 +02:00
Ghostkeeper
4bdc819f12
Fix nondetermistic result with dictionary values list
Because global_stack.extruders.values can be returned in any order, the configurations matching with the lists doesn't always give a result.
It happened to work on my computer with the test, but there is no guarantee of that.

This is probably also going wrong in other places. I don't think we should use the .extruders property anywhere really!

Contributes to issue CURA-6600.
2019-09-06 17:15:45 +02:00
Ghostkeeper
b24ea11cfc
Merge branch '4.3' 2019-09-06 16:02:21 +02:00
Ghostkeeper
82aa0492ea
Revert "CS-171 Add R2 support" 2019-09-06 14:00:04 +00: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
Ghostkeeper
9a6f76c069
Add typing for get---ManagementModel
Just to have my IDE find usages properly, really.

Contributes to issue CURA-6600.
2019-09-05 16:32:34 +02:00
Jaime van Kessel
9d5ee286b4
Merge branch 'CURA-6537_ui_feedback_on_invalid_firmware' of github.com:Ultimaker/Cura 2019-09-05 16:10:30 +02:00
ChrisTerBeke
da4fcc8ee6 Revert "Revert "Remove network manager re-creation that was causing issues""
This reverts commit a04bcbb3e9.
2019-09-05 14:08:18 +02:00
ChrisTerBeke
a04bcbb3e9 Revert "Remove network manager re-creation that was causing issues"
This reverts commit 06d54f3970.
2019-09-05 11:05:26 +02:00
ChrisTerBeke
06d54f3970 Remove network manager re-creation that was causing issues 2019-09-04 19:19:49 +02:00
Remco Burema
16ea437255 Make 3MF-reader aware of setting-version for introduction Intent. 2019-09-04 14:52:54 +02:00