kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: fixes #4100 Problems with Points command callbacks

Browse Source 
The point callback was not properly removed on continue mode.
This commit is contained in:
carlopav
2020-06-14 22:51:50 +02:00
committed by Yorik van Havre
parent 29cba68da9
commit 136f2615e9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Draft/draftguitools/gui_points.py
View File

@@ -108,13 +108,12 @@ class Point(gui_base_original.Creator):
"""
if event_cb:
event = event_cb.getEvent()
if event.getState() != coin.SoMouseButtonEvent.DOWN:
if (event.getState() != coin.SoMouseButtonEvent.DOWN or
event.getButton() != event.BUTTON1):
return
if self.point:
self.stack.append(self.point)
if len(self.stack) == 1:
self.view.removeEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), self.callbackClick)
self.view.removeEventCallbackPivy(coin.SoLocation2Event.getClassTypeId(), self.callbackMove)
# The command to run is built as a series of text strings
# to be committed through the `draftutils.todo.ToDo` class.
commitlist = []
@@ -151,6 +150,11 @@ class Point(gui_base_original.Creator):
def finish(self, cont=False):
"""Terminate the operation and restart if needed."""
super(Point, self).finish()
if self.callbackClick:
self.view.removeEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), self.callbackClick)
if self.callbackMove:
self.view.removeEventCallbackPivy(coin.SoLocation2Event.getClassTypeId(), self.callbackMove)
if self.ui:
if self.ui.continueMode:
self.Activated()