suzanne.soy/FreeCAD_assembly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gui: fix command active detection

Browse Source
This commit is contained in:
Zheng, Lei 2020-09-26 09:33:06 +08:00
parent e44f47073b
commit 490da82590
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freecad/asm3/gui.py
View File

@ -10,6 +10,16 @@ from .utils import getElementPos,objName,addIconToFCAD,guilogger as logger
from .proxy import ProxyType from .proxy import ProxyType
from .FCADLogger import FCADLogger from .FCADLogger import FCADLogger
def _isCommandActive(cmd):
try:
return FreeCADGui.Command.isActive(cmd)
except Exception:
pass
try:
return FreeCADGui.isCommandActive(cmd)
except Exception:
return True
class SelectionObserver: class SelectionObserver:
def __init__(self): def __init__(self):
self._attached = False self._attached = False
@ -961,7 +971,7 @@ class AsmCmdGotoLinked(AsmCmdBase):
@classmethod @classmethod
def IsActive(cls): def IsActive(cls):
return FreeCADGui.isCommandActive('Std_LinkSelectLinked') return _isCommandActive('Std_LinkSelectLinked')
class AsmCmdGotoLinkedFinal(AsmCmdBase): class AsmCmdGotoLinkedFinal(AsmCmdBase):
_id = 23 _id = 23
@ -1019,7 +1029,7 @@ class AsmCmdGotoLinkedFinal(AsmCmdBase):
obj = sels[0].Object.getSubObject(sels[0].SubElementNames[0],1) obj = sels[0].Object.getSubObject(sels[0].SubElementNames[0],1)
if isTypeOf(obj, (AsmElementLink,AsmElement)): if isTypeOf(obj, (AsmElementLink,AsmElement)):
return True return True
return FreeCADGui.isCommandActive('Std_LinkSelectLinkedFinal') return _isCommandActive('Std_LinkSelectLinkedFinal')
class AsmCmdUp(AsmCmdBase): class AsmCmdUp(AsmCmdBase):
_id = 6 _id = 6