Commit graph

347 commits

Author SHA1 Message Date
Jaime van Kessel
aba8bd89c3 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-06 13:33:20 +01:00
Lipu Fei
c0a502f99c Check if there is an active machine before doing anything else
CURA-4680
2017-12-06 11:48:14 +01:00
Lipu Fei
14c84d835a Make quality switching clear
CURA-4650
2017-12-01 09:55:38 +01:00
ChrisTerBeke
8cfaa44580 Fix resolving global stack definition when switching variant - CURA-4620 2017-11-27 16:40:23 +01:00
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
ChrisTerBeke
8082c092e5 Fix setting extruder definition in user changes container 2017-11-27 09:54:10 +01:00
Aleksei S
bb2be70dac Finds candidate quality profile for fdmextruder
CURA-4620
2017-11-25 02:25:36 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +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
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again
CL-541
2017-11-21 15:12:23 +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
e246784df2 Use parseBool() for metadata bool values
CURA-4482
2017-11-17 12:43:30 +01:00
ChrisTerBeke
e23e6cfa31 Fix for global quality in case of user created quality profile - CURA-4482 2017-11-01 13:59:21 +01:00
ChrisTerBeke
957009a768 Fix finding global quality for multi extrusion machines - CURA-4482 2017-10-31 17:32:21 +01:00
ChrisTerBeke
2e1da58570 Cleanup - CURA-4482 2017-10-31 17:06:34 +01:00
ChrisTerBeke
e7f1900f71 Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482 2017-10-31 14:01:15 +01:00
ChrisTerBeke
569047693e Rename loop variable to be more explicit - CURA-4482 2017-10-31 13:55:47 +01:00
ChrisTerBeke
bc6984a0ed Fixes for selecting active variant, material and quality - CURA-4482 2017-10-31 13:19:28 +01:00
ChrisTerBeke
f36c9ffbc0 Create extruder stack for single extrusion machines when adding new machine - CURA-4482 2017-10-31 09:49:24 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01:00
ChrisTerBeke
d718e6e36c Create extruder stack for single extruder machines on start - CURA-4482 2017-10-31 09:08:20 +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
ChrisTerBeke
b91824aab1 Move towards making extruder manager a first class citizen - CURA-4482 2017-10-26 17:54:36 +02:00
ChrisTerBeke
8378c6f3c9 Always add extruder quality changes when getting quality changes by name - CURA-4482 2017-10-26 14:30:18 +02:00
ChrisTerBeke
d6ef96a825 Add todo comment 2017-10-26 14:07:47 +02:00
ChrisTerBeke
0021dee84b Always use extruder stacks when copying value to all extruder - CURA-4482 2017-10-26 14:04:05 +02:00
ChrisTerBeke
0b57096056 Always use extruder stacks when switching global container in machine manager - CURA-4482 2017-10-26 13:44:47 +02:00
ChrisTerBeke
7975420901 Always set active extruder index when loading active machine on start - CURA-4482 2017-10-26 13:34:59 +02:00
Lipu Fei
2f441ba7e1 Remove debugging log lines
CURA-4451
2017-10-26 11:36:59 +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
c1139c5c45 Update stack error checking when switching matchines - CURA-4447 2017-10-24 13:38:14 +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
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
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
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
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
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
A.Sasin
16bd4430e4 Added a pyQtProperty to validate user settings (Might be wrong approach)
CURA-4333
2017-10-12 21:23:17 +02:00