136 Commits

Author SHA1 Message Date
Lipu Fei
1c605a5108 Fix different strategies for machine and quality in project loading
CURA-4839
2018-01-23 10:58:43 +01:00
ChrisTerBeke
129f9cc16c Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835 2018-01-22 17:18:09 +01:00
Lipu Fei
7c85db4a18 Fix material_diameter copy over for Extruders
CURA-4835
2018-01-19 12:30:56 +01:00
Jack Ha
a0738c2977 CURA-4808 fix extruder setting change trigger slice. re-introduce extrudersAdded signal, probably needed because of timing issues (extruder added after loading global container). it's the inversion of 225b03e98ee1d92467176a1fd1ef3605ce0999c7 2018-01-16 11:49:45 +01:00
Lipu Fei
225b03e98e No need for the extra extrudersAdded signal
CURA-4784
2018-01-12 09:58:07 +01:00
Aleksei S
3f4a2c565c Fix: after extruders switch do not trigger slicing, provided a new signal
which is triggered after adding extruder and it subscribers for property changes
2018-01-11 13:32:05 +01:00
Ghostkeeper
b20c6c6ac7
Use isinstance instead of type checking for SceneNode
isinstance also checks for subclasses. In our case, SceneNode was just extended to CuraSceneNode so this test was failing.

Contributes to issue CURA-4766.
2018-01-05 13:02:30 +01:00
Diego Prado Gesto
9561827bda CURA-4680 Checking if there is global stack in the ExtruderManager.
Intead of checking for it in all the methods in MachineManager, now the
check is done in ExtruderManager when there is no printer in the list.
2017-12-06 14:12:51 +01:00
ChrisTerBeke
e29fdbe76d Cleanup - CURA-4482 2017-11-01 14:32:58 +01:00
ChrisTerBeke
8f41185f22 Fix extruder manager single instance from qml - CURA-4482 2017-10-31 17:18:19 +01:00
ChrisTerBeke
911f619000 Fix for getting machine extruders from manager instance - CURA-4482 2017-10-31 14:43:48 +01:00
ChrisTerBeke
bc6984a0ed Fixes for selecting active variant, material and quality - CURA-4482 2017-10-31 13:19:28 +01:00
ChrisTerBeke
f36c9ffbc0 Create extruder stack for single extrusion machines when adding new machine - CURA-4482 2017-10-31 09:49:24 +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
723f6ce226 Only get extruder settings from extruder stack - CURA-4482 2017-10-26 15:10:52 +02:00
ChrisTerBeke
c132300fd5 start 2017-10-23 13:56:26 +02:00
Diego Prado Gesto
71e8de13a8 Fix retrieving setting values with "extruderValues()" and "resolveOrValue()"
CURA-4358

Using the context for override the extruderValues() and resolveOrValue()
functions, for getting the correct values. Also indicate in the context
to skip the first container in the stacks (user container)
2017-10-11 11:05:01 +02:00
Lipu Fei
852e59f310 Fix retrieving default values with "extruderValue()"
CURA-4358

Use evaluation context to override the default extruderValue()
function with getDefaultExtruderValue() so it can get the correct
default values from each extruder.
2017-10-09 12:24:08 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
Diego Prado Gesto
1d61740d1a Added some comments to the code and minor changes - CURA-4386 CURA-4379 2017-09-29 11:39:52 +02:00
Diego Prado Gesto
afb83fac88 Update the active extruder index when the global container changes. This
fixes a problem when Cura starts with a single extruder printer but the
user then choose a multiextruder printer - CURA-4386
Also added a quality definition in UM3E extruder with the ids of the UM3
extruders, so that the profiles for UM3 are also valid for UM3E and viceversa - CURA-4389
All are related issues with profiles and multiextruder printers
2017-09-28 18:02:39 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Diego Prado Gesto
568535e3e2 Adapting the code in case a multiextruder printer will use only one extruder - CURA-4359 2017-09-26 17:49:53 +02:00
Lipu Fei
dce575f661 Remove wall_extruder_nr from ExtruderManager.getUsedExtruderStacks
CURA-4145
2017-08-14 13:39:56 +02:00
Tim Kuipers
5f97d2cbde fix: account for roofing extruder when checking which extruder is used (CURA-4069, CURA-3940) 2017-07-21 15:53:05 +02:00
Lipu Fei
b0be901079 Do not check support_interface_extruder_nr if it is used
CURA-4069

