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

- moved the key handler out of the Measurement tool to flatcamGUI.FlatCAMGui.keyPressEvent()

Browse Source 
- Gerber Editor: started to add new function of poligonize which should make a filled polygon out of a shape
This commit is contained in:
Marius Stanciu
2019-04-14 15:16:37 +03:00
parent e92cab2e96
commit 1332601624
7 changed files with 185 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
flatcamTools/ToolMeasurement.py
View File

@@ -112,6 +112,8 @@ class Measurement(FlatCAMTool):
# self.setVisible(False)
self.active = 0
self.original_call_source = 'app'
# VisPy visuals
self.sel_shapes = ShapeCollection(parent=self.app.plotcanvas.vispy_canvas.view.scene, layers=1)
@@ -125,7 +127,7 @@ class Measurement(FlatCAMTool):
self.app.ui.notebook.setTabText(2, _("Meas. Tool"))
# if the splitter is hidden, display it, else hide it but only if the current widget is the same
# if the splitter is hidden, display it
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
@@ -155,29 +157,22 @@ class Measurement(FlatCAMTool):
self.distance_y_entry.set_value('0')
self.total_distance_entry.set_value('0')
def activate(self):
def activate_measure_tool(self):
# we disconnect the mouse/key handlers from wherever the measurement tool was called
self.canvas.vis_disconnect('key_press')
self.canvas.vis_disconnect('mouse_move')
self.canvas.vis_disconnect('mouse_press')
self.canvas.vis_disconnect('mouse_release')
self.canvas.vis_disconnect('key_release')
# we can safely connect the app mouse events to the measurement tool
self.canvas.vis_connect('mouse_move', self.on_mouse_move_meas)
self.canvas.vis_connect('mouse_release', self.on_mouse_click)
self.canvas.vis_connect('key_release', self.on_key_release_meas)
self.canvas.vis_connect('mouse_release', self.on_mouse_click_release)
self.set_tool_ui()
def deactivate(self):
def deactivate_measure_tool(self):
# disconnect the mouse/key events from functions of measurement tool
self.canvas.vis_disconnect('mouse_move', self.on_mouse_move_meas)
self.canvas.vis_disconnect('mouse_release', self.on_mouse_click)
self.canvas.vis_disconnect('key_release', self.on_key_release_meas)
# reconnect the mouse/key events to the functions from where the tool was called
self.canvas.vis_connect('key_press', self.app.ui.keyPressEvent)
self.canvas.vis_disconnect('mouse_release', self.on_mouse_click_release)
if self.app.call_source == 'app':
self.canvas.vis_connect('mouse_move', self.app.on_mouse_move_over_plot)
@@ -186,57 +181,44 @@ class Measurement(FlatCAMTool):
elif self.app.call_source == 'geo_editor':
self.canvas.vis_connect('mouse_move', self.app.geo_editor.on_canvas_move)
self.canvas.vis_connect('mouse_press', self.app.geo_editor.on_canvas_click)
# self.canvas.vis_connect('key_press', self.app.geo_editor.on_canvas_key)
self.canvas.vis_connect('mouse_release', self.app.geo_editor.on_canvas_click_release)
self.canvas.vis_connect('mouse_release', self.app.geo_editor.on_geo_click_release)
elif self.app.call_source == 'exc_editor':
self.canvas.vis_connect('mouse_move', self.app.exc_editor.on_canvas_move)
self.canvas.vis_connect('mouse_press', self.app.exc_editor.on_canvas_click)
# self.canvas.vis_connect('key_press', self.app.exc_editor.on_canvas_key)
self.canvas.vis_connect('mouse_release', self.app.exc_editor.on_canvas_click_release)
self.canvas.vis_connect('mouse_release', self.app.exc_editor.on_exc_click_release)
elif self.app.call_source == 'grb_editor':
self.canvas.vis_connect('mouse_move', self.app.grb_editor.on_canvas_move)
self.canvas.vis_connect('mouse_press', self.app.grb_editor.on_canvas_click)
# self.canvas.vis_connect('key_press', self.app.grb_editor.on_canvas_key)
self.canvas.vis_connect('mouse_release', self.app.grb_editor.on_canvas_click_release)
self.canvas.vis_connect('mouse_release', self.app.grb_editor.on_grb_click_release)
self.app.ui.notebook.setTabText(2, _("Tools"))
self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab)
def on_measure(self, signal=None, activate=None):
log.debug("Measurement.on_measure()")
if activate is False or activate is None:
# DISABLE the Measuring TOOL
self.deactivate()
if activate is True:
# ENABLE the Measuring TOOL
self.clicked_meas = 0
self.original_call_source = copy(self.app.call_source)
self.app.call_source = 'measurement'
self.app.inform.emit(_("MEASURING: Click on the Start point ..."))
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
self.activate_measure_tool()
log.debug("Measurement Tool --> tool initialized")
else:
# DISABLE the Measuring TOOL
self.deactivate_measure_tool()
self.app.call_source = copy(self.original_call_source)
self.app.command_active = None
# delete the measuring line
self.delete_shape()
log.debug("Measurement Tool --> exit tool")
elif activate is True:
# ENABLE the Measuring TOOL
self.clicked_meas = 0
self.app.inform.emit(_("MEASURING: Click on the Start point ..."))
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
self.activate()
log.debug("Measurement Tool --> tool initialized")
def on_key_release_meas(self, event):
if event.key == 'escape':
# abort the measurement action
self.on_measure(activate=False)
self.app.inform.emit(_("Measurement Tool exit..."))
return
if event.key == 'G':
# toggle grid status
self.app.ui.grid_snap_btn.trigger()
return
def on_mouse_click(self, event):
def on_mouse_click_release(self, event):
# mouse click releases will be accepted only if the left button is clicked
# this is necessary because right mouse click or middle mouse click
# are used for panning on the canvas