bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- more refactoring class names

Browse Source 
- moved some of the methods from the App class to the ObjectCollection class
This commit is contained in:
Marius Stanciu
2020-05-18 16:39:26 +03:00
committed by Marius
parent a0a805217d
commit 710a84b442
40 changed files with 5592 additions and 5596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AppEditors/FlatCAMExcEditor.py
View File

@@ -2415,7 +2415,7 @@ class FlatCAMExcEditor(QtCore.QObject):
drill_count = QtWidgets.QTableWidgetItem('%d' % drill_cnt)
drill_count.setFlags(QtCore.Qt.ItemIsEnabled)
# if the slot number is zero is better to not clutter the AppGUI with zero's so we print a space
# if the slot number is zero is better to not clutter the GUI with zero's so we print a space
if slot_cnt > 0:
slot_count = QtWidgets.QTableWidgetItem('%d' % slot_cnt)
else:
@@ -2532,9 +2532,9 @@ class FlatCAMExcEditor(QtCore.QObject):
# make sure no rows are selected so the user have to click the correct row, meaning selecting the correct tool
self.tools_table_exc.clearSelection()
# Remove anything else in the AppGUI Selected Tab
# Remove anything else in the GUI Selected Tab
self.app.ui.selected_scroll_area.takeWidget()
# Put ourself in the AppGUI Selected Tab
# Put ourself in the GUI Selected Tab
self.app.ui.selected_scroll_area.setWidget(self.exc_edit_widget)
# Switch notebook to Selected page
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)

6
AppEditors/FlatCAMGeoEditor.py
View File

@@ -3463,7 +3463,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
"""
:param opt: A option from the self.options dictionary
:param entry: A AppGUI element which text value is used
:param entry: A GUI element which text value is used
:return:
"""
try:
@@ -3480,7 +3480,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
"""
:param goption: String. Can be either 'global_gridx' or 'global_gridy'
:param gentry: A AppGUI element which text value is read and used
:param gentry: A GUI element which text value is read and used
:return:
"""
if goption not in ['global_gridx', 'global_gridy']:
@@ -3567,7 +3567,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
self.units = self.app.defaults['units'].upper()
self.decimals = self.app.decimals
# Remove anything else in the AppGUI Selected Tab
# Remove anything else in the GUI Selected Tab
self.app.ui.selected_scroll_area.takeWidget()
# Put ourselves in the AppGUI Selected Tab
self.app.ui.selected_scroll_area.setWidget(self.geo_edit_widget)

8
AppEditors/FlatCAMGrbEditor.py
View File

@@ -3298,9 +3298,9 @@ class FlatCAMGrbEditor(QtCore.QObject):
# make sure no rows are selected so the user have to click the correct row, meaning selecting the correct tool
self.apertures_table.clearSelection()
# Remove anything else in the AppGUI Selected Tab
# Remove anything else in the GUI Selected Tab
self.app.ui.selected_scroll_area.takeWidget()
# Put ourselves in the AppGUI Selected Tab
# Put ourselves in the GUI Selected Tab
self.app.ui.selected_scroll_area.setWidget(self.grb_edit_widget)
# Switch notebook to Selected page
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
@@ -4039,7 +4039,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
# else:
# raise AttributeError
# except AttributeError:
# # now that we have data (empty data actually), create the AppGUI interface and add it to the Tool Tab
# # now that we have data (empty data actually), create the GUI interface and add it to the Tool Tab
# self.build_ui(first_run=True)
# # and add the first aperture to have something to play with
# self.on_aperture_add('10')
@@ -4913,7 +4913,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
# def setup_ui_after_delayed_plot(self):
# self.plot_finished.disconnect()
#
# # now that we have data, create the AppGUI interface and add it to the Tool Tab
# # now that we have data, create the GUI interface and add it to the Tool Tab
# self.build_ui(first_run=True)
# self.plot_all()
#