support_bottom_extruder_nr and support_roof_extruder_nr are the support
interface extruder numbers, so checking those two is enough and there is
no need to check the interface extruder number.
2017-07-21 13:40:13 +02:00
Lipu Fei
1b0268f09c Use extruder_nr as integers for comparison
CURA-4069
2017-07-21 13:32:46 +02:00
Lipu Fei
9a92b58ac3 Check all limit_to_extruder features in getUsedExtruderStacks()
CURA-4069

getUsedExtruderStacks() doesn't take into account some new limit to
extruder features, The BuildVolume uses it to determine disallowed
areas, and this makes it give incorrect results.
2017-07-21 13:28:12 +02:00
Jaime van Kessel
7813bfc543 No longer crash when trying to get non existing extruder stacks
CURA-3953
2017-06-26 13:16:14 +02:00
fieldOfView
49f2fb2cea
Fix filtering maerials after editing materials
NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.
2017-06-14 10:42:04 +02:00
Ghostkeeper
6315947156
Modify parameter types from DefinitionContainer to DefinitionContainerInterface
It may also be any other class that implements the Definition Container Interface.

Not really related to CURA-3803 but I'm putting it there anyway as I found it during that development.
2017-05-22 14:01:57 +02:00
Lipu Fei
5ed89525fb selectedObjectExtruders should handle no extruder case
CURA-3756
2017-05-18 10:29:55 +02:00
Jaime van Kessel
29e8325c12 Only try to remove extruders if the machine has any 2017-05-18 09:56:13 +02:00
Lipu Fei
b2f0623ecf Do not add and register Extruders if they are already there
CURA-3756
2017-05-17 17:07:36 +02:00
Lipu Fei
386e5db489 When removing a machine's extruders, also clean up _extruder_trains
CURA-3756
2017-05-17 15:57:12 +02:00
Lipu Fei
3b3d9c4dae Minor code refactoring in ExtruderManager
CURA-3756
2017-05-17 15:57:12 +02:00
Lipu Fei
121ebd79cf Fix circular import problem caused by moving SettingVersion into CuraApplication
CURA-3756
2017-05-16 14:55:34 +02:00
Lipu Fei
40d70b5f39 Fix version upgrade for project loading
CURA-3756
2017-05-16 14:38:27 +02:00
Jaime van Kessel
1b4564bdb1 Added missing typing import 2017-05-16 14:37:47 +02:00
Jaime van Kessel
e921808cd6 We now try to remove the right container when removing extruder 2017-05-16 14:13:20 +02:00
Jaime van Kessel
910a55fd50 Simplified some code 2017-05-15 14:17:42 +02:00
Jaime van Kessel
d93c5e667b Changed final spot where we still used findContainer when looking for container with specific type 2017-05-15 14:02:07 +02:00
Ghostkeeper
ccda155882
Add setting_version every time we create InstanceContainer
Except when we fill the instancecontainer via deserialising. Because then we want to retain the original version number.

Contributes to issue CURA-3427.
2017-05-15 10:39:53 +02:00
Jaime van Kessel
81d3ce46f1 Added bunch of typing to extruder manager 2017-05-12 16:56:12 +02:00
fieldOfView
3fbdaf6c17 Ignore values of extruders that are inactive for the current machine instance
extrudervalues() would include the values of extruders whose position >= machine_extruder_count. This can happen in machine definitions that have more extruders than machine_extruder_count, eg Custom FDM printer.
2017-05-08 13:43:09 +02:00
Jack Ha
1fe142ad1f Fix crashing Cura when switching multi extruder machine to single extruder machine while object selected. CURA-3776 2017-05-08 10:50:15 +02:00
Jaime van Kessel
d7004d3547 Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack 2017-05-02 11:42:16 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed'
Contributes to issue CURA-3491.
2017-04-25 16:46:30 +02:00