From 141dd568165f1c0b77f48fe3d1225035f4c44149 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 15 Nov 2020 16:35:23 +0200 Subject: [PATCH] - fixed a small issue in the Calculators Tool Cut Z default value; added a confirmation message for Electroplating calculator --- CHANGELOG.md | 1 + appTools/ToolCalculators.py | 5 +++-- defaults.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c204b9b..43b92fd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta - updated the source file when creating Excellon objects in various places in the app - 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 +- fixed a small issue in the Calculators Tool Cut Z default value; added a confirmation message for Electroplating calculator 14.11.2020 diff --git a/appTools/ToolCalculators.py b/appTools/ToolCalculators.py index 732d6d85..9840e329 100644 --- a/appTools/ToolCalculators.py +++ b/appTools/ToolCalculators.py @@ -102,7 +102,7 @@ class ToolCalculator(AppTool): self.ui.tipDia_entry.set_value(tip_dia) self.ui.tipAngle_entry.set_value(tip_angle) 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.on_area_calculation_radio(val='d') @@ -181,7 +181,7 @@ class ToolCalculator(AppTool): self.ui_connect() 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.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.time_entry.set_value('%.1f' % calculated_time) + self.app.inform.emit('[success] %s' % _("Done.")) def ui_connect(self): self.ui.cutDepth_entry.valueChanged.connect(self.on_calculate_tool_dia) diff --git a/defaults.py b/defaults.py index 13ea8e87..ed29bf94 100644 --- a/defaults.py +++ b/defaults.py @@ -561,7 +561,7 @@ class FlatCAMDefaults: # Calculators Tool "tools_calc_vshape_tip_dia": 0.2, "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_width": 10.0, "tools_calc_electro_area": 100.0,