Added infill overlap percentage in advanced settings.

diff --git a/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py b/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py
index c735febdcf595839699387a905f0939b97fa7c35..e3e46890587d8be8f25fa9110ac6df2b77ec6d93 100644 (file)
--- a/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py
+++ b/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py
@@ -26,7 +26,7 @@ def ifSettingIs(name, value, default):
        return lambda setting: getProfileSetting(name, default) == value
 
 def storedPercentSetting(name):
-       return lambda setting: float(getProfileSetting(name, setting.value)) / 100
+       return lambda setting: float(getProfileSetting(name, setting.value * 100)) / 100
 
 def calculateEdgeWidth(setting):
        wallThickness = float(getProfileSetting('wall_thickness'))
@@ -138,7 +138,7 @@ def getSkeinPyPyProfileInformation():
                        'Grid_Hexagonal': ifSettingIs('infill_type', 'Grid Hexagonal', 'Line'),
                        'Grid_Rectangular': ifSettingIs('infill_type', 'Grid Rectangular', 'Line'),
                        'Line': ifSettingIs('infill_type', 'Line', 'Line'),
-                       'Infill_Perimeter_Overlap_ratio': DEFSET,
+                       'Infill_Perimeter_Overlap_ratio': storedPercentSetting('fill_overlap'),
                        'Infill_Solidity_ratio': storedPercentSetting('fill_density'),
                        'Infill_Width': storedSetting("nozzle_size"),
                        'Solid_Surface_Thickness_layers': calculateSolidLayerCount,

diff --git a/SkeinPyPy_NewUI/newui/advancedConfig.py b/SkeinPyPy_NewUI/newui/advancedConfig.py
index dc54b30d16d83d41ec13761dae702650a8081c50..185af56d36f00f1fb1c89ee3d7384f8415048f64 100644 (file)
--- a/SkeinPyPy_NewUI/newui/advancedConfig.py
+++ b/SkeinPyPy_NewUI/newui/advancedConfig.py
@@ -31,6 +31,7 @@ class advancedConfigWindow(configBase.configWindowBase):
                configBase.TitleRow(left, "Infill")
                c = configBase.SettingRow(left, "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(left, "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.')
+               c = configBase.SettingRow(left, "Infill overlap (%)", 'fill_overlap', '15', 'Amount of overlap between the infill and the walls. There is a slight overlap with the walls and the infill so the walls connect firmly to the infill.')
 
                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.')

diff --git a/SkeinPyPy_NewUI/newui/configWizard.py b/SkeinPyPy_NewUI/newui/configWizard.py
index f8a29ce57e5404386426e6f4de21949f50e29152..5c6360dc0d18ca603ef3f1a354f24ad0c736d5ad 100644 (file)
--- a/SkeinPyPy_NewUI/newui/configWizard.py
+++ b/SkeinPyPy_NewUI/newui/configWizard.py
@@ -104,7 +104,7 @@ class MachineSelectPage(InfoPage):
                        settings.putPreference('machine_width', '80')\r
                        settings.putPreference('machine_depth', '80')\r
                        settings.putPreference('machine_height', '60')\r
-                       settings.putProfileSetting('nozzle_size', '0.4')\r
+                       settings.putProfileSetting('nozzle_size', '0.5')\r
                        settings.putProfileSetting('machine_center_x', '40')\r
                        settings.putProfileSetting('machine_center_y', '40')\r
 \r