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.

This commit is contained in:
Daid 2012-06-03 08:54:32 +02:00
parent e9a28830b1
commit 6a0addd9de
4 changed files with 3 additions and 10 deletions

View File

@ -90,9 +90,6 @@ def calcLayerSkip(setting):
return 0 return 0
return int(math.ceil((bottomThickness - layerThickness) / layerThickness + 0.0001) - 1) 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(): def getProfileInformation():
return { return {
'carve': { 'carve': {
@ -185,7 +182,7 @@ def getProfileInformation():
'Activate_Speed': "True", 'Activate_Speed': "True",
'Add_Flow_Rate': "True", 'Add_Flow_Rate': "True",
'Bridge_Feed_Rate_Multiplier_ratio': storedPercentSetting('bridge_speed'), '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_Beginning_portion': DEFSET,
'Duty_Cyle_at_Ending_portion': DEFSET, 'Duty_Cyle_at_Ending_portion': DEFSET,
'Feed_Rate_mm/s': storedSettingFloat("print_speed"), 'Feed_Rate_mm/s': storedSettingFloat("print_speed"),

View File

@ -52,9 +52,7 @@ class expertConfigWindow(configBase.configWindowBase):
validators.validFloat(c, 0.0) validators.validFloat(c, 0.0)
configBase.TitleRow(right, "Bridge") 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) validators.validFloat(c, 0.0)
configBase.TitleRow(right, "Sequence") configBase.TitleRow(right, "Sequence")

View File

@ -212,7 +212,6 @@ class simpleModeWindow(configBase.configWindowBase):
put('joris', 'False') put('joris', 'False')
put('cool_min_feedrate', '5') put('cool_min_feedrate', '5')
put('bridge_speed', '100') put('bridge_speed', '100')
put('bridge_material_amount', '100')
put('raft_margin', '5') put('raft_margin', '5')
put('raft_base_material_amount', '100') put('raft_base_material_amount', '100')
put('raft_interface_material_amount', '100') put('raft_interface_material_amount', '100')

View File

@ -58,7 +58,6 @@ profileDefaultSettings = {
'enable_raft': 'False', 'enable_raft': 'False',
'cool_min_feedrate': '5', 'cool_min_feedrate': '5',
'bridge_speed': '100', 'bridge_speed': '100',
'bridge_material_amount': '100',
'raft_margin': '5', 'raft_margin': '5',
'raft_base_material_amount': '100', 'raft_base_material_amount': '100',
'raft_interface_material_amount': '100', 'raft_interface_material_amount': '100',