20 Commits

Author SHA1 Message Date
fieldOfView
a6bb0c804a Fix minor codereview issues
CURA-333
2016-06-22 17:19:14 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency"
This reverts commit 963a2092efefb62f8f8b1216f0a7d05bbebb884d.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
2016-06-22 10:19:44 +02:00
fieldOfView
963a2092ef Change spelling of "colour" to "color" for consistency
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.

CURA-333
2016-06-22 09:55:23 +02:00
fieldOfView
92905ada34 Show true extrudernames in Simple Mode support extruder selection combobox
CURA-333
2016-06-22 09:55:21 +02:00
fieldOfView
68ee4f0ea1 Format extrudername to include material name
CURA-333
2016-06-22 09:55:20 +02:00
fieldOfView
f083d41353 Update extrudermodel when material is changed
So the swatch updates, and we can use the materialname for extruder selection later on

CURA-333
2016-06-22 09:55:20 +02:00
fieldOfView
7faae685e5 Use different default colors for each extruder
CURA-340
2016-06-14 10:58:26 +02:00
Ghostkeeper
9d618282ed
Save default material colour statically
So if you wish to change that colour, you only need to change it in one place.

Contributes to issue CURA-340.
2016-06-09 17:01:21 +02:00
Jaime van Kessel
e793ce1a2c Use ID instead of definition 2016-06-09 16:57:40 +02:00
Arjen Hiemstra
d57e2b2e22 Add an ID role and addGlobal property to ExtrudersModel
Contributes to CURA-340
2016-06-09 13:47:34 +02:00
Ghostkeeper
4bdd5713f1
Fix extruder number attached to extruders
It reads that from position in the extruder definition file.

Contributes to issues CURA-1278 and CURA-340.
2016-06-09 11:48:37 +02:00
Ghostkeeper
8b75a230a0
Fix findContainer call without kwargs
It has no kwargs. This needs to be provided as dictionary.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 11:29:25 +02:00
Ghostkeeper
8c7b3a05b6
Enumerate again over the machine's extruders
We needed to get the index, after all.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 11:29:25 +02:00
Ghostkeeper
675a8c140e
Give default colour if there is no material
Otherwise it would try to call getMetaDataEntry on None.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 11:29:25 +02:00
Ghostkeeper
4aa495f9ef
Fix getting name and colour from extruder
There used to be an extruder object from which we could ask these properties. But now we have a container stack in its place, so we need to get the properties in a slightly different way.

Contributes to issues CURA-1278 and CURA-340.
2016-06-08 11:29:24 +02:00
Ghostkeeper
8b1c363932
Load current machine's extruders upon creation, start and switch of machines
This requires some trickery of initialising the extruder manager before the machine manager is initialised, so that it properly listens to global container stack changes.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 10:40:10 +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
Ghostkeeper
05243a4fca
Connect to function, not result of function
The result of the function was None, but I don't need None to be called whenever extruders changed. I need the function itself to be called.

Contributes to issues CURA-1278 and CURA-351.
2016-06-02 16:09:10 +02:00
Ghostkeeper
64ef5ab3a4
Inherit from class, not module
This is an import fail on my part, sorry.

Contributes to issues CURA-1278 and CURA-351.
2016-06-02 16:09:10 +02:00
Ghostkeeper
c24f4be8ae
Add extruders model
Hasn't been tested much because there is no display for this in the front-end yet. It needs a setting data type to go with in order to display it. This model is for the drop-down boxes to select an extruder to print, for instance, the support with.

Contributes to issues CURA-1278 and CURA-351.
2016-06-02 14:17:12 +02:00