- Drilling Tool - UI is working as expected; I will have to propagate the changes to other tools too, to increase likeness between different parts of the app

This commit is contained in:
Marius Stanciu 2020-06-27 01:06:10 +03:00 committed by Marius
parent 315ab77ebe
commit ce5ad816c5
6 changed files with 587 additions and 549 deletions

View File

@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
=================================================
27.06.2020
- Drilling Tool - UI is working as expected; I will have to propagate the changes to other tools too, to increase likeness between different parts of the app
25.06.2020
- made sure that when trying to view the source but no object is selected, the messages are correct

View File

@ -406,6 +406,7 @@ class ExclusionAreas(QtCore.QObject):
# since the exclusion areas should apply to all objects in the app collection, this check is limited to
# only the current object therefore it will not guarantee success
self.app.inform.emit("%s" % _("Exclusion areas added. Checking overlap with the object geometry ..."))
for el in self.exclusion_areas_storage:
if el["shape"].intersects(unary_union(self.solid_geometry)):
self.on_clear_area_click()
@ -413,8 +414,7 @@ class ExclusionAreas(QtCore.QObject):
"[ERROR_NOTCL] %s" % _("Failed. Exclusion areas intersects the object geometry ..."))
return
self.app.inform.emit(
"[success] %s" % _("Exclusion areas added."))
self.app.inform.emit("[success] %s" % _("Exclusion areas added."))
self.cnc_button.setStyleSheet("""
QPushButton
{

View File

@ -2418,8 +2418,8 @@ class FCTable(QtWidgets.QTableWidget):
palette.color(QtGui.QPalette.Active, QtGui.QPalette.Highlight))
# make inactive rows text some color as active; may be useful in the future
# palette.setColor(QtGui.QPalette.Inactive, QtGui.QPalette.HighlightedText,
# palette.color(QtGui.QPalette.Active, QtGui.QPalette.HighlightedText))
palette.setColor(QtGui.QPalette.Inactive, QtGui.QPalette.HighlightedText,
palette.color(QtGui.QPalette.Active, QtGui.QPalette.HighlightedText))
self.setPalette(palette)
if drag_drop:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -251,7 +251,7 @@ class FlatCAMDefaults:
# Excellon Options
"excellon_operation": "drill",
"excellon_tool_order": 'rev',
"excellon_tool_order": 'no',
"excellon_milling_type": "drills",
"excellon_milling_dia": 0.8,