Commit graph

2372 commits

Author SHA1 Message Date
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
c132300fd5 start 2017-10-23 13:56:26 +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
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
2017-10-20 15:09:45 +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
Ghostkeeper
f7e048aee5
Remove unused variable
Contributes to issue CURA-4243.
2017-10-19 16:37:03 +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
A.Sasin
16bd4430e4 Added a pyQtProperty to validate user settings (Might be wrong approach)
CURA-4333
2017-10-12 21:23:17 +02:00
Lipu Fei
39891551e3 Fix custom profile handling for quality slider
CURA-4333
2017-10-12 12:42:18 +02:00
A.Sasin
b318dc7087 Added notification icon in recomended mode. The notification icon is only
active if one of custom settings is changed
CURA-4333
2017-10-12 08:57:26 +02:00
Diego Prado Gesto
71e8de13a8 Fix retrieving setting values with "extruderValues()" and "resolveOrValue()"
CURA-4358

Using the context for override the extruderValues() and resolveOrValue()
functions, for getting the correct values. Also indicate in the context
to skip the first container in the stacks (user container)
2017-10-11 11:05:01 +02:00
Lipu Fei
1c5d352b88 Fix the case when active_extruder is None 2017-10-09 14:35:30 +02:00
Lipu Fei
852e59f310 Fix retrieving default values with "extruderValue()"
CURA-4358

Use evaluation context to override the default extruderValue()
function with getDefaultExtruderValue() so it can get the correct
default values from each extruder.
2017-10-09 12:24:08 +02:00
Diego Prado Gesto
80ae45ac13 Add some comments to better understand the code - CURA-4404 2017-10-05 15:45:14 +02:00
Lipu Fei
d89f027458 Fix extruder stacks list handling in profile models
CURA-4404
2017-10-05 14:11:16 +02:00
Jaime van Kessel
bff3a5bb23 Naming of new machines now uses correct ordering again
CURA-4408
2017-10-03 13:16:04 +02:00
Jaime van Kessel
189fc3fe94 Added missing activeStack changed signal
This fixes some issues with the recommended view when the first machine is added.

CURA-4403
2017-10-02 16:37:00 +02:00
Diego Prado Gesto
daa0793427 Minor code changes - CURA-4395 2017-10-02 11:15:24 +02:00
Diego Prado Gesto
4d9908364a Now empty message in materials and variants doesn't appear - CURA-4377 2017-09-29 16:28:18 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
A.Sasin
3082038261 Fixed code style and machine default name is retrieved from machine definition
CURA-4345
2017-09-29 13:52:00 +02:00
Diego Prado Gesto
1d61740d1a Added some comments to the code and minor changes - CURA-4386 CURA-4379 2017-09-29 11:39:52 +02:00
Ghostkeeper
dbf13b0d1a
Fix calling loggers
Because UM.Logger is a module, not the Logger class.
2017-09-29 09:14:43 +02:00
Diego Prado Gesto
afb83fac88 Update the active extruder index when the global container changes. This
fixes a problem when Cura starts with a single extruder printer but the
user then choose a multiextruder printer - CURA-4386
Also added a quality definition in UM3E extruder with the ids of the UM3
extruders, so that the profiles for UM3 are also valid for UM3E and viceversa - CURA-4389
All are related issues with profiles and multiextruder printers
2017-09-28 18:02:39 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
Ghostkeeper
92c407580a
Comment out visibility of flow temperature graph
Apparently it's not allowed to be in there. By being commented out I hope that a future developer won't make the same mistake and add it there to be editable in the interface.
2017-09-28 15:33:00 +02:00