giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- various small fixes

This commit is contained in:
Marius 2019-12-03 16:26:53 +02:00 committed by Marius Stanciu
parent 685413209f
commit e971dc17ba
6 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FlatCAMApp.py
View File

@ -5920,6 +5920,15 @@ class App(QtCore.QObject):
pass
pass
self.toggle_grid_lines = True
# HACK: enabling/disabling the cursor seams to somehow update the shapes on screen
# - perhaps is a bug in VisPy implementation
if self.grid_status() is True:
self.app_cursor.enabled = False
self.app_cursor.enabled = True
else:
self.app_cursor.enabled = True
self.app_cursor.enabled = False
else:
if self.is_legacy is False:
if theme == 'white':

4
FlatCAMObj.py
View File

@ -346,11 +346,11 @@ class FlatCAMObj(QtCore.QObject):
:type option: str
:return: None
"""
try:
self.options[option] = self.form_fields[option].get_value()
except KeyError:
self.app.log.warning("Failed to read option from field: %s" % option)
pass
# self.app.log.warning("Failed to read option from field: %s" % option)
def plot(self):
"""

1
README.md
View File

@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
- in Preferences added an Apply button which apply the modified preferences but does not save to a file, minimizing the file IO operations; CTRL+S key combo does the Apply now.
- updated some of the default values to metric, values that were missed previously
- remade the Gerber Editor way to import an Gerber object into the editor in such a way to use the multiprocessing
- various small fixes
2.12.2019

4
flatcamGUI/ObjectUI.py
View File

@ -462,10 +462,10 @@ class GerberObjectUI(ObjectUI):
self.iso_scope_label.setToolTip(
_("Isolation scope. Choose what to isolate:\n"
"- 'All' -> Isolate all the polygons in the object\n"
"- 'Single' -> Isolate a single polygon.")
"- 'Selection' -> Isolate a selection of polygons.")
)
self.iso_scope_radio = RadioSet([{'label': _('All'), 'value': 'all'},
{'label': _('Single'), 'value': 'single'}])
{'label': _('Selection'), 'value': 'single'}])
grid1.addWidget(self.iso_scope_label, 10, 0)
grid1.addWidget(self.iso_scope_radio, 10, 1, 1, 2)

13
flatcamGUI/PreferencesUI.py
View File

@ -1446,10 +1446,10 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
self.iso_scope_label.setToolTip(
_("Isolation scope. Choose what to isolate:\n"
"- 'All' -> Isolate all the polygons in the object\n"
"- 'Single' -> Isolate a single polygon.")
"- 'Selection' -> Isolate a selection of polygons.")
)
self.iso_scope_radio = RadioSet([{'label': _('All'), 'value': 'all'},
{'label': _('Single'), 'value': 'single'}])
{'label': _('Selection'), 'value': 'single'}])
grid0.addWidget(self.iso_scope_label, 3, 0)
grid0.addWidget(self.iso_scope_radio, 3, 1, 1, 2)
@ -4484,18 +4484,19 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
# Polygon selection
selectlabel = QtWidgets.QLabel('%s:' % _('Selection'))
selectlabel.setToolTip(
_("How to select Polygons to be painted.\n\n"
_("How to select Polygons to be painted.\n"
"- 'Polygon Selection' - left mouse click to add/remove polygons to be painted.\n"
"- 'Area Selection' - left mouse click to start selection of the area to be painted.\n"
"Keeping a modifier key pressed (CTRL or SHIFT) will allow to add multiple areas.\n"
"- 'All Polygons' - the Paint will start after click.\n"
"- 'Reference Object' - will do non copper clearing within the area\n"
"- 'Reference Object' - will do non copper clearing within the area\n"
"specified by another object.")
)
self.selectmethod_combo = RadioSet([
{"label": _("Single"), "value": "single"},
{"label": _("Sel"), "value": "single"},
{"label": _("Area"), "value": "area"},
{"label": _("All"), "value": "all"},
{"label": _("Ref."), "value": "ref"}
{"label": _("Ref"), "value": "ref"}
])
grid0.addWidget(selectlabel, 7, 0)
grid0.addWidget(self.selectmethod_combo, 7, 1)

12
flatcamTools/ToolPaint.py
View File

@ -301,27 +301,29 @@ class ToolPaint(FlatCAMTool, Gerber):
# Polygon selection
selectlabel = QtWidgets.QLabel('%s:' % _('Selection'))
selectlabel.setToolTip(
_("How to select Polygons to be painted.\n\n"
_("How to select Polygons to be painted.\n"
"- 'Polygon Selection' - left mouse click to add/remove polygons to be painted.\n"
"- 'Area Selection' - left mouse click to start selection of the area to be painted.\n"
"Keeping a modifier key pressed (CTRL or SHIFT) will allow to add multiple areas.\n"
"- 'All Polygons' - the Paint will start after click.\n"
"- 'Reference Object' - will do non copper clearing within the area\n"
"- 'Reference Object' - will do non copper clearing within the area\n"
"specified by another object.")
)
grid3.addWidget(selectlabel, 7, 0)
# grid3 = QtWidgets.QGridLayout()
self.selectmethod_combo = RadioSet([
{"label": _("Single Polygon"), "value": "single"},
{"label": _("Polygon Selection"), "value": "single"},
{"label": _("Area Selection"), "value": "area"},
{"label": _("All Polygons"), "value": "all"},
{"label": _("Reference Object"), "value": "ref"}
], orientation='vertical', stretch=False)
self.selectmethod_combo.setToolTip(
_("How to select Polygons to be painted.\n\n"
_("How to select Polygons to be painted.\n"
"- 'Polygon Selection' - left mouse click to add/remove polygons to be painted.\n"
"- 'Area Selection' - left mouse click to start selection of the area to be painted.\n"
"Keeping a modifier key pressed (CTRL or SHIFT) will allow to add multiple areas.\n"
"- 'All Polygons' - the Paint will start after click.\n"
"- 'Reference Object' - will do non copper clearing within the area\n"
"- 'Reference Object' - will do non copper clearing within the area\n"
"specified by another object.")
)
grid3.addWidget(self.selectmethod_combo, 7, 1)