- updated the Geometry Editor such that loading objects into Editor and updating the edited object is done now multithreaded
- most of the functions in the Geometry Editor are now multithreaded - fixed the Subtract sub-tool in the Geometry Editor - added an alternative Subtract sub-tool in the Geometry Editor, one that do not delete the subtracting shapes - added some not-so-good icons for the Subtract Alt sub-tool in Geometry Editor
This commit is contained in:
@@ -7,6 +7,14 @@ CHANGELOG for FlatCAM beta
|
|||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
13.11.2020
|
||||||
|
|
||||||
|
- updated the Geometry Editor such that loading objects into Editor and updating the edited object is done now multithreaded
|
||||||
|
- most of the functions in the Geometry Editor are now multithreaded
|
||||||
|
- fixed the Subtract sub-tool in the Geometry Editor
|
||||||
|
- added an alternative Subtract sub-tool in the Geometry Editor, one that do not delete the subtracting shapes
|
||||||
|
- added some not-so-good icons for the Subtract Alt sub-tool in Geometry Editor
|
||||||
|
|
||||||
12.11.2020
|
12.11.2020
|
||||||
|
|
||||||
- some fixes in the app_Main class
|
- some fixes in the app_Main class
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -665,6 +665,10 @@ class MainGUI(QtWidgets.QMainWindow):
|
|||||||
QtGui.QIcon(self.app.resource_location + '/subtract16.png'),
|
QtGui.QIcon(self.app.resource_location + '/subtract16.png'),
|
||||||
'%s\t%s' % (_('Polygon Subtraction'), _('S'))
|
'%s\t%s' % (_('Polygon Subtraction'), _('S'))
|
||||||
)
|
)
|
||||||
|
self.geo_subtract_alt_menuitem = self.geo_editor_menu.addAction(
|
||||||
|
QtGui.QIcon(self.app.resource_location + '/subtract16.png'),
|
||||||
|
'%s\t%s' % (_('Alt Subtraction'), _(''))
|
||||||
|
)
|
||||||
self.geo_editor_menu.addSeparator()
|
self.geo_editor_menu.addSeparator()
|
||||||
self.geo_cutpath_menuitem = self.geo_editor_menu.addAction(
|
self.geo_cutpath_menuitem = self.geo_editor_menu.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/cutpath16.png'),
|
QtGui.QIcon(self.app.resource_location + '/cutpath16.png'),
|
||||||
@@ -1156,6 +1160,8 @@ class MainGUI(QtWidgets.QMainWindow):
|
|||||||
QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _('Polygon Intersection'))
|
QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _('Polygon Intersection'))
|
||||||
self.geo_subtract_btn = self.geo_edit_toolbar.addAction(
|
self.geo_subtract_btn = self.geo_edit_toolbar.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _('Polygon Subtraction'))
|
QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _('Polygon Subtraction'))
|
||||||
|
self.geo_alt_subtract_btn = self.geo_edit_toolbar.addAction(
|
||||||
|
QtGui.QIcon(self.app.resource_location + '/subtract_alt32.png'), _('Alt Subtraction'))
|
||||||
|
|
||||||
self.geo_edit_toolbar.addSeparator()
|
self.geo_edit_toolbar.addSeparator()
|
||||||
self.geo_cutpath_btn = self.geo_edit_toolbar.addAction(
|
self.geo_cutpath_btn = self.geo_edit_toolbar.addAction(
|
||||||
@@ -1631,6 +1637,8 @@ class MainGUI(QtWidgets.QMainWindow):
|
|||||||
QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _("Intersection"))
|
QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _("Intersection"))
|
||||||
self.draw_substract = self.g_editor_cmenu.addAction(
|
self.draw_substract = self.g_editor_cmenu.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _("Subtraction"))
|
QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _("Subtraction"))
|
||||||
|
self.draw_substract_alt = self.g_editor_cmenu.addAction(
|
||||||
|
QtGui.QIcon(self.app.resource_location + '/subtract_alt32.png'), _("Alt Subtraction"))
|
||||||
self.draw_cut = self.g_editor_cmenu.addAction(
|
self.draw_cut = self.g_editor_cmenu.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/cutpath32.png'), _("Cut"))
|
QtGui.QIcon(self.app.resource_location + '/cutpath32.png'), _("Cut"))
|
||||||
self.draw_transform = self.g_editor_cmenu.addAction(
|
self.draw_transform = self.g_editor_cmenu.addAction(
|
||||||
@@ -2327,6 +2335,8 @@ class MainGUI(QtWidgets.QMainWindow):
|
|||||||
QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _('Polygon Intersection'))
|
QtGui.QIcon(self.app.resource_location + '/intersection32.png'), _('Polygon Intersection'))
|
||||||
self.geo_subtract_btn = self.geo_edit_toolbar.addAction(
|
self.geo_subtract_btn = self.geo_edit_toolbar.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _('Polygon Subtraction'))
|
QtGui.QIcon(self.app.resource_location + '/subtract32.png'), _('Polygon Subtraction'))
|
||||||
|
self.geo_alt_subtract_btn = self.geo_edit_toolbar.addAction(
|
||||||
|
QtGui.QIcon(self.app.resource_location + '/subtract_alt32.png'), _('Alt Subtraction'))
|
||||||
|
|
||||||
self.geo_edit_toolbar.addSeparator()
|
self.geo_edit_toolbar.addSeparator()
|
||||||
self.geo_cutpath_btn = self.geo_edit_toolbar.addAction(
|
self.geo_cutpath_btn = self.geo_edit_toolbar.addAction(
|
||||||
|
|||||||
BIN
assets/resources/dark_resources/subtract_alt32.png
Normal file
BIN
assets/resources/dark_resources/subtract_alt32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 230 B |
BIN
assets/resources/subtract_alt32.png
Normal file
BIN
assets/resources/subtract_alt32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 604 B |
Reference in New Issue
Block a user