69 Commits

Author SHA1 Message Date
Jaime van Kessel
b3a6fafd97 Set default extruder index to -1 (so global is default) 2016-07-06 14:30:34 +02:00
Jaime van Kessel
a5ba68bae3 Ensure that the display matches with the backend active extruder data 2016-07-06 14:09:08 +02:00
fieldOfView
825fcc2020 Fix filtering of variants and materials by definition instead of by machine
CURA-333
2016-06-22 09:55:18 +02:00
fieldOfView
ee7cfe273e Fix check for has_variants & has_materials
These are defined as bool values instead of strings in UM2+ definitions, so I would expect other machine definitions (including jedi) also use bools.

CURA-333
2016-06-22 09:55:18 +02:00
fieldOfView
bd703e65af Fix variant vs nozzle
CURA-333
2016-06-22 09:55:17 +02:00
fieldOfView
0893e4b2cc Revert "Fix variant vs nozzle"
This reverts commit cb05f75f6ab754f1f095e1cabd19f7259ed917bf.
2016-06-16 15:08:45 +02:00
fieldOfView
666b1a0263 Revert "Fix check for has_variants & has_materials"
This reverts commit 7f093be75a1a31f07eba79ec89ab08ebc2d9622d.
2016-06-16 15:08:20 +02:00
fieldOfView
a5424fa207 Revert "Fix filtering of variants and materials by definition instead of by machine"
This reverts commit 623b8f276e8c74023aad1592fc16bf98d50da1d5.
2016-06-16 15:08:05 +02:00
fieldOfView
623b8f276e Fix filtering of variants and materials by definition instead of by machine
CURA-333
2016-06-16 12:47:08 +02:00
fieldOfView
7f093be75a Fix check for has_variants & has_materials
These are defined as bool values instead of strings in UM2+ definitions, so I would expect other machine definitions (including jedi) also use bools.

CURA-333
2016-06-16 10:41:50 +02:00
fieldOfView
cb05f75f6a Fix variant vs nozzle
CURA-333
2016-06-16 10:14:17 +02:00
Ghostkeeper
cb467f488b
Don't convert ids to lowercase
Eventually we might have to do this due to case-insensitivity of some file systems, but this is not the place for that anyway.

Contributes to issue CURA-340.
2016-06-15 14:36:58 +02:00
Jaime van Kessel
7176c98d8a Fixed stupid mistake with getting active extruder stack
CURA-1689
2016-06-15 10:21:06 +02:00
Jaime van Kessel
f0340c6d63 Rework based on review
CURA-1689
2016-06-15 09:50:05 +02:00
fieldOfView
168415554d Typo and codestyle 2016-06-12 13:56:37 +02:00
Jaime van Kessel
cc17c28978 Fixed global stack not being set as next stack for extruder trains 2016-06-10 17:26:09 +02:00
Jaime van Kessel
8c43d4c4cb Quality is now set for extruder, regardless if the machine has machine specific qualities 2016-06-10 17:04:25 +02:00
Jaime van Kessel
179b6eeaac Fixed issue where not having a machine caused extruder retrieval to fail
CURA-1689
2016-06-10 13:16:54 +02:00
Jaime van Kessel
9672b3360c Changing settings in extruder stack now also triggers reslice
CURA-1689
2016-06-10 12:26:11 +02:00
Ghostkeeper
9f3752276f
Fix check if machine's extruders are processed
Luckily this did never occur anyway since the rest of the code was sound.

Contributes to issue CURA-340.
2016-06-09 17:05:21 +02:00
Jaime van Kessel
1db74b00fd Merge branch 'feature_send_extruder_settings' of github.com:Ultimaker/Cura 2016-06-09 16:41:22 +02:00
Arjen Hiemstra
627d5e3c0d Merge branch 'master' of github.com:ultimaker/Cura
* 'master' of github.com:ultimaker/Cura:
  Determine readonly state from location in filesystem instead of a metadata property
  Change focus upon extruder switch
  Fix extruder number attached to extruders
  Fix duplicating the first item on the Profiles page
  Fix spelling
  Document setActiveExtruderIndex
  Inheritance button now works if instance containers contain functions
  JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560)
  feat: use settable_per_[mesh|extruder|meshgroup|globally] instead of global_only (CURA-1560)
  JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally for fdmextruder settings (CURA-1558)
  JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally (CURA-1558)
2016-06-09 13:31:08 +02:00
Arjen Hiemstra
8729dce531 Store the actual extruder stack in ExtruderManager instead of just the ID
Contributes to CURA-340
2016-06-09 13:30:17 +02:00
Jaime van Kessel
8ebc75e09a Merge branch 'master' of github.com:Ultimaker/Cura into feature_send_extruder_settings 2016-06-09 13:05:50 +02:00
Jaime van Kessel
d93044a338 Added setting sending per extruder
CURA-1681
2016-06-09 13:04:07 +02:00
Ghostkeeper
14b9294a39
Document setActiveExtruderIndex
Contributes to issues CURA-340 and CURA-1278.
2016-06-09 10:45:48 +02:00
Ghostkeeper
4d418a7c1a
When switching active extruder, get the extruder train from definition id
Not from extruder container stack ID.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 16:36:01 +02:00
Ghostkeeper
0a34577fdb
Add documentation for createExtruderTrain
Contributes to issues CURA-340 and CURA-1278.
2016-06-08 14:09:37 +02:00
Ghostkeeper
fffe9b3a94
Better naming for extruder slot
The name of the extruder stack is now the same as the name for the extruder definition. The IDs are different though!

Contributes to issues CURA-1278 and CURA-340.
2016-06-08 14:09:37 +02:00
Ghostkeeper
32f90ad867
Re-add per-extruder nozzles, materials, qualities
Slightly more efficient and correct implementation.Contributes to issue CURA-340.
2016-06-08 14:09:36 +02:00
Ghostkeeper
f6ece126c3
Don't re-create user profile if one is loaded from files
The user profiles are also saved because they are added to the container registry. So if one exists for this extruder, don't create a new blank name, but use the pre-loaded one which contained the user settings the user had before he closed down Cura previously.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 14:09:36 +02:00
Ghostkeeper
21545af5c8
Get only values from extruder trains dictionary
Instead of getting the keys, which are labeled '0' and '1', we'd like to get the values, which are the extruder train IDs themselves.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 11:29:25 +02:00
Ghostkeeper
91797c3944
Log error if the machine refers to invalid extruder train ID
This helped mostly for debugging but it should be a genuine warning.

Contributes to issues CURA-1278 and CURA-340.
2016-06-08 11:29:25 +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
Ghostkeeper
f461ed0f5f
Document singleton
Contributes to issues CURA-340 and CURA-1278.
2016-06-08 10:38:59 +02:00
Ghostkeeper
ec26579473
Remove unused _repopulate function
It is replaced by the addMachineExtruders function.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 10:38:48 +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
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
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
Jaime van Kessel
0a84867132 Fixed multiple typos / missing things in extrudermanager 2016-06-07 09:33:29 +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