3051 Commits

Author SHA1 Message Date
fieldOfView
f7480baca2 Fix selecting another quality when the currently active quality is removed
CURA-1585
2016-06-07 19:25:12 +02:00
fieldOfView
21b1891c0e Make unique name generation more robust and simpler
CURA-1585
2016-06-07 18:55:27 +02:00
fieldOfView
4d0bb217af Fix crash when enabling setting visibility for adhesion_extruder_nr or support_extruder_nr
The fix is likely not what was intended by the author of the offending code (and does not seem to be functional), but at least it fixes the hard crash outlined in CURA-1666
2016-06-07 18:13:19 +02:00
fieldOfView
e33eb52e93 Hide Support Extruder in advanced mode when support is disabled
CURA-1663
2016-06-07 17:32:28 +02:00
fieldOfView
cca432742b Fix creating a name for a new MachineManagerModel
CURA-1585
2016-06-07 17:01:08 +02:00
Simon Edwards
44d9fefd5d Profile export from the Profiles window.
Contributed to CURA-1667 Profile import/export
2016-06-07 16:13:12 +02:00
fieldOfView
f7e299a750 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 15:58:08 +02:00
fieldOfView
b2782ced0a Fix "renaming" profiles/machines to their current name without adding an increment
CURA-1585
2016-06-07 15:56:59 +02:00
Jaime van Kessel
9a14a3e8b7 Per object settings no longer watches "state" property
CURA-1278
2016-06-07 15:46:37 +02:00
Jaime van Kessel
5761307b33 Updated deepcopy to correctly copy the instance container
CURA-1636
2016-06-07 15:45:51 +02:00
Jaime van Kessel
57ce8edcd3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-07 14:56:46 +02:00
Jaime van Kessel
d2405a24d2 Perobject stacks are no longer saved
CURA-1278
2016-06-07 14:56:29 +02:00
Ghostkeeper
499a0557bd
Fix checking if an extruder train already exists
Contributes to issues CURA-340 and CURA-1278.
2016-06-07 14:00:31 +02:00
Ghostkeeper
a9376cffd1
Fix logging
Specify the fully qualified name.

Contributes to issues CURA-340 and CURA-1278.
2016-06-07 14:00:31 +02:00
Ghostkeeper
8feed746bf
Re-apply part of b991743053edf2778a2395dc9ede7007b99386eb that worked
This was indeed a mistake.

Contributes to issues CURA-340 and CURA-1278.
2016-06-07 14:00:31 +02:00
Ghostkeeper
08d116590d
Revert "Fix ExtruderManager.py"
That is not a fix. That is a patch.

This reverts commit b991743053edf2778a2395dc9ede7007b99386eb.
2016-06-07 14:00:31 +02:00
Jaime van Kessel
84a9691390 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-07 13:33:46 +02:00
Jaime van Kessel
4695862b49 Added deepcopy function to settingOverrideDecorator
CURA-1636
2016-06-07 13:33:19 +02:00
fieldOfView
b991743053 Fix ExtruderManager.py 2016-06-07 13:30:13 +02:00
Ghostkeeper
253061cfa4
Remove unused import
The _uniqueName function was using this but it was moved to ContainerRegistry.

Contributes to issues CURA-340 and CURA-1278.
2016-06-07 13:24:19 +02:00
Ghostkeeper
c5b07debdc
Remove iterability from ExtruderManager
This is no longer used.

Contributes to issues CURA-1278 and CURA-340.
2016-06-07 13:24:19 +02:00
Ghostkeeper
227c0f9f8c
Move _uniqueName to ContainerRegistry
It's not specific to any type of container and we might re-use this anyway.

