diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e927992..9e17d742 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,9 @@ CHANGELOG for FlatCAM beta - some more fixes to problems generated by latest changes in the open handlers - modified the make_freezed.py script for the new location of the icons - added a fix for the ConnectionRefusedError in Linux that is issued when first running after a FlatCAM crash +- in SVG parser modified some imports to be one on each line +- fixed the Tcl Command BBox (leftovers from recent global changes) +- fixed some typos in strings reported by @pcb-hobbyst on FlatCAM forum 27.04.2020 diff --git a/README.md b/README.md index f0362d90..094eb7b5 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Menu -> Help -> About FlatCAM -> Programmers -> Marius Stanciu - Unzip them on a HDD location that your user has permissions for. 1.Windows + - download the provided installer (for your OS flavor 64bit or 32bit) from: https://bitbucket.org/jpcgt/flatcam/downloads/ - execute the installer and install the program. It is recommended to install as a Local User. @@ -61,6 +62,7 @@ cd D:\FlatCAM_beta python FlatCAM.py 2.Linux + - make sure that Python 3.8 is installed on your OS and that the command: python3 -V confirm it - verify that the pip package is installed for your Python installation (e.g 3.8) by running the command: ``` diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index d59c5aa4..0897be03 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -1744,7 +1744,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # F keys section _("Open Online Manual"), _("Open Online Tutorials"), _("Refresh Plots"), _("Delete Object"), _("Alternate: Delete Tool"), - _("(left to Key_1)Toogle Notebook Area (Left Side)"), _("En(Dis)able Obj Plot"), + _("(left to Key_1)Toggle Notebook Area (Left Side)"), _("En(Dis)able Obj Plot"), _("Deselects all objects") ) ) @@ -2296,13 +2296,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.rel_position_label = QtWidgets.QLabel( "Dx: 0.0000   Dy: 0.0000    ") self.rel_position_label.setMinimumWidth(110) - self.rel_position_label.setToolTip(_("Relative neasurement.\nReference is last click position")) + self.rel_position_label.setToolTip(_("Relative measurement.\nReference is last click position")) self.infobar.addWidget(self.rel_position_label) self.position_label = QtWidgets.QLabel( "    X: 0.0000   Y: 0.0000") self.position_label.setMinimumWidth(110) - self.position_label.setToolTip(_("Absolute neasurement.\nReference is (X=0, Y= 0) position")) + self.position_label.setToolTip(_("Absolute measurement.\nReference is (X=0, Y= 0) position")) self.infobar.addWidget(self.position_label) self.units_label = QtWidgets.QLabel("[in]") diff --git a/flatcamGUI/ObjectUI.py b/flatcamGUI/ObjectUI.py index f0b4d145..4004048d 100644 --- a/flatcamGUI/ObjectUI.py +++ b/flatcamGUI/ObjectUI.py @@ -308,7 +308,7 @@ class GerberObjectUI(ObjectUI): # Tool Type self.tool_type_label = QtWidgets.QLabel('%s:' % _('Tool Type')) self.tool_type_label.setToolTip( - _("Choose what tool to use for Gerber isolation:\n" + _("Choose which tool to use for Gerber isolation:\n" "'Circular' or 'V-shape'.\n" "When the 'V-shape' is selected then the tool\n" "diameter will depend on the chosen cut depth.") @@ -435,7 +435,7 @@ class GerberObjectUI(ObjectUI): grid1.addWidget(self.follow_cb, 8, 1) self.except_cb.setToolTip(_("When the isolation geometry is generated,\n" - "by checking this, the area of the object bellow\n" + "by checking this, the area of the object below\n" "will be subtracted from the isolation geometry.")) grid1.addWidget(self.except_cb, 8, 2) @@ -1532,7 +1532,7 @@ class GeometryObjectUI(ObjectUI): "- Circular with 1 ... 4 teeth -> it is informative only. Being circular the cut width in material\n" "is exactly the tool diameter.\n" "- Ball -> informative only and make reference to the Ball type endmill.\n" - "- V-Shape -> it will disable de Z-Cut parameter in the UI form and enable two additional UI form\n" + "- V-Shape -> it will disable Z-Cut parameter in the UI form and enable two additional UI form\n" "fields: V-Tip Dia and V-Tip Angle. Adjusting those two values will adjust the Z-Cut parameter such\n" "as the cut width into material will be equal with the value in the Tool " "Diameter column of this table.\n" diff --git a/flatcamGUI/PreferencesUI.py b/flatcamGUI/PreferencesUI.py index 67d39521..b714d1f0 100644 --- a/flatcamGUI/PreferencesUI.py +++ b/flatcamGUI/PreferencesUI.py @@ -2396,7 +2396,7 @@ class GerberAdvOptPrefGroupUI(OptionsGroupUI): # Tool Type self.tool_type_label = QtWidgets.QLabel('%s' % _('Tool Type')) self.tool_type_label.setToolTip( - _("Choose what tool to use for Gerber isolation:\n" + _("Choose which tool to use for Gerber isolation:\n" "'Circular' or 'V-shape'.\n" "When the 'V-shape' is selected then the tool\n" "diameter will depend on the chosen cut depth.") diff --git a/flatcamParsers/ParseSVG.py b/flatcamParsers/ParseSVG.py index d5634944..a36e4770 100644 --- a/flatcamParsers/ParseSVG.py +++ b/flatcamParsers/ParseSVG.py @@ -21,7 +21,8 @@ # import xml.etree.ElementTree as ET from svg.path import Line, Arc, CubicBezier, QuadraticBezier, parse_path -from svg.path.path import Move, Close +from svg.path.path import Move +from svg.path.path import Close from shapely.geometry import LineString, LinearRing, MultiLineString from shapely.affinity import skew, affine_transform, rotate import numpy as np diff --git a/flatcamTools/ToolNCC.py b/flatcamTools/ToolNCC.py index d1d4aa04..98cc598b 100644 --- a/flatcamTools/ToolNCC.py +++ b/flatcamTools/ToolNCC.py @@ -151,7 +151,7 @@ class NonCopperClear(FlatCAMTool, Gerber): "- Circular with 1 ... 4 teeth -> it is informative only. Being circular,\n" "the cut width in material is exactly the tool diameter.\n" "- Ball -> informative only and make reference to the Ball type endmill.\n" - "- V-Shape -> it will disable de Z-Cut parameter in the resulting geometry UI form\n" + "- V-Shape -> it will disable Z-Cut parameter in the resulting geometry UI form\n" "and enable two additional UI form fields in the resulting geometry: V-Tip Dia and\n" "V-Tip Angle. Adjusting those two values will adjust the Z-Cut parameter such\n" "as the cut width into material will be equal with the value in the Tool Diameter\n" diff --git a/flatcamTools/ToolPaint.py b/flatcamTools/ToolPaint.py index 8d157e9f..7f848f79 100644 --- a/flatcamTools/ToolPaint.py +++ b/flatcamTools/ToolPaint.py @@ -147,7 +147,7 @@ class ToolPaint(FlatCAMTool, Gerber): "- Circular with 1 ... 4 teeth -> it is informative only. Being circular,
" "the cut width in material is exactly the tool diameter.
" "- Ball -> informative only and make reference to the Ball type endmill.
" - "- V-Shape -> it will disable de Z-Cut parameter in the resulting geometry UI form " + "- V-Shape -> it will disable Z-Cut parameter in the resulting geometry UI form " "and enable two additional UI form fields in the resulting geometry: V-Tip Dia and " "V-Tip Angle. Adjusting those two values will adjust the Z-Cut parameter such " "as the cut width into material will be equal with the value in the Tool Diameter " diff --git a/tclCommands/TclCommandBbox.py b/tclCommands/TclCommandBbox.py index 6cf0d097..6e38bb99 100644 --- a/tclCommands/TclCommandBbox.py +++ b/tclCommands/TclCommandBbox.py @@ -44,7 +44,7 @@ class TclCommandBbox(TclCommand): ('name', 'Object name for which to create bounding box. String'), ('margin', "Distance of the edges of the box to the nearest polygon." "Float number."), - ('rounded', "If the bounding box is to have rounded corners their radius is equal to the margin. " + ('rounded', "If the bounding box has to have rounded corners their radius is equal to the margin. " "True (1) or False (0)."), ('outname', 'Name of the resulting Geometry object. String.') ]), @@ -70,7 +70,7 @@ class TclCommandBbox(TclCommand): if obj is None: self.raise_tcl_error("%s: %s" % (_("Object not found"), name)) - if not isinstance(obj, FlatCAMGerber) and not isinstance(obj, FlatCAMGeometry): + if obj.kind != 'gerber' and obj.kind != 'geometry': self.raise_tcl_error('%s %s: %s.' % ( _("Expected GerberObject or GeometryObject, got"), name, type(obj)))