59 Commits

Author SHA1 Message Date
Lipu Fei
b70e9c9080 Handle empty hotend and material in config syncing
CURA-5693

 - Disable an extruder if the config states no material or nozzle for
   it.
 - Show a warning message if an used extruder gets disabled.
2019-01-29 13:06:38 +01:00
Lipu Fei
d879cab91a Add all fields for optional extruder in ExtruderModel
CURA-6015
2018-12-13 14:12:44 +01:00
Lipu Fei
935f7a2512 Remove unused imports
CURA-6015
2018-12-13 14:12:31 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag
CURA-6015
2018-12-13 14:12:04 +01:00
Jaime van Kessel
3132b1f689 Update the extruder Model a whole lot less
CURA-6016
2018-12-10 16:56:44 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
2018-12-03 11:13:26 +01:00
Ghostkeeper
18bb403413
No longer switch away from extruder when disabling
It feels confusing when this happens.

Contributes to issue CURA-5876.
2018-11-30 15:42:46 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly
CURA-5785
2018-11-16 16:04:11 +01:00
Jaime van Kessel
2c7bdba7d0 Update ConfigurationSelector header to that it looks more like the new design
CURA-5785
2018-11-09 15:23:10 +01:00
Jaime van Kessel
5c6c299b27 Cleanup extruder manager
Few more unused functions removed & simplified.
It also fixes a few more typing issues that I encountered.
2018-09-07 17:06:18 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +02:00
Jack Ha
05cd937df3 CURA-4400 optional_extruders cannot be set to disabled extruders anymore 2018-03-15 15:00:13 +01:00
Jack Ha
552618fcd4 CURA-4400 added function to find model index by extruder position in SettingExtruder 2018-03-12 09:56:08 +01:00
Jack Ha
2538c689f1 CURA-4400 make extruder combobox disabled items grey 2018-03-01 16:22:40 +01:00
Jack Ha
f28bed9b4f CURA-4400 not sending objects that are printed with a disabled extruder 2018-02-28 12:56:39 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
Ruben D
f9c59c7e1e
Don't update model if extruders haven't all been loaded yet
This model is created while the extruder stacks have not yet been filled in. You can't connect yet. When the extruder is ready, _extrudersChanged will be called again and then the new extruder will also get connected.

Contributes to issue CURA-4243.
2017-11-30 00:33:10 +01:00
Diego Prado Gesto
e5ac33a929 CURA-4641 Minor changes 2017-11-29 11:19:11 +01:00
ChrisTerBeke
16e07fc461 Update color indicators for extruders when changing material color - CURA-4641 2017-11-29 10:47:39 +01:00
ChrisTerBeke
d718e6e36c Create extruder stack for single extruder machines on start - CURA-4482 2017-10-31 09:08:20 +01:00
ChrisTerBeke
b91824aab1 Move towards making extruder manager a first class citizen - CURA-4482 2017-10-26 17:54:36 +02:00
ChrisTerBeke
38fdb5e56f Refactor extruders model to always use extruder stacks + cleanup - CURA-4482 2017-10-26 14:45:24 +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
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Jaime van Kessel
c474642744 Removed debug ID
CURA-3814
2017-05-22 14:25:29 +02:00
Jaime van Kessel
92192ff411 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-22 14:10:27 +02:00
Jaime van Kessel
5aba1731f5 Renamed useOptionalExtruder to addOptional extruder
This is more in line with the other properties

CURA-3814
2017-05-22 14:05:10 +02:00
Ghostkeeper
c14294d1f7
Merge branch '2.6'
Conflicts:
cura/Settings/ExtrudersModel.py

Contributes to issue CURA-3803.
2017-05-22 14:02:48 +02:00
Ghostkeeper
5ae02fb4c6
Listen to changes on all extruders
Not just the active extruder. The non-active extruder may change when loading a project file which happened to have the same printer (so no new printer is created) and the same material and variant in the active extruder but not the same material or variant in another extruder.

Contributes to issue CURA-3803.
2017-05-22 14:01:58 +02:00
Jaime van Kessel
b69ced5766 Set color of "Not Overriden" option to white
CURA-3814
2017-05-22 13:45:28 +02:00
Jaime van Kessel
20cb3ea01f Added "optional_extruder" setting type
CURA-3814
2017-05-22 13:24:41 +02:00
Jaime van Kessel
167f616a7c Decreased interval of extruder timer 2017-05-12 14:34:45 +02:00
Jaime van Kessel
fd340a1270 Empty containers now also trigger extruder model update 2017-05-10 16:25:23 +02:00
Jaime van Kessel
801c282c97 Only update ExtrudersModel when material changes
CURA-3780
2017-05-10 10:59:21 +02:00
Jaime van Kessel
42fc703516 Added a few profiling decorators to expensive methods 2017-05-10 10:45:07 +02:00
Jaime van Kessel
3d429e44ae Updating extruders now also works with timer
CURA-3780
2017-05-10 09:59:19 +02:00
Jack Ha
5d15d6e792 Merge branch 'master' into feature_multiextruder_machinesettings 2017-05-02 17:26:27 +02:00
Arjen Hiemstra
27256cae9e Revert import change 2017-04-24 13:12:36 +02:00
Arjen Hiemstra
8e95c894fb Add material and variant names to ExtruderModel
Contributes to CURA-3609
2017-04-20 17:41:53 +02:00
fieldOfView
0c74b4d108 Don't create extruder tabs for "inactive" extruders
If a printer definition defines more extruders than machine_extruder_count, these are no longer shown as tabs in the sidebar.
2017-04-06 09:41:15 +02:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Arjen Hiemstra
0292756ad7 Do not limit containersChanged methods to a single container type
This may trigger a few extra updates, but allows us to use signal
compression in the postponesignals context manager, which greatly
improves performance.
2017-02-07 16:28:08 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Jack Ha
3efc5d63ef Improved layout, removed material name from extruder name. CURA-2763 2016-12-06 16:11:08 +01:00
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking).
CURA-2917
2016-11-21 21:36:08 +01:00
fieldOfView
e7da471199 Fix showing profile values for extruders
The profiles page would show the setting values in the quality profile, ignoring the quality_changes profile, because it could not find the appropriate quality_changes profile for the extruders

CURA-2478
2016-10-03 17:04:46 +02:00
Jaime van Kessel
7d9d751121 ProfilesModel is now updated when active variant or material is changed
Contributes to CURA-2494
2016-10-03 15:43:42 +02:00
Jaime van Kessel
513c05b78c Extruders model now listens to global container changed, instead of definition changed.
This solves issue where switching between machines with the same definition did not cause extruder materials to be updated

CURA-2493
2016-10-03 15:03:25 +02:00