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
AppObjects/FlatCAMExcellon.py
View File

@@ -389,7 +389,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
drill_count_item = QtWidgets.QTableWidgetItem('%d' % drill_cnt)
drill_count_item.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
slot_count_str = '%d' % slot_cnt if slot_cnt > 0 else ''
slot_count_item = QtWidgets.QTableWidgetItem(slot_count_str)
slot_count_item.setFlags(QtCore.Qt.ItemIsEnabled)
@@ -855,7 +855,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
def form_to_storage(self):
if self.ui.tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the AppGUI elements values to storage
# there is no tool in tool table so we can't save the GUI elements values to storage
return
self.ui_disconnect()
@@ -1778,7 +1778,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
def on_apply_param_to_all_clicked(self):
if self.ui.tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the AppGUI elements values to storage
# there is no tool in tool table so we can't save the GUI elements values to storage
log.debug("ExcellonObject.on_apply_param_to_all_clicked() --> no tool in Tools Table, aborting.")
return

4
AppObjects/FlatCAMGeometry.py
View File

@@ -1320,7 +1320,7 @@ class GeometryObject(FlatCAMObj, Geometry):
def on_apply_param_to_all_clicked(self):
if self.ui.geo_tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the AppGUI elements values to storage
# there is no tool in tool table so we can't save the GUI elements values to storage
log.debug("GeometryObject.gui_form_to_storage() --> no tool in Tools Table, aborting.")
return
@@ -1383,7 +1383,7 @@ class GeometryObject(FlatCAMObj, Geometry):
def gui_form_to_storage(self):
if self.ui.geo_tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the AppGUI elements values to storage
# there is no tool in tool table so we can't save the GUI elements values to storage
log.debug("GeometryObject.gui_form_to_storage() --> no tool in Tools Table, aborting.")
return

8
AppObjects/FlatCAMGerber.py
View File

@@ -179,10 +179,10 @@ class GerberObject(FlatCAMObj, Gerber):
def set_ui(self, ui):
"""
Maps options with AppGUI inputs.
Connects AppGUI events to methods.
Maps options with GUI inputs.
Connects GUI events to methods.
:param ui: AppGUI object.
:param ui: GUI object.
:type ui: GerberObjectUI
:return: None
"""
@@ -243,7 +243,7 @@ class GerberObject(FlatCAMObj, Gerber):
self.ui.type_obj_combo.currentIndexChanged.connect(self.on_type_obj_index_changed)
self.ui.tool_type_radio.activated_custom.connect(self.on_tool_type_change)
# establish visibility for the AppGUI elements found in the slot function
# establish visibility for the GUI elements found in the slot function
self.ui.tool_type_radio.activated_custom.emit(self.options['tool_type'])
# Show/Hide Advanced Options

200
AppObjects/ObjectCollection.py
View File

