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

- optimized the toggle axis command

Browse Source 
- added posibility of using a big mouse cursor or a small mouse cursor. The big mouse cursor is made from 2 infinite lines. This was implemented for both graphic engines
- added ability to change the cursor size when the small mouse cursor is selected in Preferences -> General
This commit is contained in:
Marius Stanciu
2019-09-27 04:42:28 +03:00
committed by Marius
parent 9c8c36adbb
commit 46e7be20e2
11 changed files with 177 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
FlatCAMApp.py
View File

@@ -124,8 +124,8 @@ class App(QtCore.QObject):
# ##########################################################################
# ################## Version and VERSION DATE ##############################
# ##########################################################################
version = 8.97
version_date = "2019/09/27"
version = 8.98
version_date = "2019/10/7"
beta = True
engine = '3D'
@@ -492,6 +492,8 @@ class App(QtCore.QObject):
"global_project_autohide": self.ui.general_defaults_form.general_gui_set_group.project_autohide_cb,
"global_toggle_tooltips": self.ui.general_defaults_form.general_gui_set_group.toggle_tooltips_cb,
"global_delete_confirmation": self.ui.general_defaults_form.general_gui_set_group.delete_conf_cb,
"global_cursor_type": self.ui.general_defaults_form.general_gui_set_group.cursor_radio,
"global_cursor_size": self.ui.general_defaults_form.general_gui_set_group.cursor_size_entry,
# Gerber General
"gerber_plot": self.ui.gerber_defaults_form.gerber_gen_group.plot_cb,
@@ -911,6 +913,8 @@ class App(QtCore.QObject):
"global_hover": False,
"global_selection_shape": True,
"global_layout": "compact",
"global_cursor_type": "small",
"global_cursor_size": 20,
# Gerber General
"gerber_plot": True,
@@ -1957,6 +1961,12 @@ class App(QtCore.QObject):
self.ui.general_defaults_form.general_gui_set_group.layout_combo.activated.connect(self.on_layout)
# #################################################
# ############ GUI SETTINGS SIGNALS ###############
# #################################################
self.ui.general_defaults_form.general_gui_set_group.cursor_radio.activated_custom.connect(self.on_cursor_type)
# ########## CNC Job related signals #############
self.ui.cncjob_defaults_form.cncjob_adv_opt_group.tc_variable_combo.currentIndexChanged[str].connect(
self.on_cnc_custom_parameters)
@@ -6265,6 +6275,13 @@ class App(QtCore.QObject):
self.on_workspace()
def on_layout(self, index=None, lay=None):
"""
Set the toolbars layout (location)
:param index:
:param lay: type of layout to be set on the toolbard
:return: None
"""
self.report_usage("on_layout()")
if lay:
current_layout = lay
@@ -6397,6 +6414,20 @@ class App(QtCore.QObject):
self.ui.snap_max_dist_entry.setText(str(self.defaults["global_snap_max"]))
self.ui.grid_gap_link_cb.setChecked(True)
def on_cursor_type(self, val):
"""
:param val: type of mouse cursor, set in Preferences ('small' or 'big')
:return: None
"""
if val == 'small':
self.ui.general_defaults_form.general_gui_set_group.cursor_size_entry.setDisabled(False)
self.ui.general_defaults_form.general_gui_set_group.cursor_size_lbl.setDisabled(False)
else:
self.ui.general_defaults_form.general_gui_set_group.cursor_size_entry.setDisabled(True)
self.ui.general_defaults_form.general_gui_set_group.cursor_size_lbl.setDisabled(True)
def on_cnc_custom_parameters(self, signal_text):
if signal_text == 'Parameters':
return
@@ -7826,7 +7857,7 @@ class App(QtCore.QObject):
# Update cursor
self.app_cursor.set_data(np.asarray([(pos[0], pos[1])]),
symbol='++', edge_color='black', size=20)
symbol='++', edge_color='black', size=self.defaults["global_cursor_size"])
else:
pos = (pos_canvas[0], pos_canvas[1])
@@ -11172,7 +11203,10 @@ class App(QtCore.QObject):
# Keys over plot enabled
self.kp = self.plotcanvas.graph_event_connect('key_press', self.ui.keyPressEvent)
self.app_cursor = self.plotcanvas.new_cursor()
if self.defaults['global_cursor_type'] == 'small':
self.app_cursor = self.plotcanvas.new_cursor()
else:
self.app_cursor = self.plotcanvas.new_cursor(big=True)
if self.ui.grid_snap_btn.isChecked():
self.app_cursor.enabled = True