Add steamengine support configuration.

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 3a444a78bd716021afcb1bea44eef732c711485f..9c62b32304d3266b3f414dff6a040e866544cafd 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -583,8 +583,8 @@ class normalSettingsPanel(configBase.configPanelBase):
                        c = configBase.SettingRow(right, "Bed temperature", 'print_bed_temperature', '0', 'Temperature used for the heated printer bed. Set at 0 to pre-heat yourself')
                        validators.validFloat(c, 0.0, 340.0)
 
-#              configBase.TitleRow(right, "Support structure")
-#              c = configBase.SettingRow(right, "Support type", 'support', ['None', 'Exterior Only', 'Everywhere'], 'Type of support structure build.\n"Exterior only" is the most commonly used support setting.\n\nNone does not do any support.\nExterior only only creates support where the support structure will touch the build platform.\nEverywhere creates support even on the insides of the model.')
+               configBase.TitleRow(right, "Support structure")
+               c = configBase.SettingRow(right, "Support type", 'support', ['None', 'Touching buildplate', 'Everywhere'], 'Type of support structure build.\n"Exterior only" is the most commonly used support setting.\n\nNone does not do any support.\nTouching buildplate only creates support where the support structure will touch the build platform.\nEverywhere creates support even on the insides of the model.')
 #              c = configBase.SettingRow(right, "Add raft", 'enable_raft', False, 'A raft is a few layers of lines below the bottom of the object. It prevents warping. Full raft settings can be found in the expert settings.\nFor PLA this is usually not required. But if you print with ABS it is almost required.')
 #              if int(profile.getPreference('extruder_amount')) > 1:
 #                      c = configBase.SettingRow(right, "Support dual extrusion", 'support_dual_extrusion', False, 'Print the support material with the 2nd extruder in a dual extrusion setup. The primary extruder will be used for normal material, while the second extruder is used to print support material.')

diff --git a/Cura/slice/__main__.py b/Cura/slice/__main__.py
index 5501adc7af7430eb059008ae87946bb4244626aa..8adaf6fce68d50574195876dfe3bfaad15c29909 100644 (file)
--- a/Cura/slice/__main__.py
+++ b/Cura/slice/__main__.py
@@ -72,6 +72,8 @@ def main():
                        settings['printSpeed'] = int(profile.getProfileSettingFloat('print_speed'))
                        settings['moveSpeed'] = int(profile.getProfileSettingFloat('travel_speed'))
                        settings['fanOnLayerNr'] = int(profile.getProfileSettingFloat('fan_layer'))
+                       settings['supportAngle'] = int(60) if profile.getProfileSetting('support') != 'None' else int(-1)
+                       settings['supportEverywhere'] = int(1) if profile.getProfileSetting('support') == 'Everywhere' else int(0)
 
                        cmdList = [steamEngineFilename, args[idx+1], '-o', options.output, '-m', ','.join(map(str, position[2:]))]
                        for (key, value) in settings.items():