From: daid Date: Mon, 16 Apr 2012 10:26:55 +0000 (+0200) Subject: Fixes #56 - Adjust the flowrate of bridges with the speed setting X-Git-Tag: RC3~74 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3ca97578c3864f0d46ae5adfb327872e9b5c0431;p=cura.git Fixes #56 - Adjust the flowrate of bridges with the speed setting --- diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py index 58b82ce5..f95c2d28 100644 --- a/Cura/cura_sf/fabmetheus_utilities/settings.py +++ b/Cura/cura_sf/fabmetheus_utilities/settings.py @@ -90,6 +90,9 @@ def calcLayerSkip(setting): return 0 return int(math.ceil((bottomThickness - layerThickness) / layerThickness + 0.0001) - 1) +def calculateBridgeFlow(setting): + return (profile.getProfileSettingFloat('bridge_speed') / 100) * (profile.getProfileSettingFloat('bridge_material_amount') / 100) + def getProfileInformation(): return { 'carve': { @@ -179,7 +182,7 @@ def getProfileInformation(): 'Activate_Speed': "True", 'Add_Flow_Rate': "True", 'Bridge_Feed_Rate_Multiplier_ratio': storedPercentSetting('bridge_speed'), - 'Bridge_Flow_Rate_Multiplier_ratio': storedPercentSetting('bridge_material_amount'), + 'Bridge_Flow_Rate_Multiplier_ratio': calculateBridgeFlow, 'Duty_Cyle_at_Beginning_portion': DEFSET, 'Duty_Cyle_at_Ending_portion': DEFSET, 'Feed_Rate_mm/s': storedSettingFloat("print_speed"), diff --git a/Cura/util/profile.py b/Cura/util/profile.py index 8735152d..bee1ef3f 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -65,7 +65,7 @@ profileDefaultSettings = { 'raft_margin': '5', 'raft_base_material_amount': '100', 'raft_interface_material_amount': '100', - 'bottom_thickness': '0.0', + 'bottom_thickness': '0.3', } preferencesDefaultSettings = { 'wizardDone': 'False',