ChrisTerBeke
6c3eaca0fd
fix loading user changes container for single extruder machine
2017-11-22 16:22:23 +01:00
Jack Ha
3b5ed70113
CURA-4602 Fixed active custom profile selected check
2017-11-22 16:15:06 +01:00
ChrisTerBeke
532cfd8404
Fix showing correct quality changes in dropdown list after upgrading - CURA-4482
2017-11-22 10:48:21 +01:00
Lipu Fei
aeb478bb4b
Should only show Keep/Discard dialog when it's needed
...
CURA-4599
2017-11-22 09:32:17 +01:00
Lipu Fei
31c859b3d7
Show Keep/Discard dialog after the containers have been changed
...
CURA-4599
Or the default values will reflect those before the switch.
2017-11-22 09:18:20 +01:00
ChrisTerBeke
0625d22e04
Fix update script for single extrusion quality changes - CURA-4482
2017-11-21 16:43:05 +01:00
ChrisTerBeke
62d70b46d6
Fix filtering custom profiles per extruder - CURA-4482
2017-11-21 15:31:59 +01:00
ChrisTerBeke
657a91c525
Merge pull request #2685 from Ultimaker/container_stack_improvements
...
Container stack improvements
2017-11-20 17:42:26 +01:00
Lipu Fei
69cd00d1c7
Do not take into account the active materials when importing a quality profile
...
CURA-4451
When importing a quality profile, it should not fail/succeed based on
which materials are activated at the moment. The imported quality
profile will be available when the user switches to a compatible
settings.
2017-10-30 13:13:54 +01:00
Diego Prado Gesto
fb88dd6326
CURA-4492 Postponed signals are now emitted even if we need user
...
interaction when changing quality profiles
2017-10-27 13:32:51 +02:00
Diego Prado Gesto
b9c318d432
CURA-4451 Minor changes
2017-10-26 16:53:31 +02:00
Lipu Fei
2f441ba7e1
Remove debugging log lines
...
CURA-4451
2017-10-26 11:36:59 +02:00
ChrisTerBeke
8826f86b54
Remove debug logging - CURA-4451
2017-10-26 09:58:01 +02:00
ChrisTerBeke
0377edaa0f
resolve conflicts
2017-10-26 09:26:18 +02:00
Chris ter Beke
b95ba24530
Remove some changes, debugging - CURA-4451
...
WIP - CURA-4451
correctly show not supported when any of the extruders has a not supported profile - CURA-4451
Clean up and add comments - CURA-4451
2017-10-26 09:23:27 +02:00
ChrisTerBeke
88ffe0d358
correctly show not supported when any of the extruders has a not supported profile - CURA-4451
2017-10-25 15:57:53 +02:00
ChrisTerBeke
9b62b48509
WIP - CURA-4451
2017-10-25 13:27:35 +02:00
ChrisTerBeke
7bf854aa0f
Remove some changes, debugging - CURA-4451
2017-10-25 09:52:14 +02:00
ChrisTerBeke
c679f4aa6b
Merge branch 'master' into CURA-4451_not_support_container
2017-10-24 13:41:14 +02:00
ChrisTerBeke
c1139c5c45
Update stack error checking when switching matchines - CURA-4447
2017-10-24 13:38:14 +02:00
ChrisTerBeke
9083fe1bf0
Add not supported instance container type and qt role - CURA-4451
2017-10-24 11:53:56 +02:00
ChrisTerBeke
b50f027c83
Add not supported role to profiles model
2017-10-24 10:25:53 +02:00
ChrisTerBeke
d018e0b2bb
First steps towards salvation - CURA-4451
2017-10-23 17:34:31 +02:00
ChrisTerBeke
d2ef373d19
Also apply container changes when no user interaction is required - CURA-4447
2017-10-23 15:50:42 +02:00
ChrisTerBeke
560be2931a
Create empty not supported container dynamically when no qualities are found - CURA-4451
2017-10-23 15:41:45 +02:00
ChrisTerBeke
e63616ca41
Update method description - CURA-4447
2017-10-23 11:43:15 +02:00
ChrisTerBeke
2361e96e29
Wait with updating active stack variant and material until dialog was closed - CURA-4447
2017-10-23 11:41:20 +02:00
ChrisTerBeke
09ed53b4ec
Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER
2017-10-20 12:38:12 +02:00
ChrisTerBeke
9f73f79b2f
Update simple mode manager states when manager is created - CURA-4466
2017-10-20 12:37:59 +02:00
ChrisTerBeke
95a2559607
indent
2017-10-20 12:34:35 +02:00
ChrisTerBeke
31a04ed8da
Also emit active quality changed when no dialog interaction occured - CURA-4447
2017-10-20 11:37:45 +02:00
ChrisTerBeke
e24242dc3c
Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER
2017-10-20 11:34:45 +02:00
ChrisTerBeke
be046117c4
Sidable quality slider handle when switching to user created profile - CURA-4466
2017-10-19 18:00:03 +02:00
ChrisTerBeke
30281f17f3
Add simple mode settings flag for user created profile - CURA-4466
2017-10-19 17:03:31 +02:00
ChrisTerBeke
70cf86c65b
Remove debug print - CURA-4447
2017-10-19 14:40:56 +02:00
ChrisTerBeke
e9336b9b9e
Small cleanups for discard or keep behavior - CURA-4447
2017-10-19 14:39:32 +02:00
Lipu Fei
d735921d42
Take into account the keep/discard interaction when emitting signals
...
CURA-4248
When user switches to a different profile, the keep/discard dialog can
show up. Don't emit signals immediately if this interaction takes place
because it will trigger an unnecessary slice.
2017-10-19 08:32:26 +02:00
A.Sasin
85f2a7c385
Added update to for Instance container to re calculate values and validate
...
CURA-4447
2017-10-17 15:01:49 +02:00
ChrisTerBeke
276232dae5
Merge pull request #2613 from Ultimaker/CURA-4333_Notification_icon_for_recommended_mode
...
Cura 4333 notification icon for recommended mode
2017-10-17 13:05:45 +02:00
Diego Prado Gesto
ac2484ea87
CURA-4457 Add parenthesis in conditional statement
2017-10-16 20:21:42 +02:00
Lipu Fei
fae65d7b83
Minor fixes for customized profile in simple mode
...
CURA-4333
- Update comments
- Disable the quality slider when there is a customized profile
2017-10-16 13:26:28 +02:00
Lipu Fei
9b8dc9bf55
Move simple-mode settings customization check into a separate file
...
CURA-4333
Simple-mode is a special mode so it makes more sense to put those code
in a separate file instead of in the more generic MachineManager.
2017-10-16 13:18:11 +02:00
Lipu Fei
94a624e105
Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode
2017-10-16 11:37:55 +02:00
Ghostkeeper
58562d59a0
Remove unused import
2017-10-16 11:17:50 +02:00
Ghostkeeper
dea230ed6a
Make generated extruder options translateable
...
These do appear in the actual interface.
2017-10-16 11:13:55 +02:00
A.Sasin
61cdfcd3e8
Added coments and simplified "user" metadata check
...
CURA-4333
2017-10-13 16:59:29 +02:00
A.Sasin
7f5aed7ead
User pyqtProperty instead of puqtSlot
...
CURA-4333
2017-10-13 16:34:49 +02:00
Mark
c2515ca7a9
Merge branch '3.0'
2017-10-13 16:21:54 +02:00
Diego Prado Gesto
3ea9c3856c
CURA-4450 Updating UI after removing printer
...
When removing a printer, the new one was activated but not signals were
emitted so the UI didn't update correctly. Now the printer is added and
signals are emitted.
2017-10-13 13:06:48 +02:00
Diego Prado Gesto
4c4de2cf1a
Merge branch 'CURA-4358_buildplate' into 3.0
2017-10-13 10:51:05 +02:00
