chiark / gitweb /
Fixes #56 - Adjust the flowrate of bridges with the speed setting
authordaid <daid303@gmail.com>
Mon, 16 Apr 2012 10:26:55 +0000 (12:26 +0200)
committerdaid <daid303@gmail.com>
Mon, 16 Apr 2012 10:26:55 +0000 (12:26 +0200)
Cura/cura_sf/fabmetheus_utilities/settings.py
Cura/util/profile.py

index 58b82ce51b1c10924ad69b6039456ed2c60f07d6..f95c2d28a461438670c6458ff520edb829a3a401 100644 (file)
@@ -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"),
index 8735152db0c237da613284daf75319f028b4aca9..bee1ef3fc8468b1b14e0ff8bd6a3e9f3ee42b40c 100644 (file)
@@ -65,7 +65,7 @@ profileDefaultSettings = {
        'raft_margin': '5',\r
        'raft_base_material_amount': '100',\r
        'raft_interface_material_amount': '100',\r
-       'bottom_thickness': '0.0',\r
+       'bottom_thickness': '0.3',\r
 }\r
 preferencesDefaultSettings = {\r
        'wizardDone': 'False',\r