- fixed some issues with ToolMeasurement due of above changes

This commit is contained in:
Marius Stanciu
2019-03-10 17:21:45 +02:00
parent a6e23b28a7
commit 68cadb08ce
8 changed files with 306 additions and 9 deletions

View File

@@ -167,9 +167,9 @@ class Measurement(FlatCAMTool):
# VisPy visuals
self.sel_shapes = ShapeCollection(parent=self.app.plotcanvas.vispy_canvas.view.scene, layers=1)
self.measure_btn.clicked.connect(self.toggle)
self.measure_btn.clicked.connect(self.toggle_f)
def run(self, toggle):
def run(self, toggle=False):
self.app.report_usage("ToolMeasurement()")
if self.app.tool_tab_locked is True:
@@ -179,7 +179,7 @@ class Measurement(FlatCAMTool):
if self.app.ui.splitter.sizes()[0] == 0:
self.app.ui.splitter.setSizes([1, 1])
self.toggle()
self.toggle_f()
self.set_tool_ui()
self.app.ui.notebook.setTabText(2, _("Meas. Tool"))
@@ -199,7 +199,7 @@ class Measurement(FlatCAMTool):
self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
self.show()
def toggle(self):
def toggle_f(self):
# the self.active var is doing the 'toggle'
if self.active is True:
# DISABLE the Measuring TOOL
@@ -333,7 +333,7 @@ class Measurement(FlatCAMTool):
self.total_distance_entry.set_value('%.4f' % abs(d))
self.clicked_meas = 0
self.toggle()
self.toggle_f()
# delete the measuring line
self.delete_shape()

View File

@@ -56,7 +56,7 @@ class ToolMove(FlatCAMTool):
return
self.toggle()
def toggle(self):
def toggle(self, toggle=False):
if self.isVisible():
self.setVisible(False)