67 Commits

Author SHA1 Message Date
fieldOfView
21b1891c0e Make unique name generation more robust and simpler
CURA-1585
2016-06-07 18:55:27 +02:00
fieldOfView
cca432742b Fix creating a name for a new MachineManagerModel
CURA-1585
2016-06-07 17:01: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
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
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
fieldOfView
bbc33f5d70 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 11:01:24 +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
5235f74adf Prevent unique names like "profile #10 #2"
CURA-1606, CURA-1585
2016-06-06 17:47:33 +02:00
Ghostkeeper
bcf7e0459b Merge branch 'master' of github.com:Ultimaker/Cura
Conflicts:
	cura/MachineManagerModel.py
2016-06-06 16:41:34 +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
d1be5b6c02 Create extruder train for each train in a machine
We had the functionality, but this function was not yet called!

Contributes to issues CURA-1278 and CURA-340.
2016-06-06 15:15:33 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
2016-06-06 15:15:33 +02:00
fieldOfView
a2db4740b9 Fix removing custom (quality) profiles
CURA-1585
2016-06-06 15:09:21 +02:00
fieldOfView
a139809b75 Fix showing profiles created using the dropdown menu in the dropdown and on the profiles manager
CURA-1585
2016-06-06 13:39:11 +02:00
fieldOfView
c21475abd7 Prevent multiple machines having the same custom name
Caused by container vs containerstack confusion
Fixes CURA-1606 and CURA-1649
2016-06-05 14:05:56 +02:00
fieldOfView
ead91db062 Fix activating another container stack when the currently active stack is removed
CURA-1632
2016-06-05 13:54:55 +02:00
Jaime van Kessel
b63c308694 Changed order of loading containers so extruder stacks don't fail anymore
CURA-340
2016-06-05 12:45:02 +02:00
Jaime van Kessel
783134031b Settings can now be set by extruder
CURA-340
2016-06-05 12:17:35 +02:00
Jaime van Kessel
1e44abb9be Added activeExtruder stack to machineManager model
CURA-340
2016-06-05 12:01:46 +02:00
Jaime van Kessel
c79b7bdd7a Machine manager now creates ExtruderTrainStacks
CURA-340
2016-06-05 11:34:29 +02:00
Jaime van Kessel
2f3352bfa0 Added default values when adding variant & materials
CURA-1612
2016-06-05 10:45:47 +02:00
Arjen Hiemstra
3413334c6d Update active material/quality when changing one of the lower levels
Contributes to CURA-1612
2016-06-04 21:17:27 +02:00
Jaime van Kessel
490a8724e5 Fixed duplication of profiles
CURA-1427
2016-06-03 16:29:46 +02:00
Jaime van Kessel
d1d60e27cc Added function to duplicate container
CURA-1427
2016-06-03 15:25:08 +02:00
Jaime van Kessel
ea73f00aac Fixed case where validation state was set incorrectly
CURA-1585
2016-06-03 14:39:36 +02:00
Jaime van Kessel
b6b154e153 Fixed slowdown caused by validation check
CURA-1585
2016-06-03 13:34:06 +02:00
Jaime van Kessel
2b91b81f2d Added documentation
CURA-1585
2016-06-03 13:24:23 +02:00
Jaime van Kessel
5faf2f024f Added signal for validation state
This improves the runtime speed somewhat
CURA-1585
2016-06-03 13:14:49 +02:00
Jaime van Kessel
7b87143e65 Only value property events are now used
This speeds the num events up a bit, but it's still a tad to slow

CURA-1585
2016-06-03 13:07:35 +02:00
Jaime van Kessel
0dece95f0f Updating non-readonly profiles is now possible again
CURA-1585
2016-06-03 13:03:56 +02:00
Jaime van Kessel
d29cc37d6b Adds way to convert user settings into quality settings
CURA-1585
2016-06-03 11:58:59 +02:00
Jaime van Kessel
4fc565711d Added read-only property to profiles
CURA-1585
2016-06-03 11:19:33 +02:00
Jaime van Kessel
113da81db5 Added isValidGlobalStack property to MachineManager
CURA-1585
2016-06-03 10:29:19 +02:00
Jaime van Kessel
ad35c9f070 Added reload profile (simply clears user instance container)
CURA-1278
2016-06-03 10:06:08 +02:00
Jaime van Kessel
11cb9af97f fixed typo 2016-06-02 17:32:26 +02:00
Arjen Hiemstra
e36397fa29 Use the new empty type-specific containers when adding a new machine
Contributes to CURA-1612
2016-06-02 17:21:49 +02:00
Ghostkeeper
c369202957
Fix unknown variable
Was probably a copy-paste mistake here. Fixed it for him.

Contributes to issue CURA-1278.
2016-06-02 11:17:52 +02:00
Arjen Hiemstra
123af4e3e4 Use metadata to determine what materials/qualities to use when adding a machine
Contributes to CURA-1612
2016-06-02 08:10:55 +02:00
fieldOfView
3638890138 Renaming a printer in the Manage Printers dialog is now reflected in the sidebar again
Contributes to CURA-1632
2016-05-31 15:26:38 +02:00
fieldOfView
6355631842 Activate another machine when we remove the currently active MachineManagerModel
CURA-1278
2016-05-27 11:53:53 +02:00
fieldOfView
b60e704aa6 Fix typo
CURA-1606
2016-05-26 22:29:21 +02:00
fieldOfView
53661b2739 Ensure a machine gets a unique names when adding or renaming a machine
CURA-1606
2016-05-26 22:18:34 +02:00
Arjen Hiemstra
a1d48fd511 When creating a new container stack, add empty containers for things where we cannot find containers
Additionally, record this information in the metadata of the stack
2016-05-25 11:31:19 +02:00
Arjen Hiemstra
b1f887a70f Use the global stack instance variable and account for it potentially being None 2016-05-25 11:31:19 +02:00
Arjen Hiemstra
2e0205f174 Store the global container stack as an instance property
This reduces the amount of function calls and makes it simpler to check
for container existance
2016-05-25 11:31:19 +02:00
Jaime van Kessel
dafff9159e Added materials & qualities
CURA-1278
2016-05-18 11:03:44 +02:00
Arjen Hiemstra
0664cbd2f6 Make sure to set the right type for the "current settings" instance container 2016-05-17 18:37:18 +02:00