210 Commits

Author SHA1 Message Date
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
Jaime van Kessel
ecbe4b264a Added handling for key not found in extruder map 2016-10-25 11:02:41 +02:00
Jaime van Kessel
dbea06689f Extruder manager now uses right definition for material selection 2016-10-07 17:42:56 +02:00
Jack Ha
e66548099a Fixed signal routing when switching between different machines. CURA-2232 2016-10-04 15:25:22 +02:00
Jack Ha
03c66e6e62 use resolveOrValue for adhesion_type. contributes to CURA-2232 2016-09-29 14:09:19 +02:00
Simon Edwards
4bb6ddaf28 Correctly update the quality profiles in the extruders when changing quality changes, taking the different materials into account.
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
2016-09-27 14:11:19 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
Aldo Hoeben
281f9e18a3 Merge pull request #994 from Ultimaker/optimise_machine_switch
Speed up switching between multiextrusion machines
2016-09-23 12:01:17 +02:00
Jaime van Kessel
0b6c196659 Moved getAllExtruderValues to extruder manager
CURA-2407
2016-09-22 16:36:27 +02:00
fieldOfView
847d6429d0 Speed up switching between multiextrusion machines
ExtruderManager.addMachineExtruders is supposed to create a cache, but this cache was always rebuilt because of an indentation error.
2016-09-22 13:49:18 +02:00
fieldOfView
170a689b59 Select the correct preferred variant for multiextrusion printers
CURA-2424
2016-09-22 11:22:54 +02:00
Jaime van Kessel
0cfa8c0205 Fixed check for has_variant_materials
CURA-2271
2016-09-20 15:11:20 +02:00
Ghostkeeper
fd181ca0c3
Fix display of extruder values for enums
It wasn't always a list of ints. For enums, it's a list of strings. We have several other types. Just use variant.

Contributes to issue CURA-2232.
2016-09-16 15:56:22 +02:00
Jaime van Kessel
02c1a8d069 Fixed wrong indenting 2016-09-14 12:52:15 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from
CURA-1780
2016-09-08 18:49:34 +02:00
Jaime van Kessel
ced6cd7320 Exporting a profile now exports all profiles in a zipped container
CURA-2099
2016-08-26 12:55:31 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
fieldOfView
d8d328c491 Code style 2016-08-19 17:22:55 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
Arjen Hiemstra
6049d6f3a5 Introduce a getActiveGlobalAndExtruderStacks method to ExtruderManager
It can be used to iterate over the active global and extruder stacks

Contributes to CURA-2006
2016-08-11 17:49:02 +02:00
Jack Ha
97f9bcacf1 Tooltip for bed temperature displays values where it resolves from. CURA-2007 2016-08-08 13:39:54 +02:00
Ghostkeeper
d53fe9637e
Update documentation for return of getExtruderValue
It now falls back to global instead of returning None.

Contributes to issue CURA-2024.
2016-08-08 09:45:08 +02:00
Ghostkeeper
a46f6cc14d
Properly fallback to global if no extruders
This fixes the extruderValue function for printers such as the Ultimaker 2+.
2016-08-05 11:36:43 +02:00
Arjen Hiemstra
b76ebbb850 Ensure we have an empty quality changes container in the extruder stack
Contributes to CURA-2006
2016-08-04 17:36:39 +02:00
Ghostkeeper
50cd98f2bb
Allow extruderValue(s) to fallback to global
If a setting is not defined in the extruder stack, fall back to global. At least it still tries to get the extruder value from the correct stack first. If that stack has no value, then so be it, use global anyway.

Contributes to issue CURA-2024. Also could affect issue CURA-2006.
2016-08-04 16:54:43 +02:00
Arjen Hiemstra
791d51df2a Expose an extruderValue() function to value functions
It can be used to get the value of a specific extruder

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
Arjen Hiemstra
a7187e7fe3 Document getExtruderValues 2016-08-02 19:42:40 +02:00
Arjen Hiemstra
3c35830cb8 Expose an extruderValue() function to value functions
It returns the value of a setting of a specific extruder.

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
Arjen Hiemstra
b102a6cedd Expose an extruderValues() function to value functions
It returns a list of values for all extruders so that things like max()
work.

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
Jaime van Kessel
87b9b17f98 Now the right extruder is actually used (instead of randomly mixing it up)
CURA-1758
2016-07-21 21:42:02 +02:00
Jaime van Kessel
4346d5a233 Settings now point to the right extruder stack
CURA-1758
2016-07-21 20:54:02 +02:00
fieldOfView
a48b3b7398 Select first extruder when switching to a printer
The days of the global tab are numbered

CURA-1758
2016-07-21 15:12:27 +02:00
fieldOfView
97b3dd8f70 Copy values of global-only setting values to all extruders
CURA-1758
2016-07-21 15:12:25 +02:00
fieldOfView
121cd19e83 Disable the settings in the global tab
CURA-1758
2016-07-21 15:12:24 +02:00
fieldOfView
4b7066e55b Fix adding quality profile to stack twice
CURA-1926
2016-07-19 08:29:47 +02:00
fieldOfView
dec94443db Initialise extruder quality profile to a profile that is appropriate for this machine/variant/material
Fixes CURA-1926
2016-07-18 19:39:47 +02:00
Jaime van Kessel
dfd56d049f getActiveExtruderStack now returns stack based on machine_id instead of definiton ID
Contributes to CURA-1898
2016-07-13 13:08:14 +02:00