bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed a small issue in the Calculators Tool Cut Z default value; added a confirmation message for Electroplating calculator

Browse Source
This commit is contained in:
Marius Stanciu
2020-11-15 16:35:23 +02:00
committed by Marius
parent 612c010083
commit 141dd56816
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta
- updated the source file when creating Excellon objects in various places in the app - updated the source file when creating Excellon objects in various places in the app
- working in Milling Tool - working in Milling Tool
- updated the Calculators Tool such that now the Cut Z parameter for V-tip tool calculator can be calculated from the other parameters too - updated the Calculators Tool such that now the Cut Z parameter for V-tip tool calculator can be calculated from the other parameters too
- fixed a small issue in the Calculators Tool Cut Z default value; added a confirmation message for Electroplating calculator
14.11.2020 14.11.2020

5
appTools/ToolCalculators.py
View File

@@ -102,7 +102,7 @@ class ToolCalculator(AppTool):
self.ui.tipDia_entry.set_value(tip_dia) self.ui.tipDia_entry.set_value(tip_dia)
self.ui.tipAngle_entry.set_value(tip_angle) self.ui.tipAngle_entry.set_value(tip_angle)
self.ui.cutDepth_entry.set_value(cut_z) self.ui.cutDepth_entry.set_value(cut_z)
self.ui.effectiveToolDia_entry.set_value('0.0000') self.on_calculate_tool_dia()
self.ui.area_sel_radio.set_value('d') self.ui.area_sel_radio.set_value('d')
self.on_area_calculation_radio(val='d') self.on_area_calculation_radio(val='d')
@@ -181,7 +181,7 @@ class ToolCalculator(AppTool):
self.ui_connect() self.ui_connect()
return return
cut_depth = (tooldia - tip_diameter) / (2 * math.tan(math.radians(half_tip_angle))) cut_depth = (tooldia - tip_diameter) / (2 * math.tan(math.radians(half_tip_angle))) * -1
self.ui.cutDepth_entry.set_value(self.app.dec_format(cut_depth, self.decimals)) self.ui.cutDepth_entry.set_value(self.app.dec_format(cut_depth, self.decimals))
self.app.inform.emit('[success] %s' % _("Cut depth (Cut Z) calculated.")) self.app.inform.emit('[success] %s' % _("Cut depth (Cut Z) calculated."))
@@ -212,6 +212,7 @@ class ToolCalculator(AppTool):
self.ui.cvalue_entry.set_value('%.2f' % calculated_current) self.ui.cvalue_entry.set_value('%.2f' % calculated_current)
self.ui.time_entry.set_value('%.1f' % calculated_time) self.ui.time_entry.set_value('%.1f' % calculated_time)
self.app.inform.emit('[success] %s' % _("Done."))
def ui_connect(self): def ui_connect(self):
self.ui.cutDepth_entry.valueChanged.connect(self.on_calculate_tool_dia) self.ui.cutDepth_entry.valueChanged.connect(self.on_calculate_tool_dia)

2
defaults.py
View File

@@ -561,7 +561,7 @@ class FlatCAMDefaults:
# Calculators Tool # Calculators Tool
"tools_calc_vshape_tip_dia": 0.2, "tools_calc_vshape_tip_dia": 0.2,
"tools_calc_vshape_tip_angle": 30, "tools_calc_vshape_tip_angle": 30,
"tools_calc_vshape_cut_z": 0.05, "tools_calc_vshape_cut_z": -0.05,
"tools_calc_electro_length": 10.0, "tools_calc_electro_length": 10.0,
"tools_calc_electro_width": 10.0, "tools_calc_electro_width": 10.0,
"tools_calc_electro_area": 100.0, "tools_calc_electro_area": 100.0,