From: Daid <daid303@gmail.com>
Date: Sun, 3 Jun 2012 06:54:32 +0000 (+0200)
Subject: Removed the bridge material amount setting, this did not only affect bridges, but... 
X-Git-Tag: 12.07~44^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6a0addd9deaea7431d801bb563745475a266a00e;p=cura.git

Removed the bridge material amount setting, this did not only affect bridges, but the whole layer the bridge is in, so it did not work properly.
---

diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index 82f8ee9a..71303960 100644
--- 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 933bd8e2..a0602e0e 100644
--- 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 ed885d67..0d9e95a7 100644
--- 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 f223fef8..e6222509 100644
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -58,7 +58,6 @@ profileDefaultSettings = {
 	'enable_raft': 'False',
 	'cool_min_feedrate': '5',
 	'bridge_speed': '100',
-	'bridge_material_amount': '100',
 	'raft_margin': '5',
 	'raft_base_material_amount': '100',
 	'raft_interface_material_amount': '100',