248 Commits

Author SHA1 Message Date
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
Jack Ha
163929196d Removed commented out code. CURA-3497 2017-04-25 08:50:22 +02:00
Arjen Hiemstra
86d3cbadca Also search through groups when figuring out the extruders of the selection
Contributes to CURA-3609
2017-04-24 17:09:18 +02:00
Arjen Hiemstra
9fd0239cd5 Add a selectedObjectExtruders property to ExtruderManager
It exposes a list of the extruders used by the current selection.

Contributes to CURA-3609
2017-04-20 17:42:06 +02:00
Arjen Hiemstra
7a907aa713 Deprecate addMachineExtruders/createExtruderTrain 2017-04-18 17:42:40 +02:00
Arjen Hiemstra
0467a8688a Make the UM3 work properly 2017-04-18 17:42:20 +02:00
fieldOfView
db6cdad956 Filter preferred materials by approximate material diameter 2017-04-12 23:27:34 +02:00
Ghostkeeper
cb7c25f92f
Merge branch 'master' into feature_support_top_bottom_speed 2017-04-10 10:52:31 +02:00
Arjen Hiemstra
1c75a82779 Fix the hacked "getResolveOrValue" to return value always instead of resolve 2017-04-06 02:21:39 +02:00
Arjen Hiemstra
d3d2bdfaeb getResolveOrValue has become obsolete now that stack.getProperty can return a resolve 2017-04-04 17:41:43 +02:00
Jaime van Kessel
6314d872e1 If we find multiple materials for a new extruder, prefer a read only material
CURA-3147
2017-03-30 16:07:26 +02:00
Ghostkeeper
2f1d957f99
Split support_interface_enable into roof and bottom
You can activate the roof and bottom separately now. If you want, of course. The original interface setting sets both of them unless overwritten.

Contributes to issue CURA-3491.
2017-03-20 10:47:37 +01:00
Ghostkeeper
2d9b2216a3
Allow printing support roof and bottom with different extruders
Note that currently the support_interface_extruder_nr is still used by the engine for some things and therefore the build volume calculations may not be 100% correct. I'll fix that up soon.

Contributes to issue CURA-3491.
2017-03-17 15:55:18 +01:00
Jack Ha
32d5fbe557 Fixed choosing a quality that is compatible with multiple extruders as fallback. CURA-3510 2017-03-13 17:17:56 +01:00
Jack Ha
78de5412a2 Merge branch 'master' into layer_view3_cleanup 2017-02-15 10:57:24 +01:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Ghostkeeper
34dccfd6a6
Fix updating extruder names on machine switch
The extruder name is asked from the extruder manager, so that the signal from extruder manager properly updates it once the new name is available.

Contributes to issue CURA-3161.
2017-02-13 11:57:01 +01:00
Jack Ha
5a2aa8846b Added extruder count detection to layer view. CURA-3273 2017-01-30 13:29:35 +01:00
Jaime van Kessel
092f42ef28 Revert "Only emit signal when the active extruder actually changes"
This reverts commit 4e8fb254f67790c6f97e12f1d365521ce0235933.
2017-01-25 16:20:10 +01:00
Jaime van Kessel
4e8fb254f6 Only emit signal when the active extruder actually changes 2017-01-24 13:14:10 +01:00
Simon Edwards
4fecf55b3b Use double quotes instead of singles. 2017-01-17 20:56:50 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
Jaime van Kessel
f598a49c4b Order of extruders is now sorted by position
CURA-1263
2016-12-16 13:29:51 +01:00
Jaime van Kessel
0d9b64c8bd Fixed race condition which caused kitten to pop up when deleting printer. 2016-12-14 11:49:20 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +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
Jaime van Kessel
aca8110edd Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-21 13:45:04 +01:00
Jaime van Kessel
9539774c0b Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-17 10:27:28 +01:00
Jaime van Kessel
053f0ca031 Replaced hack for setting extruders with more robust setter
CURA-1263
2016-11-16 14:54:48 +01:00
Jaime van Kessel
dffb54d901 Removed abundant whitespace 2016-11-14 17:54:38 +01:00
Tim Kuipers
0c550859dd fix: don't register adhesion_extruder_nr as used if adhesion_type == none (CURA-759)
Also the old line obtained brim_line_count from the global stack, while it is settable_per_extruder!
Also we now assume selecting a brim means you want to print it.
I don't think having a brim line count of zero meant that you wouldnt get a brim; the minimal brim length also plays a role...
2016-11-14 12:39:41 +01:00
Ghostkeeper
48134619eb
Fix checking if we're single extrusion
We are single extrusion if the extruder count is less than or equal to 1, like in other places throughout Cura.

Contributes to issue CURA-2625.
2016-11-14 10:31:11 +01:00
Ghostkeeper
8d43f1c5f7
Take first layer extruder into account
Forgot about that one earlier.

Contributes to issue CURA-2625.
2016-11-11 17:18:15 +01:00
Ghostkeeper
14e736d9eb
Add function to find the extruders that are used
These are the extruders that are being used by the scene if it would currently be printed. You can ask the extruder stacks for stuff like the nozzle offset. This way we can determine the disallowed areas per extruder.

Contributes to issue CURA-2625.
2016-11-10 19:31:02 +01:00
Simon Edwards
e74953c8bc Internal docs.
CURA-2823 Maximum build volume not met despite disabled settings
2016-10-31 13:29:54 +01:00
Ghostkeeper
9a8a5db06e
Fix documentation for getAllExtruderSettings
Didn't complete it previously. Oops.

Contributes to issue CURA-2823.
2016-10-31 12:41:29 +01:00
Ghostkeeper
d5ba89a026
Add function to get other properties than values from all extruders
I've made sure that the behaviour of getAllExtruderValues remains the same, so that this function may still be used by other pieces of code. It is now just a special case of getAllExtruderSettings. Please suggest a better naming scheme, if you like.

Contributes to issue CURA-2823.
2016-10-28 15:20:13 +02:00