Removed the bridge material amount setting, this did not only affect bridges, but...

diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index 82f8ee9ac0fb3af828852ea65df0f8c94846ce06..71303960839ec97724ffa6083da9b5adfb2c91ce 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -90,9 +90,6 @@ 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': {
@@ -185,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': calculateBridgeFlow,
+                       'Bridge_Flow_Rate_Multiplier_ratio': storedPercentSetting('bridge_speed'),
                        'Duty_Cyle_at_Beginning_portion': DEFSET,
                        'Duty_Cyle_at_Ending_portion': DEFSET,
                        'Feed_Rate_mm/s': storedSettingFloat("print_speed"),

diff --git a/Cura/gui/expertConfig.py b/Cura/gui/expertConfig.py
index 933bd8e2b09264a6e9356da047e1eac562ac2872..a0602e0ea1be8de411e813825fc62cd49cb3254c 100644 (file)
--- a/Cura/gui/expertConfig.py
+++ b/Cura/gui/expertConfig.py
@@ -52,11 +52,9 @@ class expertConfigWindow(configBase.configWindowBase):
                validators.validFloat(c, 0.0)
 
                configBase.TitleRow(right, "Bridge")
-               c = configBase.SettingRow(right, "Bridge speed (%)", 'bridge_speed', '100', 'Speed at which bridges are printed, compared to normal printing speed.')
+               c = configBase.SettingRow(right, "Bridge speed (%)", 'bridge_speed', '100', 'Speed at which layers with bridges are printed, compared to normal printing speed.')
                validators.validFloat(c, 0.0)
-               c = configBase.SettingRow(right, "Bridge material (%)", 'bridge_material_amount', '100', 'Amount of material used for bridges, increase go extrude more material when printing a bridge.')
-               validators.validFloat(c, 0.0)
-
+               
                configBase.TitleRow(right, "Sequence")
                c = configBase.SettingRow(right, "Print order sequence", 'sequence', ['Loops > Perimeter > Infill', 'Loops > Infill > Perimeter', 'Infill > Loops > Perimeter', 'Infill > Perimeter > Loops', 'Perimeter > Infill > Loops', 'Perimeter > Loops > Infill'], 'Sequence of printing. The perimeter is the outer print edge, the loops are the insides of the walls, and the infill is the insides.');
                c = configBase.SettingRow(right, "Force first layer sequence", 'force_first_layer_sequence', True, 'This setting forces the order of the first layer to be \'Perimeter > Loops > Infill\'')

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index ed885d676953510336ccd9521871887b6fed10e0..0d9e95a7bc12097638b8b8611f212e18ec8f0188 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -212,7 +212,6 @@ class simpleModeWindow(configBase.configWindowBase):
                put('joris', 'False')
                put('cool_min_feedrate', '5')
                put('bridge_speed', '100')
-               put('bridge_material_amount', '100')
                put('raft_margin', '5')
                put('raft_base_material_amount', '100')
                put('raft_interface_material_amount', '100')

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index f223fef87efa261581cb3afd5e36be7d6f2e1e50..e6222509dfd38a540c7f3f3fb549ed2e23c27f83 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -58,7 +58,6 @@ profileDefaultSettings = {
        'enable_raft': 'False',\r
        'cool_min_feedrate': '5',\r
        'bridge_speed': '100',\r
-       'bridge_material_amount': '100',\r
        'raft_margin': '5',\r
        'raft_base_material_amount': '100',\r
        'raft_interface_material_amount': '100',\r