@@ -324,7 +324,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
font.setFamily("Seagoe UI")
self.view.setFont(font)
# ## AppGUI Events
# ## GUI Events
self.view.selectionModel().selectionChanged.connect(self.on_list_selection_change)
# self.view.activated.connect(self.on_item_activated)
self.view.keyPressed.connect(self.app.ui.keyPressEvent)
@@ -334,6 +334,8 @@ class ObjectCollection(QtCore.QAbstractItemModel):
self.click_modifier = None
self.update_list_signal.connect(self.on_update_list_signal)
self.view.activated.connect(self.on_row_activated)
self.item_selected.connect(self.on_row_selected)
def promise(self, obj_name):
log.debug("Object %s has been promised." % obj_name)
@@ -999,3 +1001,199 @@ class ObjectCollection(QtCore.QAbstractItemModel):
def update_view(self):
self.dataChanged.emit(QtCore.QModelIndex(), QtCore.QModelIndex())
def on_row_activated(self, index):
if index.isValid():
if index.internalPointer().parent_item != self.root_item:
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
self.on_item_activated(index)
def on_row_selected(self, obj_name):
"""
This is a special string; when received it will make all Menu -> AppObjects entries unchecked
It mean we clicked outside of the items and deselected all
:param obj_name:
:return:
"""
if obj_name == 'none':
for act in self.app.ui.menuobjects.actions():
act.setChecked(False)
return
# get the name of the selected objects and add them to a list
name_list = []
for obj in self.get_selected():
name_list.append(obj.options['name'])
# set all actions as unchecked but the ones selected make them checked
for act in self.app.ui.menuobjects.actions():
act.setChecked(False)
if act.text() in name_list:
act.setChecked(True)
def on_collection_updated(self, obj, state, old_name):
"""
Create a menu from the object loaded in the collection.
:param obj: object that was changed (added, deleted, renamed)
:param state: what was done with the object. Can be: added, deleted, delete_all, renamed
:param old_name: the old name of the object before the action that triggered this slot happened
:return: None
"""
icon_files = {
"gerber": self.app.resource_location + "/flatcam_icon16.png",
"excellon": self.app.resource_location + "/drill16.png",
"cncjob": self.app.resource_location + "/cnc16.png",
"geometry": self.app.resource_location + "/geometry16.png",
"script": self.app.resource_location + "/script_new16.png",
"document": self.app.resource_location + "/notes16_1.png"
}
if state == 'append':
for act in self.app.ui.menuobjects.actions():
try:
act.triggered.disconnect()
except TypeError:
pass
self.app.ui.menuobjects.clear()
gerber_list = []
exc_list = []
cncjob_list = []
geo_list = []
script_list = []
doc_list = []
for name in self.get_names():
obj_named = self.get_by_name(name)
if obj_named.kind == 'gerber':
gerber_list.append(name)
elif obj_named.kind == 'excellon':
exc_list.append(name)
elif obj_named.kind == 'cncjob':
cncjob_list.append(name)
elif obj_named.kind == 'geometry':
geo_list.append(name)
elif obj_named.kind == 'script':
script_list.append(name)
elif obj_named.kind == 'document':
doc_list.append(name)
def add_act(o_name):
obj_for_icon = self.get_by_name(o_name)
add_action = QtWidgets.QAction(parent=self.app.ui.menuobjects)
add_action.setCheckable(True)
add_action.setText(o_name)
add_action.setIcon(QtGui.QIcon(icon_files[obj_for_icon.kind]))
add_action.triggered.connect(
lambda: self.set_active(o_name) if add_action.isChecked() is True else
self.set_inactive(o_name))
self.app.ui.menuobjects.addAction(add_action)
for name in gerber_list:
add_act(name)
self.app.ui.menuobjects.addSeparator()
for name in exc_list:
add_act(name)
self.app.ui.menuobjects.addSeparator()
for name in cncjob_list:
add_act(name)
self.app.ui.menuobjects.addSeparator()
for name in geo_list:
add_act(name)
self.app.ui.menuobjects.addSeparator()
for name in script_list:
add_act(name)
self.app.ui.menuobjects.addSeparator()
for name in doc_list:
add_act(name)
self.app.ui.menuobjects.addSeparator()
self.app.ui.menuobjects_selall = self.app.ui.menuobjects.addAction(
QtGui.QIcon(self.app.resource_location + '/select_all.png'),
_('Select All')
)
self.app.ui.menuobjects_unselall = self.app.ui.menuobjects.addAction(
QtGui.QIcon(self.app.resource_location + '/deselect_all32.png'),
_('Deselect All')
)
self.app.ui.menuobjects_selall.triggered.connect(lambda: self.on_objects_selection(True))
self.app.ui.menuobjects_unselall.triggered.connect(lambda: self.on_objects_selection(False))
elif state == 'delete':
for act in self.app.ui.menuobjects.actions():
if act.text() == obj.options['name']:
try:
act.triggered.disconnect()
except TypeError:
pass
self.app.ui.menuobjects.removeAction(act)
break
elif state == 'rename':
for act in self.app.ui.menuobjects.actions():
if act.text() == old_name:
add_action = QtWidgets.QAction(parent=self.app.ui.menuobjects)
add_action.setText(obj.options['name'])
add_action.setIcon(QtGui.QIcon(icon_files[obj.kind]))
add_action.triggered.connect(
lambda: self.set_active(obj.options['name']) if add_action.isChecked() is True else
self.set_inactive(obj.options['name']))
self.app.ui.menuobjects.insertAction(act, add_action)
try:
act.triggered.disconnect()
except TypeError:
pass
self.app.ui.menuobjects.removeAction(act)
break
elif state == 'delete_all':
for act in self.app.ui.menuobjects.actions():
try:
act.triggered.disconnect()
except TypeError:
pass
self.app.ui.menuobjects.clear()
self.app.ui.menuobjects.addSeparator()
self.app.ui.menuobjects_selall = self.app.ui.menuobjects.addAction(
QtGui.QIcon(self.app.resource_location + '/select_all.png'),
_('Select All')
)
self.app.ui.menuobjects_unselall = self.app.ui.menuobjects.addAction(
QtGui.QIcon(self.app.resource_location + '/deselect_all32.png'),
_('Deselect All')
)
self.app.ui.menuobjects_selall.triggered.connect(lambda: self.on_objects_selection(True))
self.app.ui.menuobjects_unselall.triggered.connect(lambda: self.on_objects_selection(False))
def on_objects_selection(self, on_off):
obj_list = self.get_names()
if on_off is True:
self.set_all_active()
for act in self.app.ui.menuobjects.actions():
try:
act.setChecked(True)
except Exception:
pass
if obj_list:
self.app.inform.emit('[selected] %s' % _("All objects are selected."))
else:
self.set_all_inactive()
for act in self.app.ui.menuobjects.actions():
try:
act.setChecked(False)
except Exception:
pass
if obj_list:
self.app.inform.emit('%s' % _("AppObjects selection is cleared."))
else:
self.app.inform.emit('')