Add raft settings towards engine.

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index c7ee435fc1d29421825c9d279bd94a3d4f609bbd..59998bab6f603774e6d228f5400da2feacf20516 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -164,6 +164,7 @@ setting('fill_overlap', 15, int, 'expert', 'Infill').setRange(0,100).setLabel('I
 #setting('joris', False, bool, 'expert', 'Joris').setLabel('Spiralize the outer contour', '[Joris] is a code name for smoothing out the Z move of the outer edge. This will create a steady Z increase over the whole print. It is intended to be used with a single walled wall thickness to make cups/vases.')
 #setting('bridge_speed', 100, int, 'expert', 'Bridge').setRange(0,100).setLabel('Bridge speed (%)', 'Speed at which layers with bridges are printed, compared to normal printing speed.')
 setting('raft_margin', 5, float, 'expert', 'Raft').setRange(0).setLabel('Extra margin (mm)', 'If the raft is enabled, this is the extra raft area around the object which is also rafted. Increasing this margin will create a stronger raft while using more material and leaving less are for your print.')
+setting('raft_line_spacing', 1.0, float, 'expert', 'Raft').setRange(0).setLabel('Line spacing (mm)', 'When you are using the raft this is the distance between the centerlines of the raft line.')
 setting('raft_base_thickness', 0.3, float, 'expert', 'Raft').setRange(0).setLabel('Base thickness (mm)', 'When you are using the raft this is the thickness of the base layer which is put down.')
 setting('raft_base_linewidth', 0.7, float, 'expert', 'Raft').setRange(0).setLabel('Base line width (mm)', 'When you are using the raft this is the width of the base layer lines which are put down.')
 setting('raft_interface_thickness', 0.2, float, 'expert', 'Raft').setRange(0).setLabel('Interface thickness (mm)', 'When you are using the raft this is the thickness of the interface layer which is put down.')

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 38a74f9e56e9aef3ab252fe544bad847115fabeb..ee4c3de7480bcd593ca99b294faa6be0f4d76c55 100644 (file)
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -222,11 +222,16 @@ class Slicer(object):
                        'extruderOffset[3].Y': int(profile.getPreferenceFloat('extruder_offset_y3') * 1000),
                }
                if profile.getProfileSetting('platform_adhesion') == 'Brim':
-                       settings['skirtDistance'] = 0.0
+                       settings['skirtDistance'] = 0
                        settings['skirtLineCount'] = int(profile.getProfileSettingFloat('brim_line_count'))
                elif profile.getProfileSetting('platform_adhesion') == 'Raft':
                        settings['skirtDistance'] = 0
                        settings['skirtLineCount'] = 0
+                       settings['raftMargin'] = int(profile.getProfileSettingFloat('raft_margin') * 1000);
+                       settings['raftBaseThickness'] = int(profile.getProfileSettingFloat('raft_base_thickness') * 1000);
+                       settings['raftBaseLinewidth'] = int(profile.getProfileSettingFloat('raft_base_linewidth') * 1000);
+                       settings['raftInterfaceThickness'] = int(profile.getProfileSettingFloat('raft_interface_thickness') * 1000);
+                       settings['raftInterfaceLinewidth'] = int(profile.getProfileSettingFloat('raft_interface_linewidth') * 1000);
                else:
                        settings['skirtDistance'] = int(profile.getProfileSettingFloat('skirt_gap') * 1000)
                        settings['skirtLineCount'] = int(profile.getProfileSettingFloat('skirt_line_count'))