From: daid Date: Wed, 14 Mar 2012 15:01:06 +0000 (+0100) Subject: Added infill overlap percentage in advanced settings. X-Git-Tag: RC1~93 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3316f6da96c1e16fb18bbff746ff7a5dd50a4288;p=cura.git Added infill overlap percentage in advanced settings. --- diff --git a/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py b/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py index c735febd..e3e46890 100644 --- 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 dc54b30d..185af56d 100644 --- 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 f8a29ce5..5c6360dc 100644 --- a/SkeinPyPy_NewUI/newui/configWizard.py +++ b/SkeinPyPy_NewUI/newui/configWizard.py @@ -104,7 +104,7 @@ class MachineSelectPage(InfoPage): settings.putPreference('machine_width', '80') settings.putPreference('machine_depth', '80') settings.putPreference('machine_height', '60') - settings.putProfileSetting('nozzle_size', '0.4') + settings.putProfileSetting('nozzle_size', '0.5') settings.putProfileSetting('machine_center_x', '40') settings.putProfileSetting('machine_center_y', '40')