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

- added a fix in the Gerber parser when adding the geometry in the self.apertures dict for the case that the current aperture is None (Allegro does that)

Browse Source 
- finished support for internationalization by adding a set of .po/.mo files for the English language. Unfortunately the final action can be done only when Beta will be out of Beta (no more changes) or when I will decide to stop working on this app.
- changed the tooltip for 'feedrate_rapids' parameter to point out that this parameter is useful only for the Marlin postprocessor
This commit is contained in:
Marius Stanciu
2019-03-10 14:34:13 +02:00
parent de79370fb3
commit 53627b566c
98 changed files with 25132 additions and 3092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
flatcamTools/ToolDblSided.py
View File

@@ -11,16 +11,9 @@ import FlatCAMTranslation as fcTranslate
fcTranslate.apply_language('ToolDblSided')
def _tr(text):
try:
return _(text)
except:
return text
class DblSidedTool(FlatCAMTool):
toolName = _tr("2-Sided PCB")
toolName = _("2-Sided PCB")
def __init__(self, app):
FlatCAMTool.__init__(self, app)
@@ -54,9 +47,9 @@ class DblSidedTool(FlatCAMTool):
"Gerber to be mirrored."
)
self.mirror_gerber_button = QtWidgets.QPushButton(_tr("Mirror"))
self.mirror_gerber_button = QtWidgets.QPushButton(_("Mirror"))
self.mirror_gerber_button.setToolTip(
_tr("Mirrors (flips) the specified object around \n"
_("Mirrors (flips) the specified object around \n"
"the specified axis. Does not create a new \n"
"object, but modifies it.")
)
@@ -75,12 +68,12 @@ class DblSidedTool(FlatCAMTool):
self.excobj_label = QtWidgets.QLabel("<b>EXCELLON:</b>")
self.excobj_label.setToolTip(
_tr("Excellon Object to be mirrored.")
_("Excellon Object to be mirrored.")
)
self.mirror_exc_button = QtWidgets.QPushButton(_tr("Mirror"))
self.mirror_exc_button = QtWidgets.QPushButton(_("Mirror"))
self.mirror_exc_button.setToolTip(
_tr("Mirrors (flips) the specified object around \n"
_("Mirrors (flips) the specified object around \n"
"the specified axis. Does not create a new \n"
"object, but modifies it.")
)
@@ -99,12 +92,12 @@ class DblSidedTool(FlatCAMTool):
self.geoobj_label = QtWidgets.QLabel("<b>GEOMETRY</b>:")
self.geoobj_label.setToolTip(
_tr("Geometry Obj to be mirrored.")
_("Geometry Obj to be mirrored.")
)
self.mirror_geo_button = QtWidgets.QPushButton(_tr("Mirror"))
self.mirror_geo_button = QtWidgets.QPushButton(_("Mirror"))
self.mirror_geo_button.setToolTip(
_tr("Mirrors (flips) the specified object around \n"
_("Mirrors (flips) the specified object around \n"
"the specified axis. Does not create a new \n"
"object, but modifies it.")
)
@@ -118,9 +111,9 @@ class DblSidedTool(FlatCAMTool):
## Axis
self.mirror_axis = RadioSet([{'label': 'X', 'value': 'X'},
{'label': 'Y', 'value': 'Y'}])
self.mirax_label = QtWidgets.QLabel(_tr("Mirror Axis:"))
self.mirax_label = QtWidgets.QLabel(_("Mirror Axis:"))
self.mirax_label.setToolTip(
_tr("Mirror vertically (X) or horizontally (Y).")
_("Mirror vertically (X) or horizontally (Y).")
)
# grid_lay.addRow("Mirror Axis:", self.mirror_axis)
self.empty_lb1 = QtWidgets.QLabel("")
@@ -131,9 +124,9 @@ class DblSidedTool(FlatCAMTool):
## Axis Location
self.axis_location = RadioSet([{'label': 'Point', 'value': 'point'},
{'label': 'Box', 'value': 'box'}])
self.axloc_label = QtWidgets.QLabel(_tr("Axis Ref:"))
self.axloc_label = QtWidgets.QLabel(_("Axis Ref:"))
self.axloc_label.setToolTip(
_tr("The axis should pass through a <b>point</b> or cut\n "
_("The axis should pass through a <b>point</b> or cut\n "
"a specified <b>box</b> (in a FlatCAM object) through \n"
"the center.")
)
@@ -146,17 +139,17 @@ class DblSidedTool(FlatCAMTool):
## Point/Box
self.point_box_container = QtWidgets.QVBoxLayout()
self.pb_label = QtWidgets.QLabel("<b>%s</b>" % _tr('Point/Box Reference:'))
self.pb_label = QtWidgets.QLabel("<b>%s</b>" % _('Point/Box Reference:'))
self.pb_label.setToolTip(
_tr("If 'Point' is selected above it store the coordinates (x, y) through which\n"
_("If 'Point' is selected above it store the coordinates (x, y) through which\n"
"the mirroring axis passes.\n"
"If 'Box' is selected above, select here a FlatCAM object (Gerber, Exc or Geo).\n"
"Through the center of this object pass the mirroring axis selected above.")
)
self.add_point_button = QtWidgets.QPushButton(_tr("Add"))
self.add_point_button = QtWidgets.QPushButton(_("Add"))
self.add_point_button.setToolTip(
_tr("Add the coordinates in format <b>(x, y)</b> through which the mirroring axis \n "
_("Add the coordinates in format <b>(x, y)</b> through which the mirroring axis \n "
"selected in 'MIRROR AXIS' pass.\n"
"The (x, y) coordinates are captured by pressing SHIFT key\n"
"and left mouse button click on canvas or you can enter the coords manually.")
@@ -176,9 +169,9 @@ class DblSidedTool(FlatCAMTool):
self.box_combo.setCurrentIndex(1)
self.box_combo_type = QtWidgets.QComboBox()
self.box_combo_type.addItem(_tr("Gerber Reference Box Object"))
self.box_combo_type.addItem(_tr("Excellon Reference Box Object"))
self.box_combo_type.addItem(_tr("Geometry Reference Box Object"))
self.box_combo_type.addItem(_("Gerber Reference Box Object"))
self.box_combo_type.addItem(_("Excellon Reference Box Object"))
self.box_combo_type.addItem(_("Geometry Reference Box Object"))
self.point_box_container.addWidget(self.box_combo_type)
self.point_box_container.addWidget(self.box_combo)
@@ -187,9 +180,9 @@ class DblSidedTool(FlatCAMTool):
## Alignment holes
self.ah_label = QtWidgets.QLabel("<b%s</b>" % _tr('>Alignment Drill Coordinates:'))
self.ah_label = QtWidgets.QLabel("<b%s</b>" % _('>Alignment Drill Coordinates:'))
self.ah_label.setToolTip(
_tr( "Alignment holes (x1, y1), (x2, y2), ... "
_( "Alignment holes (x1, y1), (x2, y2), ... "
"on one side of the mirror axis. For each set of (x, y) coordinates\n"
"entered here, a pair of drills will be created:\n\n"
"- one drill at the coordinates from the field\n"
@@ -202,9 +195,9 @@ class DblSidedTool(FlatCAMTool):
self.alignment_holes = EvalEntry()
self.add_drill_point_button = QtWidgets.QPushButton(_tr("Add"))
self.add_drill_point_button = QtWidgets.QPushButton(_("Add"))
self.add_drill_point_button.setToolTip(
_tr("Add alignment drill holes coords in the format: (x1, y1), (x2, y2), ... \n"
_("Add alignment drill holes coords in the format: (x1, y1), (x2, y2), ... \n"
"on one side of the mirror axis.\n\n"
"The coordinates set can be obtained:\n"
"- press SHIFT key and left mouse clicking on canvas. Then click Add.\n"
@@ -218,9 +211,9 @@ class DblSidedTool(FlatCAMTool):
grid_lay1.addWidget(self.add_drill_point_button, 0, 3)
## Drill diameter for alignment holes
self.dt_label = QtWidgets.QLabel("<b>%s</b>:" % _tr('Alignment Drill Diameter'))
self.dt_label = QtWidgets.QLabel("<b>%s</b>:" % _('Alignment Drill Diameter'))
self.dt_label.setToolTip(
_tr("Diameter of the drill for the "
_("Diameter of the drill for the "
"alignment holes.")
)
self.layout.addWidget(self.dt_label)
@@ -229,27 +222,27 @@ class DblSidedTool(FlatCAMTool):
self.layout.addLayout(grid_lay2)
self.drill_dia = FCEntry()
self.dd_label = QtWidgets.QLabel(_tr("Drill diam.:"))
self.dd_label = QtWidgets.QLabel(_("Drill diam.:"))
self.dd_label.setToolTip(
_tr("Diameter of the drill for the "
_("Diameter of the drill for the "
"alignment holes.")
)
grid_lay2.addWidget(self.dd_label, 0, 0)
grid_lay2.addWidget(self.drill_dia, 0, 1)
## Buttons
self.create_alignment_hole_button = QtWidgets.QPushButton(_tr("Create Excellon Object"))
self.create_alignment_hole_button = QtWidgets.QPushButton(_("Create Excellon Object"))
self.create_alignment_hole_button.setToolTip(
_tr("Creates an Excellon Object containing the\n"
_("Creates an Excellon Object containing the\n"
"specified alignment holes and their mirror\n"
"images.")
)
# self.create_alignment_hole_button.setFixedWidth(40)
grid_lay2.addWidget(self.create_alignment_hole_button, 1,0, 1, 2)
self.reset_button = QtWidgets.QPushButton(_tr("Reset"))
self.reset_button = QtWidgets.QPushButton(_("Reset"))
self.reset_button.setToolTip(
_tr("Resets all the fields.")
_("Resets all the fields.")
)
self.reset_button.setFixedWidth(40)
grid_lay2.addWidget(self.reset_button, 1, 2)
@@ -291,7 +284,7 @@ class DblSidedTool(FlatCAMTool):
FlatCAMTool.run(self)
self.set_tool_ui()
self.app.ui.notebook.setTabText(2, _tr("2-Sided Tool"))
self.app.ui.notebook.setTabText(2, _("2-Sided Tool"))
def set_tool_ui(self):
self.reset_fields()
@@ -316,7 +309,7 @@ class DblSidedTool(FlatCAMTool):
try:
px, py = self.point_entry.get_value()
except TypeError:
self.app.inform.emit(_tr("[WARNING_NOTCL] 'Point' reference is selected and 'Point' coordinates "
self.app.inform.emit(_("[WARNING_NOTCL] 'Point' reference is selected and 'Point' coordinates "
"are missing. Add them and retry."))
return
else:
@@ -335,7 +328,7 @@ class DblSidedTool(FlatCAMTool):
bb_obj = model_index.internalPointer().obj
except AttributeError:
self.app.inform.emit(
_tr("[WARNING_NOTCL] There is no Box reference object loaded. Load one and retry."))
_("[WARNING_NOTCL] There is no Box reference object loaded. Load one and retry."))
return
xmin, ymin, xmax, ymax = bb_obj.bounds()
@@ -352,19 +345,19 @@ class DblSidedTool(FlatCAMTool):
dia = float(self.drill_dia.get_value().replace(',', '.'))
self.drill_dia.set_value(dia)
except ValueError:
self.app.inform.emit(_tr("[WARNING_NOTCL] Tool diameter value is missing or wrong format. "
self.app.inform.emit(_("[WARNING_NOTCL] Tool diameter value is missing or wrong format. "
"Add it and retry."))
return
if dia is '':
self.app.inform.emit(_tr("[WARNING_NOTCL]No value or wrong format in Drill Dia entry. Add it and retry."))
self.app.inform.emit(_("[WARNING_NOTCL]No value or wrong format in Drill Dia entry. Add it and retry."))
return
tools = {"1": {"C": dia}}
# holes = self.alignment_holes.get_value()
holes = eval('[{}]'.format(self.alignment_holes.text()))
if not holes:
self.app.inform.emit(_tr("[WARNING_NOTCL] There are no Alignment Drill Coordinates to use. Add them and retry."))
self.app.inform.emit(_("[WARNING_NOTCL] There are no Alignment Drill Coordinates to use. Add them and retry."))
return
drills = []
@@ -386,7 +379,7 @@ class DblSidedTool(FlatCAMTool):
self.app.new_object("excellon", "Alignment Drills", obj_init)
self.drill_values = ''
self.app.inform.emit(_tr("[success] Excellon object with alignment drills created..."))
self.app.inform.emit(_("[success] Excellon object with alignment drills created..."))
def on_mirror_gerber(self):
selection_index = self.gerber_object_combo.currentIndex()
@@ -395,11 +388,11 @@ class DblSidedTool(FlatCAMTool):
try:
fcobj = model_index.internalPointer().obj
except Exception as e:
self.app.inform.emit(_tr("[WARNING_NOTCL] There is no Gerber object loaded ..."))
self.app.inform.emit(_("[WARNING_NOTCL] There is no Gerber object loaded ..."))
return
if not isinstance(fcobj, FlatCAMGerber):
self.app.inform.emit(_tr("[ERROR_NOTCL] Only Gerber, Excellon and Geometry objects can be mirrored."))
self.app.inform.emit(_("[ERROR_NOTCL] Only Gerber, Excellon and Geometry objects can be mirrored."))
return
axis = self.mirror_axis.get_value()
@@ -409,7 +402,7 @@ class DblSidedTool(FlatCAMTool):
try:
px, py = self.point_entry.get_value()
except TypeError:
self.app.inform.emit(_tr("[WARNING_NOTCL] 'Point' coordinates missing. "
self.app.inform.emit(_("[WARNING_NOTCL] 'Point' coordinates missing. "
"Using Origin (0, 0) as mirroring reference."))
px, py = (0, 0)
@@ -419,7 +412,7 @@ class DblSidedTool(FlatCAMTool):
try:
bb_obj = model_index_box.internalPointer().obj
except Exception as e:
self.app.inform.emit(_tr("[WARNING_NOTCL] There is no Box object loaded ..."))
self.app.inform.emit(_("[WARNING_NOTCL] There is no Box object loaded ..."))
return
xmin, ymin, xmax, ymax = bb_obj.bounds()
@@ -429,7 +422,7 @@ class DblSidedTool(FlatCAMTool):
fcobj.mirror(axis, [px, py])
self.app.object_changed.emit(fcobj)
fcobj.plot()
self.app.inform.emit(_tr("[success] Gerber %s was mirrored...") % str(fcobj.options['name']))
self.app.inform.emit(_("[success] Gerber %s was mirrored...") % str(fcobj.options['name']))
def on_mirror_exc(self):
selection_index = self.exc_object_combo.currentIndex()
@@ -438,11 +431,11 @@ class DblSidedTool(FlatCAMTool):
try:
fcobj = model_index.internalPointer().obj
except Exception as e:
self.app.inform.emit(_tr("[WARNING_NOTCL] There is no Excellon object loaded ..."))
self.app.inform.emit(_("[WARNING_NOTCL] There is no Excellon object loaded ..."))
return
if not isinstance(fcobj, FlatCAMExcellon):
self.app.inform.emit(_tr("[ERROR_NOTCL] Only Gerber, Excellon and Geometry objects can be mirrored."))
self.app.inform.emit(_("[ERROR_NOTCL] Only Gerber, Excellon and Geometry objects can be mirrored."))
return
axis = self.mirror_axis.get_value()
@@ -453,7 +446,7 @@ class DblSidedTool(FlatCAMTool):
px, py = self.point_entry.get_value()
except Exception as e:
log.debug("DblSidedTool.on_mirror_geo() --> %s" % str(e))
self.app.inform.emit(_tr("[WARNING_NOTCL] There are no Point coordinates in the Point field. "
self.app.inform.emit(_("[WARNING_NOTCL] There are no Point coordinates in the Point field. "
"Add coords and try again ..."))
return
else:
@@ -463,7 +456,7 @@ class DblSidedTool(FlatCAMTool):
bb_obj = model_index_box.internalPointer().obj
except Exception as e:
log.debug("DblSidedTool.on_mirror_geo() --> %s" % str(e))
self.app.inform.emit(_tr("[WARNING_NOTCL] There is no Box object loaded ..."))
self.app.inform.emit(_("[WARNING_NOTCL] There is no Box object loaded ..."))
return
xmin, ymin, xmax, ymax = bb_obj.bounds()
@@ -473,7 +466,7 @@ class DblSidedTool(FlatCAMTool):
fcobj.mirror(axis, [px, py])
self.app.object_changed.emit(fcobj)
fcobj.plot()
self.app.inform.emit(_tr("[success] Excellon %s was mirrored...") % str(fcobj.options['name']))
self.app.inform.emit(_("[success] Excellon %s was mirrored...") % str(fcobj.options['name']))
def on_mirror_geo(self):
selection_index = self.geo_object_combo.currentIndex()
@@ -482,11 +475,11 @@ class DblSidedTool(FlatCAMTool):
try:
fcobj = model_index.internalPointer().obj
except Exception as e:
self.app.inform.emit(_tr("[WARNING_NOTCL] There is no Geometry object loaded ..."))
self.app.inform.emit(_("[WARNING_NOTCL] There is no Geometry object loaded ..."))
return
if not isinstance(fcobj, FlatCAMGeometry):
self.app.inform.emit(_tr("[ERROR_NOTCL] Only Gerber, Excellon and Geometry objects can be mirrored."))
self.app.inform.emit(_("[ERROR_NOTCL] Only Gerber, Excellon and Geometry objects can be mirrored."))
return
axis = self.mirror_axis.get_value()
@@ -500,7 +493,7 @@ class DblSidedTool(FlatCAMTool):
try:
bb_obj = model_index_box.internalPointer().obj
except Exception as e:
self.app.inform.emit(_tr("[WARNING_NOTCL] There is no Box object loaded ..."))
self.app.inform.emit(_("[WARNING_NOTCL] There is no Box object loaded ..."))
return
xmin, ymin, xmax, ymax = bb_obj.bounds()
@@ -510,7 +503,7 @@ class DblSidedTool(FlatCAMTool):
fcobj.mirror(axis, [px, py])
self.app.object_changed.emit(fcobj)
fcobj.plot()
self.app.inform.emit(_tr("[success] Geometry %s was mirrored...") % str(fcobj.options['name']))
self.app.inform.emit(_("[success] Geometry %s was mirrored...") % str(fcobj.options['name']))
def on_point_add(self):
val = self.app.defaults["global_point_clipboard_format"] % (self.app.pos[0], self.app.pos[1])