Contributes to issues CURA-1278 and CURA-340.
2016-06-07 13:24:19 +02:00
Arjen Hiemstra
ca1b199c7e Fix PerObjectSettings to use the right objects when instantiating setting items
Contributes to CURA-1592
2016-06-07 13:19:37 +02:00
Jaime van Kessel
51ea6779df Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-07 12:53:24 +02:00
Jaime van Kessel
68837a089a Moved some properties to bindings due to bug in qt 5.5.1
CURA-1494
2016-06-07 12:50:57 +02:00
Tim Kuipers
b14b05d6fb JSON: upped the retraction_count_max further up to 90 (CURA-1662) 2016-06-07 12:12:14 +02:00
fieldOfView
3257d949eb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 12:00:03 +02:00
fieldOfView
4fb66afe06 Mark duplicated profiles as non-read-only
CURA-1585
2016-06-07 11:58:44 +02:00
Ghostkeeper
66bf0831f3
Document _uniqueName
This function should really just be moved to ContainerRegistry... I'll do that later.

Contributes to issues CURA-340 and CURA-1278.
2016-06-07 11:55:14 +02:00
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
2016-06-07 11:55:14 +02:00
Ghostkeeper
9fe5435963
Rename parameter in _uniqueName
Original means the original name. That's better.

Contributes to issues CURA-1278 and CURA-340.
2016-06-07 11:55:14 +02:00
Ghostkeeper
890303da14
Add function to add all extruder trains of a machine
This function only adds extruder trains if they have not been added already.

Contributes to issues CURA-340 and CURA-1278.
2016-06-07 11:55:14 +02:00
Tim Kuipers
889844e34b profiles: speed changes (extra overrides) (CURA-1662) 2016-06-07 11:39:23 +02:00
fieldOfView
ce388c4b23 Show settings in profile as a sorted list with section headers
CURA-1585
2016-06-07 11:18:09 +02:00
fieldOfView
bbc33f5d70 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 11:01:24 +02:00
Simon Edwards
a6870b555b Fix up my comment, make it clearer.
Fixes CURA-1630 Settings disappear after selecting all options of Experimental Modes
2016-06-07 10:34:08 +02:00
Jaime van Kessel
0a84867132 Fixed multiple typos / missing things in extrudermanager 2016-06-07 09:33:29 +02:00
fieldOfView
05643eca11 Fix renaming profiles from the Profiles page
CURA-1585
2016-06-07 08:11:53 +02:00
fieldOfView
35706734e6 Show settings on Profile page
CURA-1585
2016-06-06 23:13:25 +02:00
fieldOfView
efe3f5e4ee Remove dependency on QtQml.Models
CURA-1278
2016-06-06 17:53:34 +02:00
fieldOfView
5235f74adf Prevent unique names like "profile #10 #2"
CURA-1606, CURA-1585
2016-06-06 17:47:33 +02:00
fieldOfView
a0bbf98fba Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-06 17:11:17 +02:00
fieldOfView
a2def606c6 Fix Profile (application-)menu and add separators to profiles dropdown
CURA-1585
2016-06-06 17:10:56 +02:00
Ghostkeeper
bcf7e0459b Merge branch 'master' of github.com:Ultimaker/Cura
Conflicts:
	cura/MachineManagerModel.py
2016-06-06 16:41:34 +02:00
Simon Edwards
03914674c7 Cache all of the settings list items instead of recreating them all the time.
Fixes CURA-1630 Settings disappear after selecting all options of Experimental Modes
2016-06-06 16:04:26 +02:00
fieldOfView
df71269f82 Mark custom profiles as not read-only
CURA-1585
2016-06-06 15:56:45 +02:00
fieldOfView
0b57728d9d Fix creating a unique name for profiles
CURA-1585
2016-06-06 15:55:14 +02:00
Ghostkeeper
84a9166241 Make extrudersChanged into a pyqtSignal
This way we can listen for it on the cute side.

Contributes to issues CURA-340 and CURA-1278.
2016-06-06 15:15:33 +02:00
Ghostkeeper
64c92caa58 Update documentation of ExtruderManager class
Contributes to issues CURA-1278 and CURA-340.
2016-06-06 15:15:33 +02:00
Ghostkeeper
77c918a0a7 Remove superfluous singleton pattern
The qmlRegisterSingletonType function already makes sure it is a singleton.

Contributes to issues CURA-340 and CURA-1278.
2016-06-06 15:15:33 +02:00