diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index f31c5bc8..e6fc11f3 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -895,6 +895,13 @@ class App(QtCore.QObject):
"tools_fiducials_type": 'circular',
"tools_fiducials_line_thickness": 0.25,
+ # Calibration Tool
+ "tools_cal_calsource": 'object',
+ "tools_cal_travelz": 2.0,
+ "tools_cal_verz": 0.1,
+ "tools_cal_zeroz": False,
+ "tools_cal_toolchangez": 15,
+
# Utilities
# file associations
"fa_excellon": 'drd, drl, exc, ncd, tap, xln',
@@ -1469,6 +1476,13 @@ class App(QtCore.QObject):
"tools_fiducials_type": self.ui.tools2_defaults_form.tools2_fiducials_group.fid_type_radio,
"tools_fiducials_line_thickness": self.ui.tools2_defaults_form.tools2_fiducials_group.line_thickness_entry,
+ # Calibration Tool
+ "tools_cal_calsource": self.ui.tools2_defaults_form.tools2_cal_group.cal_source_radio,
+ "tools_cal_travelz": self.ui.tools2_defaults_form.tools2_cal_group.travelz_entry,
+ "tools_cal_verz": self.ui.tools2_defaults_form.tools2_cal_group.verz_entry,
+ "tools_cal_zeroz": self.ui.tools2_defaults_form.tools2_cal_group.zeroz_cb,
+ "tools_cal_toolchangez": self.ui.tools2_defaults_form.tools2_cal_group.toolchangez_entry,
+
# Utilities
# File associations
"fa_excellon": self.ui.util_defaults_form.fa_excellon_group.exc_list_text,
@@ -2964,7 +2978,7 @@ class App(QtCore.QObject):
self.dblsidedtool = DblSidedTool(self)
self.dblsidedtool.install(icon=QtGui.QIcon('share/doubleside16.png'), separator=True)
- self.cal_exc_tool = ToolCalibrate(self)
+ self.cal_exc_tool = ToolCalibration(self)
self.cal_exc_tool.install(icon=QtGui.QIcon('share/drill16.png'), pos=self.ui.menutool,
before=self.dblsidedtool.menuAction,
separator=False)
@@ -7312,14 +7326,26 @@ class App(QtCore.QObject):
else:
location = custom_location
+ units = self.defaults['units'].upper()
+
if fit_center:
self.plotcanvas.fit_center(loc=location)
cursor = QtGui.QCursor()
if self.is_legacy is False:
+ # I don't know where those differences come from but they are constant for the current
+ # execution of the application and they are multiples of a value around 0.0263mm.
+ # In a random way sometimes they are more sometimes they are less
+ # if units == 'MM':
+ # cal_factor = 0.0263
+ # else:
+ # cal_factor = 0.0263 / 25.4
+
+ cal_location = (location[0], location[1])
+
canvas_origin = self.plotcanvas.native.mapToGlobal(QtCore.QPoint(0, 0))
- jump_loc = self.plotcanvas.translate_coords_2((location[0], location[1]))
+ jump_loc = self.plotcanvas.translate_coords_2((cal_location[0], cal_location[1]))
j_pos = (canvas_origin.x() + jump_loc[0], (canvas_origin.y() + jump_loc[1]))
cursor.setPos(j_pos[0], j_pos[1])
else:
@@ -7363,6 +7389,7 @@ class App(QtCore.QObject):
obj_init.follow_geometry = deepcopy(obj.follow_geometry)
except AttributeError:
pass
+
try:
obj_init.apertures = deepcopy(obj.apertures)
except AttributeError:
diff --git a/README.md b/README.md
index 754797ec..abceca59 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,12 @@ CAD program, and create G-Code for Isolation routing.
=================================================
+9.12.2019
+
+- updated the border for fit view on OpenGL graphic mode
+- Calibration Tool - added preferences values
+- Calibration Tool - more work on it
+
8.12.2019
- Calibrate Tool - rearranged the GUI
diff --git a/flatcamGUI/ObjectUI.py b/flatcamGUI/ObjectUI.py
index 0592ef59..26c53133 100644
--- a/flatcamGUI/ObjectUI.py
+++ b/flatcamGUI/ObjectUI.py
@@ -1596,6 +1596,10 @@ class GeometryObjectUI(ObjectUI):
self.grid3.addWidget(separator_line2, 19, 0, 1, 2)
self.apply_param_to_all = FCButton(_("Apply parameters to all tools"))
+ self.apply_param_to_all.setToolTip(
+ _("The parameters in the current form will be applied\n"
+ "on all the tools from the Tool Table.")
+ )
self.grid3.addWidget(self.apply_param_to_all, 20, 0, 1, 2)
self.grid3.addWidget(QtWidgets.QLabel(''), 21, 0, 1, 2)
diff --git a/flatcamGUI/PlotCanvas.py b/flatcamGUI/PlotCanvas.py
index 5aa210d6..174617e0 100644
--- a/flatcamGUI/PlotCanvas.py
+++ b/flatcamGUI/PlotCanvas.py
@@ -334,12 +334,32 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
except TypeError:
pass
- # adjust the view camera to be slightly bigger than the bounds so the shape colleaction can be seen clearly
+ # adjust the view camera to be slightly bigger than the bounds so the shape collection can be seen clearly
# otherwise the shape collection boundary will have no border
- rect.left *= 0.96
- rect.bottom *= 0.96
- rect.right *= 1.01
- rect.top *= 1.01
+ dx = rect.right - rect.left
+ dy = rect.top - rect.bottom
+ x_factor = dx * 0.02
+ y_factor = dy * 0.02
+
+ rect.left -= x_factor
+ rect.bottom -= y_factor
+ rect.right += x_factor
+ rect.top += y_factor
+
+ # rect.left *= 0.96
+ # rect.bottom *= 0.96
+ # rect.right *= 1.04
+ # rect.top *= 1.04
+
+ # units = self.fcapp.defaults['units'].upper()
+ # if units == 'MM':
+ # compensation = 0.5
+ # else:
+ # compensation = 0.5 / 25.4
+ # rect.left -= compensation
+ # rect.bottom -= compensation
+ # rect.right += compensation
+ # rect.top += compensation
self.view.camera.rect = rect
diff --git a/flatcamGUI/PreferencesUI.py b/flatcamGUI/PreferencesUI.py
index 583245da..17dcac52 100644
--- a/flatcamGUI/PreferencesUI.py
+++ b/flatcamGUI/PreferencesUI.py
@@ -237,6 +237,9 @@ class Tools2PreferencesUI(QtWidgets.QWidget):
self.tools2_fiducials_group = Tools2FiducialsPrefGroupUI(decimals=self.decimals)
self.tools2_fiducials_group.setMinimumWidth(220)
+ self.tools2_cal_group = Tools2CalPrefGroupUI(decimals=self.decimals)
+ self.tools2_cal_group.setMinimumWidth(220)
+
self.vlay = QtWidgets.QVBoxLayout()
self.vlay.addWidget(self.tools2_checkrules_group)
self.vlay.addWidget(self.tools2_optimal_group)
@@ -249,6 +252,7 @@ class Tools2PreferencesUI(QtWidgets.QWidget):
self.vlay3 = QtWidgets.QVBoxLayout()
self.vlay3.addWidget(self.tools2_fiducials_group)
+ self.vlay3.addWidget(self.tools2_cal_group)
self.layout.addLayout(self.vlay)
self.layout.addLayout(self.vlay1)
@@ -6291,7 +6295,7 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
super(Tools2FiducialsPrefGroupUI, self).__init__(self)
- self.setTitle(str(_("Fiducials Tools Options")))
+ self.setTitle(str(_("Fiducials Tool Options")))
self.decimals = decimals
# ## Grid Layout
@@ -6402,6 +6406,98 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
self.layout.addStretch()
+class Tools2CalPrefGroupUI(OptionsGroupUI):
+ def __init__(self, decimals=4, parent=None):
+
+ super(Tools2CalPrefGroupUI, self).__init__(self)
+
+ self.setTitle(str(_("Calibration Tool Options")))
+ self.decimals = decimals
+
+ # ## Grid Layout
+ grid_lay = QtWidgets.QGridLayout()
+ self.layout.addLayout(grid_lay)
+ grid_lay.setColumnStretch(0, 0)
+ grid_lay.setColumnStretch(1, 1)
+
+ self.param_label = QtWidgets.QLabel('%s:' % _('Parameters'))
+ self.param_label.setToolTip(
+ _("Parameters used for this tool.")
+ )
+ grid_lay.addWidget(self.param_label, 0, 0, 1, 2)
+
+ # Calibration source
+ self.cal_source_lbl = QtWidgets.QLabel("%s:" % _("Source Type"))
+ self.cal_source_lbl.setToolTip(_("The source of calibration points.\n"
+ "It can be:\n"
+ "- Object -> click a hole geo for Excellon or a pad for Gerber\n"
+ "- Free -> click freely on canvas to acquire the calibration points"))
+ self.cal_source_radio = RadioSet([{'label': _('Object'), 'value': 'object'},
+ {'label': _('Free'), 'value': 'free'}],
+ stretch=False)
+
+ grid_lay.addWidget(self.cal_source_lbl, 1, 0)
+ grid_lay.addWidget(self.cal_source_radio, 1, 1, 1, 2)
+
+ separator_line = QtWidgets.QFrame()
+ separator_line.setFrameShape(QtWidgets.QFrame.HLine)
+ separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
+ grid_lay.addWidget(separator_line, 2, 0, 1, 2)
+
+ # Travel Z entry
+ travelz_lbl = QtWidgets.QLabel('%s:' % _("Travel Z"))
+ travelz_lbl.setToolTip(
+ _("Height (Z) for travelling between the points.")
+ )
+
+ self.travelz_entry = FCDoubleSpinner()
+ self.travelz_entry.set_range(-9999.9999, 9999.9999)
+ self.travelz_entry.set_precision(self.decimals)
+ self.travelz_entry.setSingleStep(0.1)
+
+ grid_lay.addWidget(travelz_lbl, 3, 0)
+ grid_lay.addWidget(self.travelz_entry, 3, 1, 1, 2)
+
+ # Verification Z entry
+ verz_lbl = QtWidgets.QLabel('%s:' % _("Verification Z"))
+ verz_lbl.setToolTip(
+ _("Height (Z) for checking the point.")
+ )
+
+ self.verz_entry = FCDoubleSpinner()
+ self.verz_entry.set_range(-9999.9999, 9999.9999)
+ self.verz_entry.set_precision(self.decimals)
+ self.verz_entry.setSingleStep(0.1)
+
+ grid_lay.addWidget(verz_lbl, 4, 0)
+ grid_lay.addWidget(self.verz_entry, 4, 1, 1, 2)
+
+ # Zero the Z of the verification tool
+ self.zeroz_cb = FCCheckBox('%s' % _("Zero Z tool"))
+ self.zeroz_cb.setToolTip(
+ _("Include a sequence to zero the height (Z)\n"
+ "of the verification tool.")
+ )
+
+ grid_lay.addWidget(self.zeroz_cb, 5, 0, 1, 3)
+
+ # Toochange Z entry
+ toolchangez_lbl = QtWidgets.QLabel('%s:' % _("Toolchange Z"))
+ toolchangez_lbl.setToolTip(
+ _("Height (Z) for mounting the verification probe.")
+ )
+
+ self.toolchangez_entry = FCDoubleSpinner()
+ self.toolchangez_entry.set_range(0.0000, 9999.9999)
+ self.toolchangez_entry.set_precision(self.decimals)
+ self.toolchangez_entry.setSingleStep(0.1)
+
+ grid_lay.addWidget(toolchangez_lbl, 6, 0)
+ grid_lay.addWidget(self.toolchangez_entry, 6, 1, 1, 2)
+
+ self.layout.addStretch()
+
+
class FAExcPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
# OptionsGroupUI.__init__(self, "Excellon File associations Preferences", parent=None)
diff --git a/flatcamGUI/VisPyPatches.py b/flatcamGUI/VisPyPatches.py
index de249d82..71fa4d26 100644
--- a/flatcamGUI/VisPyPatches.py
+++ b/flatcamGUI/VisPyPatches.py
@@ -117,18 +117,21 @@ def apply_patches():
minor.extend(np.linspace(maj + minstep,
maj + majstep - minstep,
minor_num))
+
major_frac = (major - offset) / scale
- minor_frac = (np.array(minor) - offset) / scale
major_frac = major_frac[::-1] if flip else major_frac
use_mask = (major_frac > -0.0001) & (major_frac < 1.0001)
major_frac = major_frac[use_mask]
labels = [l for li, l in enumerate(labels) if use_mask[li]]
- minor_frac = minor_frac[(minor_frac > -0.0001) &
- (minor_frac < 1.0001)]
+
+ minor_frac = (np.array(minor) - offset) / scale
+ use_minor_mask = (minor_frac > -0.0001) & (minor_frac < 1.0001)
+ minor_frac = minor_frac[use_minor_mask]
+
+ return major_frac, minor_frac, labels
elif self.axis.scale_type == 'logarithmic':
return NotImplementedError
elif self.axis.scale_type == 'power':
return NotImplementedError
- return major_frac, minor_frac, labels
Ticker._get_tick_frac_labels = _get_tick_frac_labels
diff --git a/flatcamTools/ToolCalibrate.py b/flatcamTools/ToolCalibration.py
similarity index 85%
rename from flatcamTools/ToolCalibrate.py
rename to flatcamTools/ToolCalibration.py
index 24821116..e146b7c6 100644
--- a/flatcamTools/ToolCalibrate.py
+++ b/flatcamTools/ToolCalibration.py
@@ -30,9 +30,9 @@ if '_' not in builtins.__dict__:
log = logging.getLogger('base')
-class ToolCalibrate(FlatCAMTool):
+class ToolCalibration(FlatCAMTool):
- toolName = _("Calibrate Tool")
+ toolName = _("Calibration Tool")
def __init__(self, app):
FlatCAMTool.__init__(self, app)
@@ -388,10 +388,7 @@ class ToolCalibrate(FlatCAMTool):
""")
grid_lay.addWidget(self.generate_factors_button, 20, 0, 1, 3)
- scale_lbl = QtWidgets.QLabel('%s' % _("Scale Factors"))
- grid_lay.addWidget(scale_lbl, 21, 0, 1, 3)
-
- self.scalex_label = QtWidgets.QLabel(_("Factor X:"))
+ self.scalex_label = QtWidgets.QLabel(_("Scale Factor X:"))
self.scalex_label.setToolTip(
_("Factor for Scale action over X axis.")
)
@@ -400,10 +397,10 @@ class ToolCalibrate(FlatCAMTool):
self.scalex_entry.set_precision(self.decimals)
self.scalex_entry.setSingleStep(0.1)
- grid_lay.addWidget(self.scalex_label, 22, 0)
- grid_lay.addWidget(self.scalex_entry, 22, 1, 1, 2)
+ grid_lay.addWidget(self.scalex_label, 21, 0)
+ grid_lay.addWidget(self.scalex_entry, 21, 1, 1, 2)
- self.scaley_label = QtWidgets.QLabel(_("Factor Y:"))
+ self.scaley_label = QtWidgets.QLabel(_("Scale Factor Y:"))
self.scaley_label.setToolTip(
_("Factor for Scale action over Y axis.")
)
@@ -412,8 +409,8 @@ class ToolCalibrate(FlatCAMTool):
self.scaley_entry.set_precision(self.decimals)
self.scaley_entry.setSingleStep(0.1)
- grid_lay.addWidget(self.scaley_label, 23, 0)
- grid_lay.addWidget(self.scaley_entry, 23, 1, 1, 2)
+ grid_lay.addWidget(self.scaley_label, 22, 0)
+ grid_lay.addWidget(self.scaley_entry, 22, 1, 1, 2)
self.scale_button = QtWidgets.QPushButton(_("Apply Scale Factors"))
self.scale_button.setToolTip(
@@ -425,12 +422,9 @@ class ToolCalibrate(FlatCAMTool):
font-weight: bold;
}
""")
- grid_lay.addWidget(self.scale_button, 24, 0, 1, 3)
+ grid_lay.addWidget(self.scale_button, 23, 0, 1, 3)
- skew_lbl = QtWidgets.QLabel('%s' % _("Skew Factors"))
- grid_lay.addWidget(skew_lbl, 25, 0, 1, 3)
-
- self.skewx_label = QtWidgets.QLabel(_("Angle X:"))
+ self.skewx_label = QtWidgets.QLabel(_("Skew Angle X:"))
self.skewx_label.setToolTip(
_("Angle for Skew action, in degrees.\n"
"Float number between -360 and 359.")
@@ -440,10 +434,10 @@ class ToolCalibrate(FlatCAMTool):
self.skewx_entry.set_precision(self.decimals)
self.skewx_entry.setSingleStep(0.1)
- grid_lay.addWidget(self.skewx_label, 26, 0)
- grid_lay.addWidget(self.skewx_entry, 26, 1, 1, 2)
+ grid_lay.addWidget(self.skewx_label, 24, 0)
+ grid_lay.addWidget(self.skewx_entry, 24, 1, 1, 2)
- self.skewy_label = QtWidgets.QLabel(_("Angle Y:"))
+ self.skewy_label = QtWidgets.QLabel(_("Skew Angle Y:"))
self.skewy_label.setToolTip(
_("Angle for Skew action, in degrees.\n"
"Float number between -360 and 359.")
@@ -453,8 +447,8 @@ class ToolCalibrate(FlatCAMTool):
self.skewy_entry.set_precision(self.decimals)
self.skewy_entry.setSingleStep(0.1)
- grid_lay.addWidget(self.skewy_label, 27, 0)
- grid_lay.addWidget(self.skewy_entry, 27, 1, 1, 2)
+ grid_lay.addWidget(self.skewy_label, 25, 0)
+ grid_lay.addWidget(self.skewy_entry, 25, 1, 1, 2)
self.skew_button = QtWidgets.QPushButton(_("Apply Skew Factors"))
self.skew_button.setToolTip(
@@ -466,14 +460,71 @@ class ToolCalibrate(FlatCAMTool):
font-weight: bold;
}
""")
- grid_lay.addWidget(self.skew_button, 28, 0, 1, 3)
+ grid_lay.addWidget(self.skew_button, 26, 0, 1, 3)
+
+ # final_factors_lbl = QtWidgets.QLabel('%s' % _("Final Factors"))
+ # final_factors_lbl.setToolTip(
+ # _("Generate verification GCode file adjusted with\n"
+ # "the factors above.")
+ # )
+ # grid_lay.addWidget(final_factors_lbl, 27, 0, 1, 3)
+ #
+ # self.fin_scalex_label = QtWidgets.QLabel(_("Scale Factor X:"))
+ # self.fin_scalex_label.setToolTip(
+ # _("Final factor for Scale action over X axis.")
+ # )
+ # self.fin_scalex_entry = FCDoubleSpinner()
+ # self.fin_scalex_entry.set_range(0, 9999.9999)
+ # self.fin_scalex_entry.set_precision(self.decimals)
+ # self.fin_scalex_entry.setSingleStep(0.1)
+ #
+ # grid_lay.addWidget(self.fin_scalex_label, 28, 0)
+ # grid_lay.addWidget(self.fin_scalex_entry, 28, 1, 1, 2)
+ #
+ # self.fin_scaley_label = QtWidgets.QLabel(_("Scale Factor Y:"))
+ # self.fin_scaley_label.setToolTip(
+ # _("Final factor for Scale action over Y axis.")
+ # )
+ # self.fin_scaley_entry = FCDoubleSpinner()
+ # self.fin_scaley_entry.set_range(0, 9999.9999)
+ # self.fin_scaley_entry.set_precision(self.decimals)
+ # self.fin_scaley_entry.setSingleStep(0.1)
+ #
+ # grid_lay.addWidget(self.fin_scaley_label, 29, 0)
+ # grid_lay.addWidget(self.fin_scaley_entry, 29, 1, 1, 2)
+ #
+ # self.fin_skewx_label = QtWidgets.QLabel(_("Skew Angle X:"))
+ # self.fin_skewx_label.setToolTip(
+ # _("Final value for angle for Skew action, in degrees.\n"
+ # "Float number between -360 and 359.")
+ # )
+ # self.fin_skewx_entry = FCDoubleSpinner()
+ # self.fin_skewx_entry.set_range(-360, 360)
+ # self.fin_skewx_entry.set_precision(self.decimals)
+ # self.fin_skewx_entry.setSingleStep(0.1)
+ #
+ # grid_lay.addWidget(self.fin_skewx_label, 30, 0)
+ # grid_lay.addWidget(self.fin_skewx_entry, 30, 1, 1, 2)
+ #
+ # self.fin_skewy_label = QtWidgets.QLabel(_("Skew Angle Y:"))
+ # self.fin_skewy_label.setToolTip(
+ # _("Final value for angle for Skew action, in degrees.\n"
+ # "Float number between -360 and 359.")
+ # )
+ # self.fin_skewy_entry = FCDoubleSpinner()
+ # self.fin_skewy_entry.set_range(-360, 360)
+ # self.fin_skewy_entry.set_precision(self.decimals)
+ # self.fin_skewy_entry.setSingleStep(0.1)
+ #
+ # grid_lay.addWidget(self.fin_skewy_label, 31, 0)
+ # grid_lay.addWidget(self.fin_skewy_entry, 31, 1, 1, 2)
separator_line1 = QtWidgets.QFrame()
separator_line1.setFrameShape(QtWidgets.QFrame.HLine)
separator_line1.setFrameShadow(QtWidgets.QFrame.Sunken)
- grid_lay.addWidget(separator_line1, 29, 0, 1, 3)
+ grid_lay.addWidget(separator_line1, 32, 0, 1, 3)
- grid_lay.addWidget(QtWidgets.QLabel(''), 30, 0, 1, 3)
+ grid_lay.addWidget(QtWidgets.QLabel(''), 32, 0, 1, 3)
# STEP 4 #
step_4 = QtWidgets.QLabel('%s' % _("STEP 4: Adjusted GCode"))
@@ -481,7 +532,7 @@ class ToolCalibrate(FlatCAMTool):
_("Generate verification GCode file adjusted with\n"
"the factors above.")
)
- grid_lay.addWidget(step_4, 31, 0, 1, 3)
+ grid_lay.addWidget(step_4, 34, 0, 1, 3)
# ## Adjusted GCode Button
self.adj_gcode_button = QtWidgets.QPushButton(_("Generate Adjusted GCode"))
@@ -495,14 +546,14 @@ class ToolCalibrate(FlatCAMTool):
font-weight: bold;
}
""")
- grid_lay.addWidget(self.adj_gcode_button, 32, 0, 1, 3)
+ grid_lay.addWidget(self.adj_gcode_button, 35, 0, 1, 3)
separator_line1 = QtWidgets.QFrame()
separator_line1.setFrameShape(QtWidgets.QFrame.HLine)
separator_line1.setFrameShadow(QtWidgets.QFrame.Sunken)
- grid_lay.addWidget(separator_line1, 33, 0, 1, 3)
+ grid_lay.addWidget(separator_line1, 36, 0, 1, 3)
- grid_lay.addWidget(QtWidgets.QLabel(''), 34, 0, 1, 3)
+ grid_lay.addWidget(QtWidgets.QLabel(''), 37, 0, 1, 3)
# STEP 5 #
step_5 = QtWidgets.QLabel('%s' % _("STEP 5: Calibrate FlatCAM Objects"))
@@ -510,7 +561,7 @@ class ToolCalibrate(FlatCAMTool):
_("Adjust the Excellon and Cutout Geometry objects\n"
"with the factors determined, and verified, above.")
)
- grid_lay.addWidget(step_5, 35, 0, 1, 3)
+ grid_lay.addWidget(step_5, 38, 0, 1, 3)
self.adj_exc_object_combo = QtWidgets.QComboBox()
self.adj_exc_object_combo.setModel(self.app.collection)
@@ -522,8 +573,8 @@ class ToolCalibrate(FlatCAMTool):
_("Excellon Object to be adjusted.")
)
- grid_lay.addWidget(self.adj_excobj_label, 36, 0, 1, 3)
- grid_lay.addWidget(self.adj_exc_object_combo, 37, 0, 1, 3)
+ grid_lay.addWidget(self.adj_excobj_label, 39, 0, 1, 3)
+ grid_lay.addWidget(self.adj_exc_object_combo, 40, 0, 1, 3)
self.adj_geo_object_combo = QtWidgets.QComboBox()
self.adj_geo_object_combo.setModel(self.app.collection)
@@ -535,8 +586,8 @@ class ToolCalibrate(FlatCAMTool):
_("Geometry Object to be adjusted.")
)
- grid_lay.addWidget(self.adj_geoobj_label, 38, 0, 1, 3)
- grid_lay.addWidget(self.adj_geo_object_combo, 39, 0, 1, 3)
+ grid_lay.addWidget(self.adj_geoobj_label, 41, 0, 1, 3)
+ grid_lay.addWidget(self.adj_geo_object_combo, 42, 0, 1, 3)
# ## Adjust Objects Button
self.adj_obj_button = QtWidgets.QPushButton(_("Calibrate"))
@@ -550,14 +601,14 @@ class ToolCalibrate(FlatCAMTool):
font-weight: bold;
}
""")
- grid_lay.addWidget(self.adj_obj_button, 40, 0, 1, 3)
+ grid_lay.addWidget(self.adj_obj_button, 43, 0, 1, 3)
separator_line2 = QtWidgets.QFrame()
separator_line2.setFrameShape(QtWidgets.QFrame.HLine)
separator_line2.setFrameShadow(QtWidgets.QFrame.Sunken)
- grid_lay.addWidget(separator_line2, 41, 0, 1, 3)
+ grid_lay.addWidget(separator_line2, 44, 0, 1, 3)
- grid_lay.addWidget(QtWidgets.QLabel(''), 42, 0, 1, 3)
+ grid_lay.addWidget(QtWidgets.QLabel(''), 45, 0, 1, 3)
self.layout.addStretch()
@@ -585,6 +636,9 @@ class ToolCalibrate(FlatCAMTool):
self.target_obj = None
+ # if the mouse events are connected to a local method set this True
+ self.local_connected = False
+
# ## Signals
self.start_button.clicked.connect(self.on_start_collect_points)
self.gcode_button.clicked.connect(self.generate_verification_gcode)
@@ -596,7 +650,7 @@ class ToolCalibrate(FlatCAMTool):
self.obj_type_combo.currentIndexChanged.connect(self.on_obj_type_combo)
def run(self, toggle=True):
- self.app.report_usage("ToolCalibrate()")
+ self.app.report_usage("ToolCalibration()")
if toggle:
# if the splitter is hidden, display it, else hide it but only if the current widget is the same
@@ -629,8 +683,23 @@ class ToolCalibrate(FlatCAMTool):
def set_tool_ui(self):
self.units = self.app.defaults['units'].upper()
- # ## Initialize form
- # self.mm_entry.set_value('%.*f' % (self.decimals, 0))
+ if self.local_connected is True:
+ self.disconnect_cal_events()
+
+ self.reset_calibration_points()
+
+ self.cal_source_radio.set_value(self.app.defaults['tools_cal_calsource'])
+ self.travelz_entry.set_value(self.app.defaults['tools_cal_travelz'])
+ self.verz_entry.set_value(self.app.defaults['tools_cal_verz'])
+ self.zeroz_cb.set_value(self.app.defaults['tools_cal_zeroz'])
+ self.toolchangez_entry.set_value(self.app.defaults['tools_cal_toolchangez'])
+
+ self.scalex_entry.set_value(1.0)
+ self.scaley_entry.set_value(1.0)
+ self.skewx_entry.set_value(0.0)
+ self.skewy_entry.set_value(0.0)
+
+ self.app.inform.emit('%s...' % _("Tool initialized"))
def on_obj_type_combo(self):
obj_type = self.obj_type_combo.currentIndex()
@@ -664,6 +733,8 @@ class ToolCalibrate(FlatCAMTool):
else:
self.canvas.graph_event_disconnect(self.app.mr)
+ self.local_connected = True
+
if self.cal_source_radio.get_value() == 'object':
selection_index = self.object_combo.currentIndex()
model_index = self.app.collection.index(selection_index, 0, self.object_combo.rootModelIndex())
@@ -675,7 +746,7 @@ class ToolCalibrate(FlatCAMTool):
self.reset_calibration_points()
- self.app.inform.emit(_("Click inside the First drill point. Bottom Left..."))
+ self.app.inform.emit(_("Get First calibration point. Bottom Left..."))
def on_mouse_click_release(self, event):
if event.button == 1:
@@ -705,7 +776,6 @@ class ToolCalibrate(FlatCAMTool):
for geo_el in apid_val['geometry']:
if 'solid' in geo_el:
if click_pt.within(geo_el['solid']):
- print(type(geo_el['follow']))
if isinstance(geo_el['follow'], Point):
center_pt = geo_el['solid'].centroid
self.click_points.append(
@@ -728,25 +798,21 @@ class ToolCalibrate(FlatCAMTool):
if len(self.click_points) == 1:
self.bottom_left_coordx_tgt.set_value(self.click_points[0][0])
self.bottom_left_coordy_tgt.set_value(self.click_points[0][1])
- self.app.inform.emit(_("Click inside the Second drill point. Bottom Right..."))
+ self.app.inform.emit(_("Get Second calibration point. Bottom Right..."))
elif len(self.click_points) == 2:
self.bottom_right_coordx_tgt.set_value(self.click_points[1][0])
self.bottom_right_coordy_tgt.set_value(self.click_points[1][1])
- self.app.inform.emit(_("Click inside the Third drill point. Top Left..."))
+ self.app.inform.emit(_("Get Third calibration point. Top Left..."))
elif len(self.click_points) == 3:
self.top_left_coordx_tgt.set_value(self.click_points[2][0])
self.top_left_coordy_tgt.set_value(self.click_points[2][1])
- self.app.inform.emit(_("Click inside the Fourth drill point. Top Right..."))
+ self.app.inform.emit(_("Get Forth calibration point. Top Right..."))
elif len(self.click_points) == 4:
self.top_right_coordx_tgt.set_value(self.click_points[3][0])
self.top_right_coordy_tgt.set_value(self.click_points[3][1])
self.app.inform.emit('[success] %s' % _("Done. All four points have been acquired."))
self.disconnect_cal_events()
- # restore the Grid snapping if it was active before
- if self.grid_status_memory is True:
- self.app.ui.grid_snap_btn.trigger()
-
def reset_calibration_points(self):
self.click_points = list()
@@ -763,7 +829,7 @@ class ToolCalibrate(FlatCAMTool):
self.top_right_coordy_tgt.set_value('')
def gcode_header(self):
- log.debug("ToolCalibrate.gcode_header()")
+ log.debug("ToolCalibration.gcode_header()")
time_str = "{:%A, %d %B %Y at %H:%M}".format(datetime.now())
gcode = '(G-CODE GENERATED BY FLATCAM v%s - www.flatcam.org - Version Date: %s)\n' % \
@@ -908,18 +974,18 @@ class ToolCalibrate(FlatCAMTool):
except TypeError:
top_left_dy = top_left_y
- top_right_x = float('%.*f' % (self.decimals, self.click_points[3][0]))
- top_right_y = float('%.*f' % (self.decimals, self.click_points[3][1]))
+ # top_right_x = float('%.*f' % (self.decimals, self.click_points[3][0]))
+ # top_right_y = float('%.*f' % (self.decimals, self.click_points[3][1]))
- try:
- top_right_dx = float('%.*f' % (self.decimals, self.top_right_coordx_found.get_value()))
- except TypeError:
- top_right_dx = top_right_x
-
- try:
- top_right_dy = float('%.*f' % (self.decimals, self.top_right_coordy_found.get_value()))
- except TypeError:
- top_right_dy = top_right_y
+ # try:
+ # top_right_dx = float('%.*f' % (self.decimals, self.top_right_coordx_found.get_value()))
+ # except TypeError:
+ # top_right_dx = top_right_x
+ #
+ # try:
+ # top_right_dy = float('%.*f' % (self.decimals, self.top_right_coordy_found.get_value()))
+ # except TypeError:
+ # top_right_dy = top_right_y
bot_right_x = float('%.*f' % (self.decimals, self.click_points[1][0]))
bot_right_y = float('%.*f' % (self.decimals, self.click_points[1][1]))
@@ -964,6 +1030,10 @@ class ToolCalibrate(FlatCAMTool):
self.skewy_entry.set_value(skew_angle_y)
def disconnect_cal_events(self):
+ # restore the Grid snapping if it was active before
+ if self.grid_status_memory is True:
+ self.app.ui.grid_snap_btn.trigger()
+
self.app.mr = self.canvas.graph_event_connect('mouse_release', self.app.on_mouse_click_release_over_plot)
if self.app.is_legacy is False:
@@ -971,7 +1041,11 @@ class ToolCalibrate(FlatCAMTool):
else:
self.canvas.graph_event_disconnect(self.mr)
+ self.local_connected = False
+
def reset_fields(self):
self.object_combo.setRootModelIndex(self.app.collection.index(1, 0, QtCore.QModelIndex()))
+ self.adj_exc_object_combo.setRootModelIndex(self.app.collection.index(1, 0, QtCore.QModelIndex()))
+ self.adj_geo_object_combo.setRootModelIndex(self.app.collection.index(2, 0, QtCore.QModelIndex()))
# end of file
diff --git a/flatcamTools/__init__.py b/flatcamTools/__init__.py
index 9d86c30f..d986974e 100644
--- a/flatcamTools/__init__.py
+++ b/flatcamTools/__init__.py
@@ -2,7 +2,7 @@ import sys
from flatcamTools.ToolCalculators import ToolCalculator
-from flatcamTools.ToolCalibrate import ToolCalibrate
+from flatcamTools.ToolCalibration import ToolCalibration
from flatcamTools.ToolCutOut import CutOut
from flatcamTools.ToolDblSided import DblSidedTool
diff --git a/locale/en/LC_MESSAGES/strings.po b/locale/en/LC_MESSAGES/strings.po
index 93f34a10..c17aae52 100644
--- a/locale/en/LC_MESSAGES/strings.po
+++ b/locale/en/LC_MESSAGES/strings.po
@@ -1821,7 +1821,7 @@ msgstr "V-Angle"
#: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:798 flatcamGUI/ObjectUI.py:1369
#: flatcamGUI/PreferencesUI.py:2304 flatcamGUI/PreferencesUI.py:3178
-#: flatcamTools/ToolCalibrate.py:82
+#: flatcamTools/ToolCalibration.py:82
msgid "Travel Z"
msgstr "Travel Z"
@@ -1872,7 +1872,7 @@ msgid "Toolchange XY"
msgstr "Toolchange XY"
#: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2330
-#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibrate.py:119
+#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibration.py:119
msgid "Toolchange Z"
msgstr "Toolchange Z"
@@ -2641,13 +2641,13 @@ msgid "Plotting..."
msgstr "Plotting..."
#: FlatCAMObj.py:6172 FlatCAMObj.py:6177
-#: flatcamTools/ToolCalibrate.py:765
-#: flatcamTools/ToolCalibrate.py:770
+#: flatcamTools/ToolCalibration.py:765
+#: flatcamTools/ToolCalibration.py:770
#: flatcamTools/ToolSolderPaste.py:1470
msgid "Export Machine Code ..."
msgstr "Export Machine Code ..."
-#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrate.py:775
+#: FlatCAMObj.py:6182 flatcamTools/ToolCalibration.py:775
#: flatcamTools/ToolSolderPaste.py:1474
msgid "Export Machine Code cancelled ..."
msgstr "Export Machine Code cancelled ..."
@@ -3718,8 +3718,8 @@ msgstr "Skew/Shear"
#: flatcamGUI/FlatCAMGUI.py:1849 flatcamGUI/FlatCAMGUI.py:1927
#: flatcamGUI/FlatCAMGUI.py:2262 flatcamGUI/ObjectUI.py:91
#: flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:5139
-#: flatcamTools/ToolCalibrate.py:446
-#: flatcamTools/ToolCalibrate.py:473 flatcamTools/ToolTransform.py:27
+#: flatcamTools/ToolCalibration.py:446
+#: flatcamTools/ToolCalibration.py:473 flatcamTools/ToolTransform.py:27
msgid "Scale"
msgstr "Scale"
@@ -3775,7 +3775,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:711
#: flatcamEditors/FlatCAMGrbEditor.py:5102
-#: flatcamTools/ToolCalibrate.py:482
+#: flatcamTools/ToolCalibration.py:482
msgid "Angle X:"
msgstr "Angle X:"
@@ -3783,8 +3783,8 @@ msgstr "Angle X:"
#: flatcamEditors/FlatCAMGeoEditor.py:731
#: flatcamEditors/FlatCAMGrbEditor.py:5104
#: flatcamEditors/FlatCAMGrbEditor.py:5122 flatcamGUI/PreferencesUI.py:5118
-#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibrate.py:484
-#: flatcamTools/ToolCalibrate.py:497
+#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibration.py:484
+#: flatcamTools/ToolCalibration.py:497
msgid ""
"Angle for Skew action, in degrees.\n"
"Float number between -360 and 359."
@@ -3812,7 +3812,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:729
#: flatcamEditors/FlatCAMGrbEditor.py:5120
-#: flatcamTools/ToolCalibrate.py:495
+#: flatcamTools/ToolCalibration.py:495
msgid "Angle Y:"
msgstr "Angle Y:"
@@ -3823,13 +3823,13 @@ msgstr "Skew Y"
#: flatcamEditors/FlatCAMGeoEditor.py:768
#: flatcamEditors/FlatCAMGrbEditor.py:5159
-#: flatcamTools/ToolCalibrate.py:449
+#: flatcamTools/ToolCalibration.py:449
msgid "Factor X:"
msgstr "Factor X:"
#: flatcamEditors/FlatCAMGeoEditor.py:770
#: flatcamEditors/FlatCAMGrbEditor.py:5161
-#: flatcamTools/ToolCalibrate.py:451
+#: flatcamTools/ToolCalibration.py:451
msgid "Factor for Scale action over X axis."
msgstr "Factor for Scale action over X axis."
@@ -3853,13 +3853,13 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:785
#: flatcamEditors/FlatCAMGrbEditor.py:5176
-#: flatcamTools/ToolCalibrate.py:461
+#: flatcamTools/ToolCalibration.py:461
msgid "Factor Y:"
msgstr "Factor Y:"
#: flatcamEditors/FlatCAMGeoEditor.py:787
#: flatcamEditors/FlatCAMGrbEditor.py:5178
-#: flatcamTools/ToolCalibrate.py:463
+#: flatcamTools/ToolCalibration.py:463
msgid "Factor for Scale action over Y axis."
msgstr "Factor for Scale action over Y axis."
@@ -6217,12 +6217,12 @@ msgstr "General"
msgid "GERBER"
msgstr "GERBER"
-#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrate.py:66
-#: flatcamTools/ToolCalibrate.py:543 flatcamTools/ToolDblSided.py:79
+#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibration.py:66
+#: flatcamTools/ToolCalibration.py:543 flatcamTools/ToolDblSided.py:79
msgid "EXCELLON"
msgstr "EXCELLON"
-#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrate.py:556
+#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibration.py:556
#: flatcamTools/ToolDblSided.py:101
msgid "GEOMETRY"
msgstr "GEOMETRY"
@@ -7046,7 +7046,7 @@ msgstr "Plot (show) this object."
#: flatcamGUI/ObjectUI.py:199 flatcamGUI/ObjectUI.py:697
#: flatcamGUI/ObjectUI.py:1089 flatcamGUI/ObjectUI.py:1671
#: flatcamGUI/ObjectUI.py:1952 flatcamGUI/ObjectUI.py:2004
-#: flatcamTools/ToolCalibrate.py:159 flatcamTools/ToolFiducials.py:73
+#: flatcamTools/ToolCalibration.py:159 flatcamTools/ToolFiducials.py:73
msgid "Name"
msgstr "Name"
@@ -11350,8 +11350,8 @@ msgstr ""
"Various transformations that can be applied\n"
"on a FlatCAM object."
-#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrate.py:479
-#: flatcamTools/ToolCalibrate.py:508
+#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibration.py:479
+#: flatcamTools/ToolCalibration.py:508
msgid "Skew"
msgstr "Skew"
@@ -12609,46 +12609,46 @@ msgstr ""
msgid "Calc. Tool"
msgstr "Calc. Tool"
-#: flatcamTools/ToolCalibrate.py:33
+#: flatcamTools/ToolCalibration.py:33
#| msgid "Creating Excellon."
msgid "Calibrate Excellon"
msgstr "Calibrate Excellon"
-#: flatcamTools/ToolCalibrate.py:68
+#: flatcamTools/ToolCalibration.py:68
#| msgid "The FlatCAM object to be used as non copper clearing reference."
msgid "Excellon Object to be used as a source for reference points."
msgstr "Excellon Object to be used as a source for reference points."
-#: flatcamTools/ToolCalibrate.py:75
+#: flatcamTools/ToolCalibration.py:75
#| msgid "Slot Parameters"
msgid "GCode Parameters"
msgstr "GCode Parameters"
-#: flatcamTools/ToolCalibrate.py:77
+#: flatcamTools/ToolCalibration.py:77
msgid "Parameters used when creating the GCode in this tool."
msgstr "Parameters used when creating the GCode in this tool."
-#: flatcamTools/ToolCalibrate.py:84
+#: flatcamTools/ToolCalibration.py:84
#| msgid ""
#| "The height (Z) for travel between pads\n"
#| "(without dispensing solder paste)."
msgid "Height (Z) for travelling between the points."
msgstr "Height (Z) for travelling between the points."
-#: flatcamTools/ToolCalibrate.py:96
+#: flatcamTools/ToolCalibration.py:96
#| msgid "Gerber Specification"
msgid "Verification Z"
msgstr "Verification Z"
-#: flatcamTools/ToolCalibrate.py:98
+#: flatcamTools/ToolCalibration.py:98
msgid "Height (Z) for checking the point."
msgstr "Height (Z) for checking the point."
-#: flatcamTools/ToolCalibrate.py:110
+#: flatcamTools/ToolCalibration.py:110
msgid "Zero Z tool"
msgstr "Zero Z tool"
-#: flatcamTools/ToolCalibrate.py:112
+#: flatcamTools/ToolCalibration.py:112
msgid ""
"Include a sequence to zero the height (Z)\n"
"of the verification tool."
@@ -12656,15 +12656,15 @@ msgstr ""
"Include a sequence to zero the height (Z)\n"
"of the verification tool."
-#: flatcamTools/ToolCalibrate.py:121
+#: flatcamTools/ToolCalibration.py:121
msgid "Height (Z) for mounting the verification probe."
msgstr "Height (Z) for mounting the verification probe."
-#: flatcamTools/ToolCalibrate.py:143
+#: flatcamTools/ToolCalibration.py:143
msgid "Calibration Points"
msgstr "Calibration Points"
-#: flatcamTools/ToolCalibrate.py:145
+#: flatcamTools/ToolCalibration.py:145
msgid ""
"Contain the expected calibration points and the\n"
"ones measured."
@@ -12672,67 +12672,67 @@ msgstr ""
"Contain the expected calibration points and the\n"
"ones measured."
-#: flatcamTools/ToolCalibrate.py:160 flatcamTools/ToolSub.py:73
+#: flatcamTools/ToolCalibration.py:160 flatcamTools/ToolSub.py:73
#: flatcamTools/ToolSub.py:119
msgid "Target"
msgstr "Target"
-#: flatcamTools/ToolCalibrate.py:161
+#: flatcamTools/ToolCalibration.py:161
msgid "Found Delta"
msgstr "Found Delta"
-#: flatcamTools/ToolCalibrate.py:173
+#: flatcamTools/ToolCalibration.py:173
#| msgid "Bottom Left"
msgid "Bot Left X"
msgstr "Bot Left X"
-#: flatcamTools/ToolCalibrate.py:182
+#: flatcamTools/ToolCalibration.py:182
#| msgid "Bottom Left"
msgid "Bot Left Y"
msgstr "Bot Left Y"
-#: flatcamTools/ToolCalibrate.py:190
-#: flatcamTools/ToolCalibrate.py:191
+#: flatcamTools/ToolCalibration.py:190
+#: flatcamTools/ToolCalibration.py:191
#| msgid "Origin set"
msgid "Origin"
msgstr "Origin"
-#: flatcamTools/ToolCalibrate.py:202
+#: flatcamTools/ToolCalibration.py:202
#| msgid "Bottom Right"
msgid "Bot Right X"
msgstr "Bot Right X"
-#: flatcamTools/ToolCalibrate.py:212
+#: flatcamTools/ToolCalibration.py:212
#| msgid "Bottom Right"
msgid "Bot Right Y"
msgstr "Bot Right Y"
-#: flatcamTools/ToolCalibrate.py:227
+#: flatcamTools/ToolCalibration.py:227
#| msgid "Top Left"
msgid "Top Left X"
msgstr "Top Left X"
-#: flatcamTools/ToolCalibrate.py:236
+#: flatcamTools/ToolCalibration.py:236
#| msgid "Top Left"
msgid "Top Left Y"
msgstr "Top Left Y"
-#: flatcamTools/ToolCalibrate.py:251
+#: flatcamTools/ToolCalibration.py:251
#| msgid "Top right"
msgid "Top Right X"
msgstr "Top Right X"
-#: flatcamTools/ToolCalibrate.py:260
+#: flatcamTools/ToolCalibration.py:260
#| msgid "Top right"
msgid "Top Right Y"
msgstr "Top Right Y"
-#: flatcamTools/ToolCalibrate.py:393
+#: flatcamTools/ToolCalibration.py:393
#: flatcamTools/ToolSolderPaste.py:148
msgid "STEP 1"
msgstr "STEP 1"
-#: flatcamTools/ToolCalibrate.py:395
+#: flatcamTools/ToolCalibration.py:395
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four\n"
@@ -12742,11 +12742,11 @@ msgstr ""
"Those four points should be in the four\n"
"(as much as possible) corners of the Excellon object."
-#: flatcamTools/ToolCalibrate.py:402
+#: flatcamTools/ToolCalibration.py:402
msgid "Acquire Calibration Points"
msgstr "Acquire Calibration Points"
-#: flatcamTools/ToolCalibrate.py:404
+#: flatcamTools/ToolCalibration.py:404
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four squares of\n"
@@ -12756,13 +12756,13 @@ msgstr ""
"Those four points should be in the four squares of\n"
"the Excellon object."
-#: flatcamTools/ToolCalibrate.py:412
+#: flatcamTools/ToolCalibration.py:412
#: flatcamTools/ToolSolderPaste.py:358
msgid "STEP 2"
msgstr "STEP 2"
-#: flatcamTools/ToolCalibrate.py:414
-#: flatcamTools/ToolCalibrate.py:422
+#: flatcamTools/ToolCalibration.py:414
+#: flatcamTools/ToolCalibration.py:422
msgid ""
"Generate GCode file to locate and align the PCB by using\n"
"the four points acquired above."
@@ -12770,18 +12770,18 @@ msgstr ""
"Generate GCode file to locate and align the PCB by using\n"
"the four points acquired above."
-#: flatcamTools/ToolCalibrate.py:420
+#: flatcamTools/ToolCalibration.py:420
#: flatcamTools/ToolSolderPaste.py:341
msgid "Generate GCode"
msgstr "Generate GCode"
-#: flatcamTools/ToolCalibrate.py:429
+#: flatcamTools/ToolCalibration.py:429
#: flatcamTools/ToolSolderPaste.py:387
msgid "STEP 3"
msgstr "STEP 3"
-#: flatcamTools/ToolCalibrate.py:431
-#: flatcamTools/ToolCalibrate.py:440
+#: flatcamTools/ToolCalibration.py:431
+#: flatcamTools/ToolCalibration.py:440
msgid ""
"Calculate Scale and Skew factors based on the differences (delta)\n"
"found when checking the PCB pattern. The differences must be filled\n"
@@ -12791,26 +12791,26 @@ msgstr ""
"found when checking the PCB pattern. The differences must be filled\n"
"in the fields Found (Delta)."
-#: flatcamTools/ToolCalibrate.py:438
+#: flatcamTools/ToolCalibration.py:438
#| msgid "Calculators"
msgid "Calculate Factors"
msgstr "Calculate Factors"
-#: flatcamTools/ToolCalibrate.py:475
+#: flatcamTools/ToolCalibration.py:475
msgid "Apply Scale factors on the calibration points."
msgstr "Apply Scale factors on the calibration points."
-#: flatcamTools/ToolCalibrate.py:510
+#: flatcamTools/ToolCalibration.py:510
msgid "Apply Skew factors on the calibration points."
msgstr "Apply Skew factors on the calibration points."
-#: flatcamTools/ToolCalibrate.py:515
+#: flatcamTools/ToolCalibration.py:515
#: flatcamTools/ToolSolderPaste.py:433
msgid "STEP 4"
msgstr "STEP 4"
-#: flatcamTools/ToolCalibrate.py:517
-#: flatcamTools/ToolCalibrate.py:525
+#: flatcamTools/ToolCalibration.py:517
+#: flatcamTools/ToolCalibration.py:525
msgid ""
"Generate verification GCode file adjusted with\n"
"the factors above."
@@ -12818,17 +12818,17 @@ msgstr ""
"Generate verification GCode file adjusted with\n"
"the factors above."
-#: flatcamTools/ToolCalibrate.py:523
+#: flatcamTools/ToolCalibration.py:523
#| msgid "Generate GCode"
msgid "Generate Adjusted GCode"
msgstr "Generate Adjusted GCode"
-#: flatcamTools/ToolCalibrate.py:531
+#: flatcamTools/ToolCalibration.py:531
#| msgid "STEP 1"
msgid "STEP 5"
msgstr "STEP 5"
-#: flatcamTools/ToolCalibrate.py:533
+#: flatcamTools/ToolCalibration.py:533
msgid ""
"Ajust the Excellon and Cutout Geometry objects\n"
"with the factors determined, and verified, above."
@@ -12836,22 +12836,22 @@ msgstr ""
"Ajust the Excellon and Cutout Geometry objects\n"
"with the factors determined, and verified, above."
-#: flatcamTools/ToolCalibrate.py:545
+#: flatcamTools/ToolCalibration.py:545
#| msgid "Excellon Object to be mirrored."
msgid "Excellon Object to be adjusted."
msgstr "Excellon Object to be adjusted."
-#: flatcamTools/ToolCalibrate.py:558
+#: flatcamTools/ToolCalibration.py:558
#| msgid "Geometry Obj to be mirrored."
msgid "Geometry Object to be adjusted."
msgstr "Geometry Object to be adjusted."
-#: flatcamTools/ToolCalibrate.py:565
+#: flatcamTools/ToolCalibration.py:565
#| msgid "Edit Object\tE"
msgid "Adjust Objects"
msgstr "Adjust Objects"
-#: flatcamTools/ToolCalibrate.py:567
+#: flatcamTools/ToolCalibration.py:567
msgid ""
"Adjust (scale and/or skew) the objects\n"
"with the factors determined above."
@@ -12859,43 +12859,43 @@ msgstr ""
"Adjust (scale and/or skew) the objects\n"
"with the factors determined above."
-#: flatcamTools/ToolCalibrate.py:617
+#: flatcamTools/ToolCalibration.py:617
#| msgid "Calc. Tool"
msgid "Cal Exc Tool"
msgstr "Cal Exc Tool"
-#: flatcamTools/ToolCalibrate.py:648 flatcamTools/ToolDblSided.py:457
+#: flatcamTools/ToolCalibration.py:648 flatcamTools/ToolDblSided.py:457
msgid "There is no Excellon object loaded ..."
msgstr "There is no Excellon object loaded ..."
-#: flatcamTools/ToolCalibrate.py:651
+#: flatcamTools/ToolCalibration.py:651
#| msgid "Click inside the desired polygon."
msgid "Click inside the First drill point. Bottom Left..."
msgstr "Click inside the First drill point. Bottom Left..."
-#: flatcamTools/ToolCalibrate.py:679
+#: flatcamTools/ToolCalibration.py:679
msgid "Click inside the Second drill point. Bottom Right..."
msgstr "Click inside the Second drill point. Bottom Right..."
-#: flatcamTools/ToolCalibrate.py:683
+#: flatcamTools/ToolCalibration.py:683
#| msgid "Click inside the desired polygon."
msgid "Click inside the Third drill point. Top Left..."
msgstr "Click inside the Third drill point. Top Left..."
-#: flatcamTools/ToolCalibrate.py:687
+#: flatcamTools/ToolCalibration.py:687
msgid "Click inside the Fourth drill point. Top Right..."
msgstr "Click inside the Fourth drill point. Top Right..."
-#: flatcamTools/ToolCalibrate.py:691
+#: flatcamTools/ToolCalibration.py:691
msgid "Done. All four points have been acquired."
msgstr "Done. All four points have been acquired."
-#: flatcamTools/ToolCalibrate.py:705
+#: flatcamTools/ToolCalibration.py:705
#| msgid "Generate GCode"
msgid "Verification GCode"
msgstr "Verification GCode"
-#: flatcamTools/ToolCalibrate.py:721
+#: flatcamTools/ToolCalibration.py:721
msgid "Cancelled. Four points are needed for GCode generation."
msgstr "Cancelled. Four points are needed for GCode generation."
diff --git a/locale/es/LC_MESSAGES/strings.po b/locale/es/LC_MESSAGES/strings.po
index 83806440..1e984d57 100644
--- a/locale/es/LC_MESSAGES/strings.po
+++ b/locale/es/LC_MESSAGES/strings.po
@@ -1882,7 +1882,7 @@ msgstr "Ángulo"
#: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:798 flatcamGUI/ObjectUI.py:1369
#: flatcamGUI/PreferencesUI.py:2304 flatcamGUI/PreferencesUI.py:3178
-#: flatcamTools/ToolCalibrate.py:82
+#: flatcamTools/ToolCalibration.py:82
msgid "Travel Z"
msgstr "Viaje Z"
@@ -1937,7 +1937,7 @@ msgid "Toolchange XY"
msgstr "Cambio de herra X, Y"
#: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2330
-#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibrate.py:119
+#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibration.py:119
msgid "Toolchange Z"
msgstr "Cambio de herramienta Z"
@@ -2685,13 +2685,13 @@ msgid "Plotting..."
msgstr "Trazando ..."
#: FlatCAMObj.py:6172 FlatCAMObj.py:6177
-#: flatcamTools/ToolCalibrate.py:765
-#: flatcamTools/ToolCalibrate.py:770
+#: flatcamTools/ToolCalibration.py:765
+#: flatcamTools/ToolCalibration.py:770
#: flatcamTools/ToolSolderPaste.py:1470
msgid "Export Machine Code ..."
msgstr "Exportar código de máquina ..."
-#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrate.py:775
+#: FlatCAMObj.py:6182 flatcamTools/ToolCalibration.py:775
#: flatcamTools/ToolSolderPaste.py:1474
msgid "Export Machine Code cancelled ..."
msgstr "Exportar código de máquina cancelado ..."
@@ -3791,8 +3791,8 @@ msgstr "Sesgo / cizalla"
#: flatcamGUI/FlatCAMGUI.py:1849 flatcamGUI/FlatCAMGUI.py:1927
#: flatcamGUI/FlatCAMGUI.py:2262 flatcamGUI/ObjectUI.py:91
#: flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:5139
-#: flatcamTools/ToolCalibrate.py:446
-#: flatcamTools/ToolCalibrate.py:473 flatcamTools/ToolTransform.py:27
+#: flatcamTools/ToolCalibration.py:446
+#: flatcamTools/ToolCalibration.py:473 flatcamTools/ToolTransform.py:27
msgid "Scale"
msgstr "Escala"
@@ -3848,7 +3848,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:711
#: flatcamEditors/FlatCAMGrbEditor.py:5102
-#: flatcamTools/ToolCalibrate.py:482
+#: flatcamTools/ToolCalibration.py:482
msgid "Angle X:"
msgstr "Ángulo X:"
@@ -3856,8 +3856,8 @@ msgstr "Ángulo X:"
#: flatcamEditors/FlatCAMGeoEditor.py:731
#: flatcamEditors/FlatCAMGrbEditor.py:5104
#: flatcamEditors/FlatCAMGrbEditor.py:5122 flatcamGUI/PreferencesUI.py:5118
-#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibrate.py:484
-#: flatcamTools/ToolCalibrate.py:497
+#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibration.py:484
+#: flatcamTools/ToolCalibration.py:497
msgid ""
"Angle for Skew action, in degrees.\n"
"Float number between -360 and 359."
@@ -3885,7 +3885,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:729
#: flatcamEditors/FlatCAMGrbEditor.py:5120
-#: flatcamTools/ToolCalibrate.py:495
+#: flatcamTools/ToolCalibration.py:495
msgid "Angle Y:"
msgstr "Ángulo Y:"
@@ -3896,13 +3896,13 @@ msgstr "Sesgo y"
#: flatcamEditors/FlatCAMGeoEditor.py:768
#: flatcamEditors/FlatCAMGrbEditor.py:5159
-#: flatcamTools/ToolCalibrate.py:449
+#: flatcamTools/ToolCalibration.py:449
msgid "Factor X:"
msgstr "Factor X:"
#: flatcamEditors/FlatCAMGeoEditor.py:770
#: flatcamEditors/FlatCAMGrbEditor.py:5161
-#: flatcamTools/ToolCalibrate.py:451
+#: flatcamTools/ToolCalibration.py:451
msgid "Factor for Scale action over X axis."
msgstr "Factor para la acción de escala sobre el eje X."
@@ -3926,13 +3926,13 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:785
#: flatcamEditors/FlatCAMGrbEditor.py:5176
-#: flatcamTools/ToolCalibrate.py:461
+#: flatcamTools/ToolCalibration.py:461
msgid "Factor Y:"
msgstr "Factor Y:"
#: flatcamEditors/FlatCAMGeoEditor.py:787
#: flatcamEditors/FlatCAMGrbEditor.py:5178
-#: flatcamTools/ToolCalibrate.py:463
+#: flatcamTools/ToolCalibration.py:463
msgid "Factor for Scale action over Y axis."
msgstr "Factor de acción de escala sobre eje Y."
@@ -6330,12 +6330,12 @@ msgstr "General"
msgid "GERBER"
msgstr "GERBER"
-#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrate.py:66
-#: flatcamTools/ToolCalibrate.py:543 flatcamTools/ToolDblSided.py:79
+#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibration.py:66
+#: flatcamTools/ToolCalibration.py:543 flatcamTools/ToolDblSided.py:79
msgid "EXCELLON"
msgstr "EXCELLON"
-#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrate.py:556
+#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibration.py:556
#: flatcamTools/ToolDblSided.py:101
msgid "GEOMETRY"
msgstr "GEOMETRÍA"
@@ -7165,7 +7165,7 @@ msgstr "Trazar (mostrar) este objeto."
#: flatcamGUI/ObjectUI.py:199 flatcamGUI/ObjectUI.py:697
#: flatcamGUI/ObjectUI.py:1089 flatcamGUI/ObjectUI.py:1671
#: flatcamGUI/ObjectUI.py:1952 flatcamGUI/ObjectUI.py:2004
-#: flatcamTools/ToolCalibrate.py:159 flatcamTools/ToolFiducials.py:73
+#: flatcamTools/ToolCalibration.py:159 flatcamTools/ToolFiducials.py:73
msgid "Name"
msgstr "Nombre"
@@ -11525,8 +11525,8 @@ msgstr ""
"Diversas transformaciones que se pueden aplicar.\n"
"en un objeto FlatCAM."
-#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrate.py:479
-#: flatcamTools/ToolCalibrate.py:508
+#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibration.py:479
+#: flatcamTools/ToolCalibration.py:508
msgid "Skew"
msgstr "Sesgar"
@@ -12770,30 +12770,30 @@ msgstr ""
msgid "Calc. Tool"
msgstr "Calc. Herramienta"
-#: flatcamTools/ToolCalibrate.py:33
+#: flatcamTools/ToolCalibration.py:33
#, fuzzy
#| msgid "Creating Excellon."
msgid "Calibrate Excellon"
msgstr "Creación de Excellon."
-#: flatcamTools/ToolCalibrate.py:68
+#: flatcamTools/ToolCalibration.py:68
#, fuzzy
#| msgid "The FlatCAM object to be used as non copper clearing reference."
msgid "Excellon Object to be used as a source for reference points."
msgstr ""
"El objeto FlatCAM que se utilizará como referencia de compensación sin cobre."
-#: flatcamTools/ToolCalibrate.py:75
+#: flatcamTools/ToolCalibration.py:75
#, fuzzy
#| msgid "Slot Parameters"
msgid "GCode Parameters"
msgstr "Parámetros de ranura"
-#: flatcamTools/ToolCalibrate.py:77
+#: flatcamTools/ToolCalibration.py:77
msgid "Parameters used when creating the GCode in this tool."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:84
+#: flatcamTools/ToolCalibration.py:84
#, fuzzy
#| msgid ""
#| "The height (Z) for travel between pads\n"
@@ -12803,266 +12803,266 @@ msgstr ""
"La altura (Z) para viajar entre almohadillas\n"
"(sin dispensar pasta de soldadura)."
-#: flatcamTools/ToolCalibrate.py:96
+#: flatcamTools/ToolCalibration.py:96
#, fuzzy
#| msgid "Gerber Specification"
msgid "Verification Z"
msgstr "Especificación de Gerber"
-#: flatcamTools/ToolCalibrate.py:98
+#: flatcamTools/ToolCalibration.py:98
msgid "Height (Z) for checking the point."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:110
+#: flatcamTools/ToolCalibration.py:110
msgid "Zero Z tool"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:112
+#: flatcamTools/ToolCalibration.py:112
msgid ""
"Include a sequence to zero the height (Z)\n"
"of the verification tool."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:121
+#: flatcamTools/ToolCalibration.py:121
msgid "Height (Z) for mounting the verification probe."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:143
+#: flatcamTools/ToolCalibration.py:143
msgid "Calibration Points"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:145
+#: flatcamTools/ToolCalibration.py:145
msgid ""
"Contain the expected calibration points and the\n"
"ones measured."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:160 flatcamTools/ToolSub.py:73
+#: flatcamTools/ToolCalibration.py:160 flatcamTools/ToolSub.py:73
#: flatcamTools/ToolSub.py:119
msgid "Target"
msgstr "Objetivo"
-#: flatcamTools/ToolCalibrate.py:161
+#: flatcamTools/ToolCalibration.py:161
msgid "Found Delta"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:173
+#: flatcamTools/ToolCalibration.py:173
#, fuzzy
#| msgid "Bottom Left"
msgid "Bot Left X"
msgstr "Abajo a la izquierda"
-#: flatcamTools/ToolCalibrate.py:182
+#: flatcamTools/ToolCalibration.py:182
#, fuzzy
#| msgid "Bottom Left"
msgid "Bot Left Y"
msgstr "Abajo a la izquierda"
-#: flatcamTools/ToolCalibrate.py:190
-#: flatcamTools/ToolCalibrate.py:191
+#: flatcamTools/ToolCalibration.py:190
+#: flatcamTools/ToolCalibration.py:191
#, fuzzy
#| msgid "Origin set"
msgid "Origin"
msgstr "Conjunto de origen"
-#: flatcamTools/ToolCalibrate.py:202
+#: flatcamTools/ToolCalibration.py:202
#, fuzzy
#| msgid "Bottom Right"
msgid "Bot Right X"
msgstr "Abajo a la derecha"
-#: flatcamTools/ToolCalibrate.py:212
+#: flatcamTools/ToolCalibration.py:212
#, fuzzy
#| msgid "Bottom Right"
msgid "Bot Right Y"
msgstr "Abajo a la derecha"
-#: flatcamTools/ToolCalibrate.py:227
+#: flatcamTools/ToolCalibration.py:227
#, fuzzy
#| msgid "Top Left"
msgid "Top Left X"
msgstr "Arriba a la izquierda"
-#: flatcamTools/ToolCalibrate.py:236
+#: flatcamTools/ToolCalibration.py:236
#, fuzzy
#| msgid "Top Left"
msgid "Top Left Y"
msgstr "Arriba a la izquierda"
-#: flatcamTools/ToolCalibrate.py:251
+#: flatcamTools/ToolCalibration.py:251
#, fuzzy
#| msgid "Top right"
msgid "Top Right X"
msgstr "Arriba a la derecha"
-#: flatcamTools/ToolCalibrate.py:260
+#: flatcamTools/ToolCalibration.py:260
#, fuzzy
#| msgid "Top right"
msgid "Top Right Y"
msgstr "Arriba a la derecha"
-#: flatcamTools/ToolCalibrate.py:393
+#: flatcamTools/ToolCalibration.py:393
#: flatcamTools/ToolSolderPaste.py:148
msgid "STEP 1"
msgstr "PASO 1"
-#: flatcamTools/ToolCalibrate.py:395
+#: flatcamTools/ToolCalibration.py:395
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four\n"
"(as much as possible) corners of the Excellon object."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:402
+#: flatcamTools/ToolCalibration.py:402
msgid "Acquire Calibration Points"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:404
+#: flatcamTools/ToolCalibration.py:404
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four squares of\n"
"the Excellon object."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:412
+#: flatcamTools/ToolCalibration.py:412
#: flatcamTools/ToolSolderPaste.py:358
msgid "STEP 2"
msgstr "PASO 2"
-#: flatcamTools/ToolCalibrate.py:414
-#: flatcamTools/ToolCalibrate.py:422
+#: flatcamTools/ToolCalibration.py:414
+#: flatcamTools/ToolCalibration.py:422
msgid ""
"Generate GCode file to locate and align the PCB by using\n"
"the four points acquired above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:420
+#: flatcamTools/ToolCalibration.py:420
#: flatcamTools/ToolSolderPaste.py:341
msgid "Generate GCode"
msgstr "Generar GCode"
-#: flatcamTools/ToolCalibrate.py:429
+#: flatcamTools/ToolCalibration.py:429
#: flatcamTools/ToolSolderPaste.py:387
msgid "STEP 3"
msgstr "PASO 3"
-#: flatcamTools/ToolCalibrate.py:431
-#: flatcamTools/ToolCalibrate.py:440
+#: flatcamTools/ToolCalibration.py:431
+#: flatcamTools/ToolCalibration.py:440
msgid ""
"Calculate Scale and Skew factors based on the differences (delta)\n"
"found when checking the PCB pattern. The differences must be filled\n"
"in the fields Found (Delta)."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:438
+#: flatcamTools/ToolCalibration.py:438
#, fuzzy
#| msgid "Calculators"
msgid "Calculate Factors"
msgstr "Calculadoras"
-#: flatcamTools/ToolCalibrate.py:475
+#: flatcamTools/ToolCalibration.py:475
msgid "Apply Scale factors on the calibration points."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:510
+#: flatcamTools/ToolCalibration.py:510
msgid "Apply Skew factors on the calibration points."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:515
+#: flatcamTools/ToolCalibration.py:515
#: flatcamTools/ToolSolderPaste.py:433
msgid "STEP 4"
msgstr "PASO 4"
-#: flatcamTools/ToolCalibrate.py:517
-#: flatcamTools/ToolCalibrate.py:525
+#: flatcamTools/ToolCalibration.py:517
+#: flatcamTools/ToolCalibration.py:525
msgid ""
"Generate verification GCode file adjusted with\n"
"the factors above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:523
+#: flatcamTools/ToolCalibration.py:523
#, fuzzy
#| msgid "Generate GCode"
msgid "Generate Adjusted GCode"
msgstr "Generar GCode"
-#: flatcamTools/ToolCalibrate.py:531
+#: flatcamTools/ToolCalibration.py:531
#, fuzzy
#| msgid "STEP 1"
msgid "STEP 5"
msgstr "PASO 1"
-#: flatcamTools/ToolCalibrate.py:533
+#: flatcamTools/ToolCalibration.py:533
msgid ""
"Ajust the Excellon and Cutout Geometry objects\n"
"with the factors determined, and verified, above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:545
+#: flatcamTools/ToolCalibration.py:545
#, fuzzy
#| msgid "Excellon Object to be mirrored."
msgid "Excellon Object to be adjusted."
msgstr "Excellon Objeto a ser reflejado."
-#: flatcamTools/ToolCalibrate.py:558
+#: flatcamTools/ToolCalibration.py:558
#, fuzzy
#| msgid "Geometry Obj to be mirrored."
msgid "Geometry Object to be adjusted."
msgstr "Obj de geometría para ser reflejado."
-#: flatcamTools/ToolCalibrate.py:565
+#: flatcamTools/ToolCalibration.py:565
#, fuzzy
#| msgid "Edit Object\tE"
msgid "Adjust Objects"
msgstr "Editar objeto\tE"
-#: flatcamTools/ToolCalibrate.py:567
+#: flatcamTools/ToolCalibration.py:567
msgid ""
"Adjust (scale and/or skew) the objects\n"
"with the factors determined above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:617
+#: flatcamTools/ToolCalibration.py:617
#, fuzzy
#| msgid "Calc. Tool"
msgid "Cal Exc Tool"
msgstr "Calc. Herramienta"
-#: flatcamTools/ToolCalibrate.py:648 flatcamTools/ToolDblSided.py:457
+#: flatcamTools/ToolCalibration.py:648 flatcamTools/ToolDblSided.py:457
msgid "There is no Excellon object loaded ..."
msgstr "No hay ningún objeto Excellon cargado ..."
-#: flatcamTools/ToolCalibrate.py:651
+#: flatcamTools/ToolCalibration.py:651
#, fuzzy
#| msgid "Click inside the desired polygon."
msgid "Click inside the First drill point. Bottom Left..."
msgstr "Haga clic dentro del polígono deseado."
-#: flatcamTools/ToolCalibrate.py:679
+#: flatcamTools/ToolCalibration.py:679
msgid "Click inside the Second drill point. Bottom Right..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:683
+#: flatcamTools/ToolCalibration.py:683
#, fuzzy
#| msgid "Click inside the desired polygon."
msgid "Click inside the Third drill point. Top Left..."
msgstr "Haga clic dentro del polígono deseado."
-#: flatcamTools/ToolCalibrate.py:687
+#: flatcamTools/ToolCalibration.py:687
msgid "Click inside the Fourth drill point. Top Right..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:691
+#: flatcamTools/ToolCalibration.py:691
msgid "Done. All four points have been acquired."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:705
+#: flatcamTools/ToolCalibration.py:705
#, fuzzy
#| msgid "Generate GCode"
msgid "Verification GCode"
msgstr "Generar GCode"
-#: flatcamTools/ToolCalibrate.py:721
+#: flatcamTools/ToolCalibration.py:721
msgid "Cancelled. Four points are needed for GCode generation."
msgstr ""
diff --git a/locale/ro/LC_MESSAGES/strings.po b/locale/ro/LC_MESSAGES/strings.po
index 1f4f03e1..793827f2 100644
--- a/locale/ro/LC_MESSAGES/strings.po
+++ b/locale/ro/LC_MESSAGES/strings.po
@@ -1782,7 +1782,7 @@ msgstr "Unghi"
#: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:774 flatcamGUI/ObjectUI.py:1345
#: flatcamGUI/PreferencesUI.py:2187 flatcamGUI/PreferencesUI.py:3061
-#: flatcamTools/ToolCalibrate.py:82
+#: flatcamTools/ToolCalibration.py:82
msgid "Travel Z"
msgstr "Z Deplasare"
@@ -1837,7 +1837,7 @@ msgid "Toolchange XY"
msgstr "X,Y schimb. unealtă"
#: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2213
-#: flatcamGUI/PreferencesUI.py:3093 flatcamTools/ToolCalibrate.py:119
+#: flatcamGUI/PreferencesUI.py:3093 flatcamTools/ToolCalibration.py:119
msgid "Toolchange Z"
msgstr "Z schimb. unealtă"
@@ -2492,13 +2492,13 @@ msgid "Plotting..."
msgstr "Se afișeaza..."
#: FlatCAMObj.py:6053 FlatCAMObj.py:6058
-#: flatcamTools/ToolCalibrate.py:624
-#: flatcamTools/ToolCalibrate.py:629
+#: flatcamTools/ToolCalibration.py:624
+#: flatcamTools/ToolCalibration.py:629
#: flatcamTools/ToolSolderPaste.py:1470
msgid "Export Machine Code ..."
msgstr "Exporta CNC Cod Masina ..."
-#: FlatCAMObj.py:6064 flatcamTools/ToolCalibrate.py:634
+#: FlatCAMObj.py:6064 flatcamTools/ToolCalibration.py:634
#: flatcamTools/ToolSolderPaste.py:1474
msgid "Export Machine Code cancelled ..."
msgstr "Exportul Codului Mașina a fost anulat ..."
@@ -3091,10 +3091,10 @@ msgstr ""
#: flatcamEditors/FlatCAMGrbEditor.py:2731 flatcamGUI/PreferencesUI.py:1782
#: flatcamGUI/PreferencesUI.py:2716 flatcamGUI/PreferencesUI.py:2811
#: flatcamGUI/PreferencesUI.py:2864 flatcamGUI/PreferencesUI.py:4586
-#: flatcamTools/ToolCalibrate.py:158
-#: flatcamTools/ToolCalibrate.py:187
-#: flatcamTools/ToolCalibrate.py:211
-#: flatcamTools/ToolCalibrate.py:235 flatcamTools/ToolFilm.py:233
+#: flatcamTools/ToolCalibration.py:158
+#: flatcamTools/ToolCalibration.py:187
+#: flatcamTools/ToolCalibration.py:211
+#: flatcamTools/ToolCalibration.py:235 flatcamTools/ToolFilm.py:233
msgid "X"
msgstr "X"
@@ -3104,10 +3104,10 @@ msgstr "X"
#: flatcamEditors/FlatCAMGrbEditor.py:2732 flatcamGUI/PreferencesUI.py:1783
#: flatcamGUI/PreferencesUI.py:2717 flatcamGUI/PreferencesUI.py:2812
#: flatcamGUI/PreferencesUI.py:2865 flatcamGUI/PreferencesUI.py:4587
-#: flatcamTools/ToolCalibrate.py:166
-#: flatcamTools/ToolCalibrate.py:195
-#: flatcamTools/ToolCalibrate.py:219
-#: flatcamTools/ToolCalibrate.py:243 flatcamTools/ToolFilm.py:234
+#: flatcamTools/ToolCalibration.py:166
+#: flatcamTools/ToolCalibration.py:195
+#: flatcamTools/ToolCalibration.py:219
+#: flatcamTools/ToolCalibration.py:243 flatcamTools/ToolFilm.py:234
msgid "Y"
msgstr "Y"
@@ -3608,8 +3608,8 @@ msgstr "Deformare"
#: flatcamGUI/FlatCAMGUI.py:1835 flatcamGUI/FlatCAMGUI.py:1913
#: flatcamGUI/FlatCAMGUI.py:2247 flatcamGUI/ObjectUI.py:91
#: flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:4922
-#: flatcamTools/ToolCalibrate.py:305
-#: flatcamTools/ToolCalibrate.py:332 flatcamTools/ToolTransform.py:27
+#: flatcamTools/ToolCalibration.py:305
+#: flatcamTools/ToolCalibration.py:332 flatcamTools/ToolTransform.py:27
msgid "Scale"
msgstr "Scalare"
@@ -3665,7 +3665,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:711
#: flatcamEditors/FlatCAMGrbEditor.py:5051
-#: flatcamTools/ToolCalibrate.py:341
+#: flatcamTools/ToolCalibration.py:341
msgid "Angle X:"
msgstr "Unghi X:"
@@ -3673,8 +3673,8 @@ msgstr "Unghi X:"
#: flatcamEditors/FlatCAMGeoEditor.py:731
#: flatcamEditors/FlatCAMGrbEditor.py:5053
#: flatcamEditors/FlatCAMGrbEditor.py:5071 flatcamGUI/PreferencesUI.py:4901
-#: flatcamGUI/PreferencesUI.py:4915 flatcamTools/ToolCalibrate.py:343
-#: flatcamTools/ToolCalibrate.py:356
+#: flatcamGUI/PreferencesUI.py:4915 flatcamTools/ToolCalibration.py:343
+#: flatcamTools/ToolCalibration.py:356
msgid ""
"Angle for Skew action, in degrees.\n"
"Float number between -360 and 359."
@@ -3703,7 +3703,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:729
#: flatcamEditors/FlatCAMGrbEditor.py:5069
-#: flatcamTools/ToolCalibrate.py:354
+#: flatcamTools/ToolCalibration.py:354
msgid "Angle Y:"
msgstr "Unghi Y:"
@@ -3714,13 +3714,13 @@ msgstr "Deformare Y"
#: flatcamEditors/FlatCAMGeoEditor.py:768
#: flatcamEditors/FlatCAMGrbEditor.py:5108
-#: flatcamTools/ToolCalibrate.py:308
+#: flatcamTools/ToolCalibration.py:308
msgid "Factor X:"
msgstr "Factor X:"
#: flatcamEditors/FlatCAMGeoEditor.py:770
#: flatcamEditors/FlatCAMGrbEditor.py:5110
-#: flatcamTools/ToolCalibrate.py:310
+#: flatcamTools/ToolCalibration.py:310
msgid "Factor for Scale action over X axis."
msgstr "Factor pentru scalarea pe axa X."
@@ -3744,13 +3744,13 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:785
#: flatcamEditors/FlatCAMGrbEditor.py:5125
-#: flatcamTools/ToolCalibrate.py:320
+#: flatcamTools/ToolCalibration.py:320
msgid "Factor Y:"
msgstr "Factor Y:"
#: flatcamEditors/FlatCAMGeoEditor.py:787
#: flatcamEditors/FlatCAMGrbEditor.py:5127
-#: flatcamTools/ToolCalibrate.py:322
+#: flatcamTools/ToolCalibration.py:322
msgid "Factor for Scale action over Y axis."
msgstr "Factor pentru scalarea pe axa Y."
@@ -5834,8 +5834,8 @@ msgid "Distance Min Tool"
msgstr "Unealta Distanță min"
#: flatcamGUI/FlatCAMGUI.py:708 flatcamGUI/FlatCAMGUI.py:1424
-#: flatcamGUI/FlatCAMGUI.py:2139 flatcamTools/ToolCalibrate.py:174
-#: flatcamTools/ToolCalibrate.py:175
+#: flatcamGUI/FlatCAMGUI.py:2139 flatcamTools/ToolCalibration.py:174
+#: flatcamTools/ToolCalibration.py:175
msgid "Set Origin"
msgstr "Setează Originea"
@@ -6141,12 +6141,12 @@ msgstr "General"
msgid "GERBER"
msgstr "GERBER"
-#: flatcamGUI/FlatCAMGUI.py:991 flatcamTools/ToolCalibrate.py:66
-#: flatcamTools/ToolCalibrate.py:402 flatcamTools/ToolDblSided.py:79
+#: flatcamGUI/FlatCAMGUI.py:991 flatcamTools/ToolCalibration.py:66
+#: flatcamTools/ToolCalibration.py:402 flatcamTools/ToolDblSided.py:79
msgid "EXCELLON"
msgstr "EXCELLON"
-#: flatcamGUI/FlatCAMGUI.py:1001 flatcamTools/ToolCalibrate.py:415
+#: flatcamGUI/FlatCAMGUI.py:1001 flatcamTools/ToolCalibration.py:415
#: flatcamTools/ToolDblSided.py:103
msgid "GEOMETRY"
msgstr "GEOMETRIE"
@@ -10967,17 +10967,17 @@ msgstr ""
"Poate fi unul dintre cele patru puncte ale căsuței de delimitare a "
"geometriei."
-#: flatcamGUI/PreferencesUI.py:4563 flatcamTools/ToolCalibrate.py:151
+#: flatcamGUI/PreferencesUI.py:4563 flatcamTools/ToolCalibration.py:151
#: flatcamTools/ToolFilm.py:207
msgid "Bottom Left"
msgstr "Stânga jos"
-#: flatcamGUI/PreferencesUI.py:4564 flatcamTools/ToolCalibrate.py:204
+#: flatcamGUI/PreferencesUI.py:4564 flatcamTools/ToolCalibration.py:204
#: flatcamTools/ToolFilm.py:208
msgid "Top Left"
msgstr "Stânga sus"
-#: flatcamGUI/PreferencesUI.py:4565 flatcamTools/ToolCalibrate.py:180
+#: flatcamGUI/PreferencesUI.py:4565 flatcamTools/ToolCalibration.py:180
#: flatcamTools/ToolFilm.py:209
msgid "Bottom Right"
msgstr "Dreapta-jos"
@@ -11242,8 +11242,8 @@ msgstr ""
"Diverse transformări care pot fi aplicate\n"
"asupra unui obiect FlatCAM."
-#: flatcamGUI/PreferencesUI.py:4891 flatcamTools/ToolCalibrate.py:338
-#: flatcamTools/ToolCalibrate.py:367
+#: flatcamGUI/PreferencesUI.py:4891 flatcamTools/ToolCalibration.py:338
+#: flatcamTools/ToolCalibration.py:367
msgid "Skew"
msgstr "Deformare"
@@ -12292,30 +12292,30 @@ msgstr ""
msgid "Calc. Tool"
msgstr "Unealta Calc"
-#: flatcamTools/ToolCalibrate.py:33
+#: flatcamTools/ToolCalibration.py:33
#, fuzzy
#| msgid "Creating Excellon."
msgid "Calibrate Excellon"
msgstr "In curs de creere Excellon."
-#: flatcamTools/ToolCalibrate.py:68
+#: flatcamTools/ToolCalibration.py:68
#, fuzzy
#| msgid "The FlatCAM object to be used as non copper clearing reference."
msgid "Excellon Object to be used as a source for reference points."
msgstr ""
"Obiectul FlatCAM pentru a fi utilizat ca referință pt. curățarea de cupru."
-#: flatcamTools/ToolCalibrate.py:75
+#: flatcamTools/ToolCalibration.py:75
#, fuzzy
#| msgid "Slot Parameters"
msgid "GCode Parameters"
msgstr "Parametrii pt slot"
-#: flatcamTools/ToolCalibrate.py:77
+#: flatcamTools/ToolCalibration.py:77
msgid "Parameters used when creating the GCode in this tool."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:84
+#: flatcamTools/ToolCalibration.py:84
#, fuzzy
#| msgid ""
#| "The height (Z) for travel between pads\n"
@@ -12325,228 +12325,228 @@ msgstr ""
"Înălţimea (Z) când se face deplasare între pad-uri.\n"
"(fără dispensare de pastă de fludor)."
-#: flatcamTools/ToolCalibrate.py:96
+#: flatcamTools/ToolCalibration.py:96
#, fuzzy
#| msgid "Gerber Specification"
msgid "Verification Z"
msgstr "Specificatii Gerber"
-#: flatcamTools/ToolCalibrate.py:98
+#: flatcamTools/ToolCalibration.py:98
msgid "Height (Z) for checking the point."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:110
+#: flatcamTools/ToolCalibration.py:110
msgid "Zero Z tool"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:112
+#: flatcamTools/ToolCalibration.py:112
msgid ""
"Include a sequence to zero the height (Z)\n"
"of the verification tool."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:121
+#: flatcamTools/ToolCalibration.py:121
msgid "Height (Z) for mounting the verification probe."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:143
+#: flatcamTools/ToolCalibration.py:143
msgid "Calibration Points"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:145
+#: flatcamTools/ToolCalibration.py:145
msgid ""
"Contain the expected calibration points and the\n"
"ones measured."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:153
-#: flatcamTools/ToolCalibrate.py:182
-#: flatcamTools/ToolCalibrate.py:206
-#: flatcamTools/ToolCalibrate.py:230 flatcamTools/ToolSub.py:73
+#: flatcamTools/ToolCalibration.py:153
+#: flatcamTools/ToolCalibration.py:182
+#: flatcamTools/ToolCalibration.py:206
+#: flatcamTools/ToolCalibration.py:230 flatcamTools/ToolSub.py:73
#: flatcamTools/ToolSub.py:119
msgid "Target"
msgstr "Tintă"
-#: flatcamTools/ToolCalibrate.py:155
+#: flatcamTools/ToolCalibration.py:155
#, fuzzy
#| msgid "Set Origin"
msgid "Cal. Origin"
msgstr "Setează Originea"
-#: flatcamTools/ToolCalibrate.py:184
-#: flatcamTools/ToolCalibrate.py:208
-#: flatcamTools/ToolCalibrate.py:232
+#: flatcamTools/ToolCalibration.py:184
+#: flatcamTools/ToolCalibration.py:208
+#: flatcamTools/ToolCalibration.py:232
msgid "Found Delta"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:228
+#: flatcamTools/ToolCalibration.py:228
#, fuzzy
#| msgid "Top right"
msgid "Top Right"
msgstr "Dreapta-sus"
-#: flatcamTools/ToolCalibrate.py:252
+#: flatcamTools/ToolCalibration.py:252
#: flatcamTools/ToolSolderPaste.py:148
msgid "STEP 1"
msgstr "PAS 1"
-#: flatcamTools/ToolCalibrate.py:254
+#: flatcamTools/ToolCalibration.py:254
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four\n"
"(as much as possible) corners of the Excellon object."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:261
+#: flatcamTools/ToolCalibration.py:261
msgid "Acquire Calibration Points"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:263
+#: flatcamTools/ToolCalibration.py:263
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four squares of\n"
"the Excellon object."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:271
+#: flatcamTools/ToolCalibration.py:271
#: flatcamTools/ToolSolderPaste.py:358
msgid "STEP 2"
msgstr "PAS 2"
-#: flatcamTools/ToolCalibrate.py:273
-#: flatcamTools/ToolCalibrate.py:281
+#: flatcamTools/ToolCalibration.py:273
+#: flatcamTools/ToolCalibration.py:281
msgid ""
"Generate GCode file to locate and align the PCB by using\n"
"the four points acquired above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:279
+#: flatcamTools/ToolCalibration.py:279
#: flatcamTools/ToolSolderPaste.py:341
msgid "Generate GCode"
msgstr "Genereaa GCode"
-#: flatcamTools/ToolCalibrate.py:288
+#: flatcamTools/ToolCalibration.py:288
#: flatcamTools/ToolSolderPaste.py:387
msgid "STEP 3"
msgstr "PAS 3"
-#: flatcamTools/ToolCalibrate.py:290
-#: flatcamTools/ToolCalibrate.py:299
+#: flatcamTools/ToolCalibration.py:290
+#: flatcamTools/ToolCalibration.py:299
msgid ""
"Calculate Scale and Skew factors based on the differences (delta)\n"
"found when checking the PCB pattern. The differences must be filled\n"
"in the fields Found (Delta)."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:297
+#: flatcamTools/ToolCalibration.py:297
#, fuzzy
#| msgid "Calculators"
msgid "Calculate Factors"
msgstr "Calculatoare"
-#: flatcamTools/ToolCalibrate.py:334
+#: flatcamTools/ToolCalibration.py:334
msgid "Apply Scale factors on the calibration points."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:369
+#: flatcamTools/ToolCalibration.py:369
msgid "Apply Skew factors on the calibration points."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:374
+#: flatcamTools/ToolCalibration.py:374
#: flatcamTools/ToolSolderPaste.py:433
msgid "STEP 4"
msgstr "PAS 4"
-#: flatcamTools/ToolCalibrate.py:376
-#: flatcamTools/ToolCalibrate.py:384
+#: flatcamTools/ToolCalibration.py:376
+#: flatcamTools/ToolCalibration.py:384
msgid ""
"Generate verification GCode file adjusted with\n"
"the factors above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:382
+#: flatcamTools/ToolCalibration.py:382
#, fuzzy
#| msgid "Generate GCode"
msgid "Generate Adjusted GCode"
msgstr "Genereaa GCode"
-#: flatcamTools/ToolCalibrate.py:390
+#: flatcamTools/ToolCalibration.py:390
#, fuzzy
#| msgid "STEP 1"
msgid "STEP 5"
msgstr "PAS 1"
-#: flatcamTools/ToolCalibrate.py:392
+#: flatcamTools/ToolCalibration.py:392
msgid ""
"Ajust the Excellon and Cutout Geometry objects\n"
"with the factors determined, and verified, above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:404
+#: flatcamTools/ToolCalibration.py:404
#, fuzzy
#| msgid "Excellon Object to be mirrored."
msgid "Excellon Object to be adjusted."
msgstr "Obiectul Excellon care va fi oglindit."
-#: flatcamTools/ToolCalibrate.py:417
+#: flatcamTools/ToolCalibration.py:417
#, fuzzy
#| msgid "Geometry Obj to be mirrored."
msgid "Geometry Object to be adjusted."
msgstr "Obiectul Geometrie care va fi oglindit."
-#: flatcamTools/ToolCalibrate.py:424
+#: flatcamTools/ToolCalibration.py:424
#, fuzzy
#| msgid "Edit Object\tE"
msgid "Adjust Objects"
msgstr "Editare Obiect\tE"
-#: flatcamTools/ToolCalibrate.py:426
+#: flatcamTools/ToolCalibration.py:426
msgid ""
"Adjust (scale and / or skew) the objects\n"
"with the factors determined above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:476
+#: flatcamTools/ToolCalibration.py:476
#, fuzzy
#| msgid "Calc. Tool"
msgid "Cal Exc Tool"
msgstr "Unealta Calc"
-#: flatcamTools/ToolCalibrate.py:507 flatcamTools/ToolDblSided.py:468
+#: flatcamTools/ToolCalibration.py:507 flatcamTools/ToolDblSided.py:468
msgid "There is no Excellon object loaded ..."
msgstr "Nici-un obiect tip Excellon nu este incărcat ..."
-#: flatcamTools/ToolCalibrate.py:510
+#: flatcamTools/ToolCalibration.py:510
#, fuzzy
#| msgid "Click inside the desired polygon."
msgid "Click inside the First drill point. Bottom Left..."
msgstr "Click in interiorul poligonului care se dorește să fie 'pictat'."
-#: flatcamTools/ToolCalibrate.py:538
+#: flatcamTools/ToolCalibration.py:538
msgid "Click inside the Second drill point. Bottom Right..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:542
+#: flatcamTools/ToolCalibration.py:542
#, fuzzy
#| msgid "Click inside the desired polygon."
msgid "Click inside the Third drill point. Top Left..."
msgstr "Click in interiorul poligonului care se dorește să fie 'pictat'."
-#: flatcamTools/ToolCalibrate.py:546
+#: flatcamTools/ToolCalibration.py:546
msgid "Click inside the Fourth drill point. Top Right..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:550
+#: flatcamTools/ToolCalibration.py:550
msgid "Done. All four points have been acquired."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:564
+#: flatcamTools/ToolCalibration.py:564
#, fuzzy
#| msgid "Generate GCode"
msgid "Verification GCode"
msgstr "Genereaa GCode"
-#: flatcamTools/ToolCalibrate.py:580
+#: flatcamTools/ToolCalibration.py:580
msgid "Cancelled. Four points are needed for GCode generation."
msgstr ""
diff --git a/locale_template/strings.pot b/locale_template/strings.pot
index 791ea5cf..7556d5d1 100644
--- a/locale_template/strings.pot
+++ b/locale_template/strings.pot
@@ -1615,7 +1615,7 @@ msgstr ""
#: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:798 flatcamGUI/ObjectUI.py:1369
#: flatcamGUI/PreferencesUI.py:2304 flatcamGUI/PreferencesUI.py:3178
-#: flatcamTools/ToolCalibrate.py:82
+#: flatcamTools/ToolCalibration.py:82
msgid "Travel Z"
msgstr ""
@@ -1662,7 +1662,7 @@ msgid "Toolchange XY"
msgstr ""
#: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2330 flatcamGUI/PreferencesUI.py:3210
-#: flatcamTools/ToolCalibrate.py:119
+#: flatcamTools/ToolCalibration.py:119
msgid "Toolchange Z"
msgstr ""
@@ -2277,12 +2277,12 @@ msgstr ""
msgid "Plotting..."
msgstr ""
-#: FlatCAMObj.py:6172 FlatCAMObj.py:6177 flatcamTools/ToolCalibrate.py:765
-#: flatcamTools/ToolCalibrate.py:770 flatcamTools/ToolSolderPaste.py:1470
+#: FlatCAMObj.py:6172 FlatCAMObj.py:6177 flatcamTools/ToolCalibration.py:765
+#: flatcamTools/ToolCalibration.py:770 flatcamTools/ToolSolderPaste.py:1470
msgid "Export Machine Code ..."
msgstr ""
-#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrate.py:775
+#: FlatCAMObj.py:6182 flatcamTools/ToolCalibration.py:775
#: flatcamTools/ToolSolderPaste.py:1474
msgid "Export Machine Code cancelled ..."
msgstr ""
@@ -3198,7 +3198,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGrbEditor.py:5017 flatcamGUI/FlatCAMGUI.py:829
#: flatcamGUI/FlatCAMGUI.py:1849 flatcamGUI/FlatCAMGUI.py:1927 flatcamGUI/FlatCAMGUI.py:2262
#: flatcamGUI/ObjectUI.py:91 flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:5139
-#: flatcamTools/ToolCalibrate.py:446 flatcamTools/ToolCalibrate.py:473
+#: flatcamTools/ToolCalibration.py:446 flatcamTools/ToolCalibration.py:473
#: flatcamTools/ToolTransform.py:27
msgid "Scale"
msgstr ""
@@ -3242,14 +3242,14 @@ msgid ""
msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:711 flatcamEditors/FlatCAMGrbEditor.py:5102
-#: flatcamTools/ToolCalibrate.py:482
+#: flatcamTools/ToolCalibration.py:482
msgid "Angle X:"
msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:713 flatcamEditors/FlatCAMGeoEditor.py:731
#: flatcamEditors/FlatCAMGrbEditor.py:5104 flatcamEditors/FlatCAMGrbEditor.py:5122
#: flatcamGUI/PreferencesUI.py:5118 flatcamGUI/PreferencesUI.py:5132
-#: flatcamTools/ToolCalibrate.py:484 flatcamTools/ToolCalibrate.py:497
+#: flatcamTools/ToolCalibration.py:484 flatcamTools/ToolCalibration.py:497
msgid ""
"Angle for Skew action, in degrees.\n"
"Float number between -360 and 359."
@@ -3269,7 +3269,7 @@ msgid ""
msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:729 flatcamEditors/FlatCAMGrbEditor.py:5120
-#: flatcamTools/ToolCalibrate.py:495
+#: flatcamTools/ToolCalibration.py:495
msgid "Angle Y:"
msgstr ""
@@ -3279,12 +3279,12 @@ msgid "Skew Y"
msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:768 flatcamEditors/FlatCAMGrbEditor.py:5159
-#: flatcamTools/ToolCalibrate.py:449
+#: flatcamTools/ToolCalibration.py:449
msgid "Factor X:"
msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:770 flatcamEditors/FlatCAMGrbEditor.py:5161
-#: flatcamTools/ToolCalibrate.py:451
+#: flatcamTools/ToolCalibration.py:451
msgid "Factor for Scale action over X axis."
msgstr ""
@@ -3302,12 +3302,12 @@ msgid ""
msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:785 flatcamEditors/FlatCAMGrbEditor.py:5176
-#: flatcamTools/ToolCalibrate.py:461
+#: flatcamTools/ToolCalibration.py:461
msgid "Factor Y:"
msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:787 flatcamEditors/FlatCAMGrbEditor.py:5178
-#: flatcamTools/ToolCalibrate.py:463
+#: flatcamTools/ToolCalibration.py:463
msgid "Factor for Scale action over Y axis."
msgstr ""
@@ -5437,12 +5437,12 @@ msgstr ""
msgid "GERBER"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrate.py:66
-#: flatcamTools/ToolCalibrate.py:543 flatcamTools/ToolDblSided.py:79
+#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibration.py:66
+#: flatcamTools/ToolCalibration.py:543 flatcamTools/ToolDblSided.py:79
msgid "EXCELLON"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrate.py:556
+#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibration.py:556
#: flatcamTools/ToolDblSided.py:101
msgid "GEOMETRY"
msgstr ""
@@ -6223,7 +6223,7 @@ msgstr ""
#: flatcamGUI/ObjectUI.py:199 flatcamGUI/ObjectUI.py:697 flatcamGUI/ObjectUI.py:1089
#: flatcamGUI/ObjectUI.py:1671 flatcamGUI/ObjectUI.py:1952 flatcamGUI/ObjectUI.py:2004
-#: flatcamTools/ToolCalibrate.py:159 flatcamTools/ToolFiducials.py:73
+#: flatcamTools/ToolCalibration.py:159 flatcamTools/ToolFiducials.py:73
msgid "Name"
msgstr ""
@@ -9662,8 +9662,8 @@ msgid ""
"on a FlatCAM object."
msgstr ""
-#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrate.py:479
-#: flatcamTools/ToolCalibrate.py:508
+#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibration.py:479
+#: flatcamTools/ToolCalibration.py:508
msgid "Skew"
msgstr ""
@@ -10728,237 +10728,237 @@ msgstr ""
msgid "Calc. Tool"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:33
+#: flatcamTools/ToolCalibration.py:33
msgid "Calibrate Excellon"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:68
+#: flatcamTools/ToolCalibration.py:68
msgid "Excellon Object to be used as a source for reference points."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:75
+#: flatcamTools/ToolCalibration.py:75
msgid "GCode Parameters"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:77
+#: flatcamTools/ToolCalibration.py:77
msgid "Parameters used when creating the GCode in this tool."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:84
+#: flatcamTools/ToolCalibration.py:84
msgid "Height (Z) for travelling between the points."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:96
+#: flatcamTools/ToolCalibration.py:96
msgid "Verification Z"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:98
+#: flatcamTools/ToolCalibration.py:98
msgid "Height (Z) for checking the point."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:110
+#: flatcamTools/ToolCalibration.py:110
msgid "Zero Z tool"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:112
+#: flatcamTools/ToolCalibration.py:112
msgid ""
"Include a sequence to zero the height (Z)\n"
"of the verification tool."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:121
+#: flatcamTools/ToolCalibration.py:121
msgid "Height (Z) for mounting the verification probe."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:143
+#: flatcamTools/ToolCalibration.py:143
msgid "Calibration Points"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:145
+#: flatcamTools/ToolCalibration.py:145
msgid ""
"Contain the expected calibration points and the\n"
"ones measured."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:160 flatcamTools/ToolSub.py:73
+#: flatcamTools/ToolCalibration.py:160 flatcamTools/ToolSub.py:73
#: flatcamTools/ToolSub.py:119
msgid "Target"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:161
+#: flatcamTools/ToolCalibration.py:161
msgid "Found Delta"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:173
+#: flatcamTools/ToolCalibration.py:173
msgid "Bot Left X"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:182
+#: flatcamTools/ToolCalibration.py:182
msgid "Bot Left Y"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:190 flatcamTools/ToolCalibrate.py:191
+#: flatcamTools/ToolCalibration.py:190 flatcamTools/ToolCalibration.py:191
msgid "Origin"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:202
+#: flatcamTools/ToolCalibration.py:202
msgid "Bot Right X"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:212
+#: flatcamTools/ToolCalibration.py:212
msgid "Bot Right Y"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:227
+#: flatcamTools/ToolCalibration.py:227
msgid "Top Left X"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:236
+#: flatcamTools/ToolCalibration.py:236
msgid "Top Left Y"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:251
+#: flatcamTools/ToolCalibration.py:251
msgid "Top Right X"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:260
+#: flatcamTools/ToolCalibration.py:260
msgid "Top Right Y"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:393 flatcamTools/ToolSolderPaste.py:148
+#: flatcamTools/ToolCalibration.py:393 flatcamTools/ToolSolderPaste.py:148
msgid "STEP 1"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:395
+#: flatcamTools/ToolCalibration.py:395
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four\n"
"(as much as possible) corners of the Excellon object."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:402
+#: flatcamTools/ToolCalibration.py:402
msgid "Acquire Calibration Points"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:404
+#: flatcamTools/ToolCalibration.py:404
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four squares of\n"
"the Excellon object."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:412 flatcamTools/ToolSolderPaste.py:358
+#: flatcamTools/ToolCalibration.py:412 flatcamTools/ToolSolderPaste.py:358
msgid "STEP 2"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:414 flatcamTools/ToolCalibrate.py:422
+#: flatcamTools/ToolCalibration.py:414 flatcamTools/ToolCalibration.py:422
msgid ""
"Generate GCode file to locate and align the PCB by using\n"
"the four points acquired above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:420 flatcamTools/ToolSolderPaste.py:341
+#: flatcamTools/ToolCalibration.py:420 flatcamTools/ToolSolderPaste.py:341
msgid "Generate GCode"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:429 flatcamTools/ToolSolderPaste.py:387
+#: flatcamTools/ToolCalibration.py:429 flatcamTools/ToolSolderPaste.py:387
msgid "STEP 3"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:431 flatcamTools/ToolCalibrate.py:440
+#: flatcamTools/ToolCalibration.py:431 flatcamTools/ToolCalibration.py:440
msgid ""
"Calculate Scale and Skew factors based on the differences (delta)\n"
"found when checking the PCB pattern. The differences must be filled\n"
"in the fields Found (Delta)."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:438
+#: flatcamTools/ToolCalibration.py:438
msgid "Calculate Factors"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:475
+#: flatcamTools/ToolCalibration.py:475
msgid "Apply Scale factors on the calibration points."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:510
+#: flatcamTools/ToolCalibration.py:510
msgid "Apply Skew factors on the calibration points."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:515 flatcamTools/ToolSolderPaste.py:433
+#: flatcamTools/ToolCalibration.py:515 flatcamTools/ToolSolderPaste.py:433
msgid "STEP 4"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:517 flatcamTools/ToolCalibrate.py:525
+#: flatcamTools/ToolCalibration.py:517 flatcamTools/ToolCalibration.py:525
msgid ""
"Generate verification GCode file adjusted with\n"
"the factors above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:523
+#: flatcamTools/ToolCalibration.py:523
msgid "Generate Adjusted GCode"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:531
+#: flatcamTools/ToolCalibration.py:531
msgid "STEP 5"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:533
+#: flatcamTools/ToolCalibration.py:533
msgid ""
"Ajust the Excellon and Cutout Geometry objects\n"
"with the factors determined, and verified, above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:545
+#: flatcamTools/ToolCalibration.py:545
msgid "Excellon Object to be adjusted."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:558
+#: flatcamTools/ToolCalibration.py:558
msgid "Geometry Object to be adjusted."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:565
+#: flatcamTools/ToolCalibration.py:565
msgid "Adjust Objects"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:567
+#: flatcamTools/ToolCalibration.py:567
msgid ""
"Adjust (scale and/or skew) the objects\n"
"with the factors determined above."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:617
+#: flatcamTools/ToolCalibration.py:617
msgid "Cal Exc Tool"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:648 flatcamTools/ToolDblSided.py:457
+#: flatcamTools/ToolCalibration.py:648 flatcamTools/ToolDblSided.py:457
msgid "There is no Excellon object loaded ..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:651
+#: flatcamTools/ToolCalibration.py:651
msgid "Click inside the First drill point. Bottom Left..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:679
+#: flatcamTools/ToolCalibration.py:679
msgid "Click inside the Second drill point. Bottom Right..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:683
+#: flatcamTools/ToolCalibration.py:683
msgid "Click inside the Third drill point. Top Left..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:687
+#: flatcamTools/ToolCalibration.py:687
msgid "Click inside the Fourth drill point. Top Right..."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:691
+#: flatcamTools/ToolCalibration.py:691
msgid "Done. All four points have been acquired."
msgstr ""
-#: flatcamTools/ToolCalibrate.py:705
+#: flatcamTools/ToolCalibration.py:705
msgid "Verification GCode"
msgstr ""
-#: flatcamTools/ToolCalibrate.py:721
+#: flatcamTools/ToolCalibration.py:721
msgid "Cancelled. Four points are needed for GCode generation."
msgstr ""