From: daid <daid303@gmail.com>
Date: Tue, 20 Mar 2012 14:59:31 +0000 (+0100)
Subject: Added raft settings for #24
X-Git-Tag: RC1~47
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d60d30a1d2e4b5743d61b75debf77dfe40973d4d;p=cura.git

Added raft settings for #24
---

diff --git a/SkeinPyPy/fabmetheus_utilities/settings.py b/SkeinPyPy/fabmetheus_utilities/settings.py
index c7bd1e5b..7678b599 100644
--- a/SkeinPyPy/fabmetheus_utilities/settings.py
+++ b/SkeinPyPy/fabmetheus_utilities/settings.py
@@ -198,7 +198,7 @@ def getSkeinPyPyProfileInformation():
 			'Activate_Raft': "True",
 			'Add_Raft,_Elevate_Nozzle,_Orbit': DEFSET,
 			'Base_Feed_Rate_Multiplier_ratio': DEFSET,
-			'Base_Flow_Rate_Multiplier_ratio': DEFSET,
+			'Base_Flow_Rate_Multiplier_ratio': storedPercentSetting('raft_base_material_amount'),
 			'Base_Infill_Density_ratio': DEFSET,
 			'Base_Layer_Thickness_over_Layer_Thickness': DEFSET,
 			'Base_Layers_integer': raftLayerCount,
@@ -206,7 +206,7 @@ def getSkeinPyPyProfileInformation():
 			'Initial_Circling': DEFSET,
 			'Infill_Overhang_over_Extrusion_Width_ratio': DEFSET,
 			'Interface_Feed_Rate_Multiplier_ratio': DEFSET,
-			'Interface_Flow_Rate_Multiplier_ratio': DEFSET,
+			'Interface_Flow_Rate_Multiplier_ratio': storedPercentSetting('raft_interface_material_amount'),
 			'Interface_Infill_Density_ratio': DEFSET,
 			'Interface_Layer_Thickness_over_Layer_Thickness': DEFSET,
 			'Interface_Layers_integer': raftLayerCount,
@@ -215,11 +215,11 @@ def getSkeinPyPyProfileInformation():
 			'Name_of_Support_Start_File': DEFSET,
 			'Operating_Nozzle_Lift_over_Layer_Thickness_ratio': DEFSET,
 			'Raft_Additional_Margin_over_Length_%': DEFSET,
-			'Raft_Margin_mm': DEFSET,
+			'Raft_Margin_mm': storedSetting('raft_margin'),
 			'Support_Cross_Hatch': 'False',
 			'Support_Flow_Rate_over_Operating_Flow_Rate_ratio': storedPercentSetting('support_rate'),
 			'Support_Gap_over_Perimeter_Extrusion_Width_ratio': calcSupportDistanceRatio,
-			'Support_Material_Choice_': storedSetting("support"),
+			'Support_Material_Choice_': storedSetting('support'),
 			'Support_Minimum_Angle_degrees': DEFSET,
 		},'skirt': {
 			'Skirt_line_count': storedSetting("skirt_line_count"),
diff --git a/SkeinPyPy/newui/advancedConfig.py b/SkeinPyPy/newui/advancedConfig.py
index 38550461..8312e8b4 100644
--- a/SkeinPyPy/newui/advancedConfig.py
+++ b/SkeinPyPy/newui/advancedConfig.py
@@ -32,6 +32,11 @@ class advancedConfigWindow(configBase.configWindowBase):
 		configBase.TitleRow(left, "Joris")
 		c = configBase.SettingRow(left, "Joris the outer edge", 'joris', False, '[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.')
 
+		configBase.TitleRow(left, "Raft (if enabled)")
+		c = configBase.SettingRow(left, "Raft extra margin (mm)", 'raft_margin', '3.0', '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.')
+		c = configBase.SettingRow(left, "Raft base material amount (%)", 'raft_base_material_amount', '100', 'The base layer is the first layer put down as a raft. This layer has thick strong lines and is put firmly on the bed to prevent warping. This setting adjust the amount of material used for the base layer.')
+		c = configBase.SettingRow(left, "Raft interface material amount (%)", 'raft_interface_material_amount', '100', 'The interface layer is a weak thin layer between the base layer and the printed object. It is designed to has little material to make it easy to break the base off the printed object. This setting adjusts the amount of material used for the interface layer.')
+
 		configBase.TitleRow(right, "Infill")
 		c = configBase.SettingRow(right, "Infill pattern", 'infill_type', ['Line', 'Grid Circular', 'Grid Hexagonal', 'Grid Rectangular'], 'Pattern of the none-solid infill. Line is default, but grids can provide a strong print.')
 		c = configBase.SettingRow(right, "Solid infill top", 'solid_top', True, 'Create a solid top surface, if set to false the top is filled with the fill percentage. Useful for cups/vases.')
diff --git a/SkeinPyPy/newui/profile.py b/SkeinPyPy/newui/profile.py
index 54489c30..ec415b76 100644
--- a/SkeinPyPy/newui/profile.py
+++ b/SkeinPyPy/newui/profile.py
@@ -50,6 +50,9 @@ profileDefaultSettings = {
 	'cool_min_feedrate': '5',
 	'bridge_speed': '100',
 	'bridge_material_amount': '100',
+	'raft_margin': '5',
+	'raft_base_material_amount': '100',
+	'raft_interface_material_amount': '100',
 }
 preferencesDefaultSettings = {
 	'wizardDone': 'False',