- 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)
- 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
@@ -8,16 +8,9 @@ import FlatCAMTranslation as fcTranslate
|
||||
fcTranslate.apply_language('ToolFilm')
|
||||
|
||||
|
||||
def _tr(text):
|
||||
try:
|
||||
return _(text)
|
||||
except:
|
||||
return text
|
||||
|
||||
|
||||
class Film(FlatCAMTool):
|
||||
|
||||
toolName = _tr("Film PCB")
|
||||
toolName = _("Film PCB")
|
||||
|
||||
def __init__(self, app):
|
||||
FlatCAMTool.__init__(self, app)
|
||||
@@ -48,9 +41,9 @@ class Film(FlatCAMTool):
|
||||
self.tf_type_obj_combo.setItemIcon(0, QtGui.QIcon("share/flatcam_icon16.png"))
|
||||
self.tf_type_obj_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png"))
|
||||
|
||||
self.tf_type_obj_combo_label = QtWidgets.QLabel(_tr("Object Type:"))
|
||||
self.tf_type_obj_combo_label = QtWidgets.QLabel(_("Object Type:"))
|
||||
self.tf_type_obj_combo_label.setToolTip(
|
||||
_tr("Specify the type of object for which to create the film.\n"
|
||||
_("Specify the type of object for which to create the film.\n"
|
||||
"The object can be of type: Gerber or Geometry.\n"
|
||||
"The selection here decide the type of objects that will be\n"
|
||||
"in the Film Object combobox.")
|
||||
@@ -63,9 +56,9 @@ class Film(FlatCAMTool):
|
||||
self.tf_object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
|
||||
self.tf_object_combo.setCurrentIndex(1)
|
||||
|
||||
self.tf_object_label = QtWidgets.QLabel(_tr("Film Object:"))
|
||||
self.tf_object_label = QtWidgets.QLabel(_("Film Object:"))
|
||||
self.tf_object_label.setToolTip(
|
||||
_tr("Object for which to create the film.")
|
||||
_("Object for which to create the film.")
|
||||
)
|
||||
tf_form_layout.addRow(self.tf_object_label, self.tf_object_combo)
|
||||
|
||||
@@ -81,9 +74,9 @@ class Film(FlatCAMTool):
|
||||
self.tf_type_box_combo.setItemIcon(0, QtGui.QIcon("share/flatcam_icon16.png"))
|
||||
self.tf_type_box_combo.setItemIcon(2, QtGui.QIcon("share/geometry16.png"))
|
||||
|
||||
self.tf_type_box_combo_label = QtWidgets.QLabel(_tr("Box Type:"))
|
||||
self.tf_type_box_combo_label = QtWidgets.QLabel(_("Box Type:"))
|
||||
self.tf_type_box_combo_label.setToolTip(
|
||||
_tr("Specify the type of object to be used as an container for\n"
|
||||
_("Specify the type of object to be used as an container for\n"
|
||||
"film creation. It can be: Gerber or Geometry type."
|
||||
"The selection here decide the type of objects that will be\n"
|
||||
"in the Box Object combobox.")
|
||||
@@ -96,9 +89,9 @@ class Film(FlatCAMTool):
|
||||
self.tf_box_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
|
||||
self.tf_box_combo.setCurrentIndex(1)
|
||||
|
||||
self.tf_box_combo_label = QtWidgets.QLabel(_tr("Box Object:"))
|
||||
self.tf_box_combo_label = QtWidgets.QLabel(_("Box Object:"))
|
||||
self.tf_box_combo_label.setToolTip(
|
||||
_tr("The actual object that is used a container for the\n "
|
||||
_("The actual object that is used a container for the\n "
|
||||
"selected object for which we create the film.\n"
|
||||
"Usually it is the PCB outline but it can be also the\n"
|
||||
"same object for which the film is created.")
|
||||
@@ -108,9 +101,9 @@ class Film(FlatCAMTool):
|
||||
# Film Type
|
||||
self.film_type = RadioSet([{'label': 'Positive', 'value': 'pos'},
|
||||
{'label': 'Negative', 'value': 'neg'}])
|
||||
self.film_type_label = QtWidgets.QLabel(_tr("Film Type:"))
|
||||
self.film_type_label = QtWidgets.QLabel(_("Film Type:"))
|
||||
self.film_type_label.setToolTip(
|
||||
_tr("Generate a Positive black film or a Negative film.\n"
|
||||
_("Generate a Positive black film or a Negative film.\n"
|
||||
"Positive means that it will print the features\n"
|
||||
"with black on a white canvas.\n"
|
||||
"Negative means that it will print the features\n"
|
||||
@@ -122,9 +115,9 @@ class Film(FlatCAMTool):
|
||||
# Boundary for negative film generation
|
||||
|
||||
self.boundary_entry = FCEntry()
|
||||
self.boundary_label = QtWidgets.QLabel(_tr("Border:"))
|
||||
self.boundary_label = QtWidgets.QLabel(_("Border:"))
|
||||
self.boundary_label.setToolTip(
|
||||
_tr("Specify a border around the object.\n"
|
||||
_("Specify a border around the object.\n"
|
||||
"Only for negative film.\n"
|
||||
"It helps if we use as a Box Object the same \n"
|
||||
"object as in Film Object. It will create a thick\n"
|
||||
@@ -136,9 +129,9 @@ class Film(FlatCAMTool):
|
||||
tf_form_layout.addRow(self.boundary_label, self.boundary_entry)
|
||||
|
||||
self.film_scale_entry = FCEntry()
|
||||
self.film_scale_label = QtWidgets.QLabel(_tr("Scale Stroke:"))
|
||||
self.film_scale_label = QtWidgets.QLabel(_("Scale Stroke:"))
|
||||
self.film_scale_label.setToolTip(
|
||||
_tr("Scale the line stroke thickness of each feature in the SVG file.\n"
|
||||
_("Scale the line stroke thickness of each feature in the SVG file.\n"
|
||||
"It means that the line that envelope each SVG feature will be thicker or thinner,\n"
|
||||
"therefore the fine features may be more affected by this parameter.")
|
||||
)
|
||||
@@ -149,9 +142,9 @@ class Film(FlatCAMTool):
|
||||
self.layout.addLayout(hlay)
|
||||
hlay.addStretch()
|
||||
|
||||
self.film_object_button = QtWidgets.QPushButton(_tr("Save Film"))
|
||||
self.film_object_button = QtWidgets.QPushButton(_("Save Film"))
|
||||
self.film_object_button.setToolTip(
|
||||
_tr("Create a Film for the selected object, within\n"
|
||||
_("Create a Film for the selected object, within\n"
|
||||
"the specified box. Does not create a new \n "
|
||||
"FlatCAM object, but directly save it in SVG format\n"
|
||||
"which can be opened with Inkscape.")
|
||||
@@ -192,7 +185,7 @@ class Film(FlatCAMTool):
|
||||
FlatCAMTool.run(self)
|
||||
self.set_tool_ui()
|
||||
|
||||
self.app.ui.notebook.setTabText(2, _tr("Film Tool"))
|
||||
self.app.ui.notebook.setTabText(2, _("Film Tool"))
|
||||
|
||||
def install(self, icon=None, separator=None, **kwargs):
|
||||
FlatCAMTool.install(self, icon, separator, shortcut='ALT+L', **kwargs)
|
||||
@@ -213,13 +206,13 @@ class Film(FlatCAMTool):
|
||||
try:
|
||||
name = self.tf_object_combo.currentText()
|
||||
except:
|
||||
self.app.inform.emit(_tr("[ERROR_NOTCL] No FlatCAM object selected. Load an object for Film and retry."))
|
||||
self.app.inform.emit(_("[ERROR_NOTCL] No FlatCAM object selected. Load an object for Film and retry."))
|
||||
return
|
||||
|
||||
try:
|
||||
boxname = self.tf_box_combo.currentText()
|
||||
except:
|
||||
self.app.inform.emit(_tr("[ERROR_NOTCL] No FlatCAM object selected. Load an object for Box and retry."))
|
||||
self.app.inform.emit(_("[ERROR_NOTCL] No FlatCAM object selected. Load an object for Box and retry."))
|
||||
return
|
||||
|
||||
try:
|
||||
@@ -229,51 +222,51 @@ class Film(FlatCAMTool):
|
||||
try:
|
||||
border = float(self.boundary_entry.get_value().replace(',', '.'))
|
||||
except ValueError:
|
||||
self.app.inform.emit(_tr("[ERROR_NOTCL]Wrong value format entered, "
|
||||
self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
|
||||
"use a number."))
|
||||
return
|
||||
|
||||
try:
|
||||
scale_stroke_width = int(self.film_scale_entry.get_value())
|
||||
except ValueError:
|
||||
self.app.inform.emit(_tr("[ERROR_NOTCL]Wrong value format entered, "
|
||||
self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, "
|
||||
"use a number."))
|
||||
return
|
||||
|
||||
if border is None:
|
||||
border = 0
|
||||
|
||||
self.app.inform.emit(_tr("Generating Film ..."))
|
||||
self.app.inform.emit(_("Generating Film ..."))
|
||||
|
||||
if self.film_type.get_value() == "pos":
|
||||
try:
|
||||
filename, _ = QtWidgets.QFileDialog.getSaveFileName(
|
||||
caption=_tr("Export SVG positive"),
|
||||
caption=_("Export SVG positive"),
|
||||
directory=self.app.get_last_save_folder() + '/' + name,
|
||||
filter="*.svg")
|
||||
except TypeError:
|
||||
filename, _ = QtWidgets.QFileDialog.getSaveFileName(caption=_tr("Export SVG positive"))
|
||||
filename, _ = QtWidgets.QFileDialog.getSaveFileName(caption=_("Export SVG positive"))
|
||||
|
||||
filename = str(filename)
|
||||
|
||||
if str(filename) == "":
|
||||
self.app.inform.emit(_tr("[WARNING_NOTCL]Export SVG positive cancelled."))
|
||||
self.app.inform.emit(_("[WARNING_NOTCL]Export SVG positive cancelled."))
|
||||
return
|
||||
else:
|
||||
self.app.export_svg_black(name, boxname, filename, scale_factor=scale_stroke_width)
|
||||
else:
|
||||
try:
|
||||
filename, _ = QtWidgets.QFileDialog.getSaveFileName(
|
||||
caption=_tr("Export SVG negative"),
|
||||
caption=_("Export SVG negative"),
|
||||
directory=self.app.get_last_save_folder() + '/' + name,
|
||||
filter="*.svg")
|
||||
except TypeError:
|
||||
filename, _ = QtWidgets.QFileDialog.getSaveFileName(caption=_tr("Export SVG negative"))
|
||||
filename, _ = QtWidgets.QFileDialog.getSaveFileName(caption=_("Export SVG negative"))
|
||||
|
||||
filename = str(filename)
|
||||
|
||||
if str(filename) == "":
|
||||
self.app.inform.emit(_tr("[WARNING_NOTCL]Export SVG negative cancelled."))
|
||||
self.app.inform.emit(_("[WARNING_NOTCL]Export SVG negative cancelled."))
|
||||
return
|
||||
else:
|
||||
self.app.export_svg_negative(name, boxname, filename, border, scale_factor=scale_stroke_width)
|
||||
|
||||
Reference in New Issue
Block a user