From 6f09d262d7ea1f707689e3d0d4162cef01467bf5 Mon Sep 17 00:00:00 2001 From: Johannes Reinhardt Date: Wed, 21 May 2014 16:28:14 +0200 Subject: [PATCH] simplified IsActive method for commands --- src/Mod/Arch/ArchCommands.py | 35 +++++++---------------------------- src/Mod/Arch/ArchWall.py | 7 ++----- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index 3b12d2ff7..59257663a 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -872,10 +872,7 @@ class _CommandAdd: 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Add","Adds the selected components to the active object")} def IsActive(self): - if len(FreeCADGui.Selection.getSelection()) > 1: - return True - else: - return False + return len(FreeCADGui.Selection.getSelection()) > 1 def Activated(self): sel = FreeCADGui.Selection.getSelection() @@ -907,10 +904,7 @@ class _CommandRemove: 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Remove","Remove the selected components from their parents, or create a hole in a component")} def IsActive(self): - if FreeCADGui.Selection.getSelection(): - return True - else: - return False + return bool(FreeCADGui.Selection.getSelection()) def Activated(self): sel = FreeCADGui.Selection.getSelection() @@ -945,10 +939,7 @@ class _CommandSplitMesh: 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_SplitMesh","Splits selected meshes into independent components")} def IsActive(self): - if len(FreeCADGui.Selection.getSelection()): - return True - else: - return False + return bool(FreeCADGui.Selection.getSelection()) def Activated(self): if FreeCADGui.Selection.getSelection(): @@ -973,10 +964,7 @@ class _CommandMeshToShape: 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_MeshToShape","Turns selected meshes into Part Shape objects")} def IsActive(self): - if FreeCADGui.Selection.getSelection(): - return True - else: - return False + return bool(FreeCADGui.Selection.getSelection()) def Activated(self): if FreeCADGui.Selection.getSelection(): @@ -1036,10 +1024,7 @@ class _CommandRemoveShape: 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_RemoveShape","Removes cubic shapes from Arch components")} def IsActive(self): - if FreeCADGui.Selection.getSelection(): - return True - else: - return False + return bool(FreeCADGui.Selection.getSelection()) def Activated(self): sel = FreeCADGui.Selection.getSelection() @@ -1053,10 +1038,7 @@ class _CommandCloseHoles: 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_CloseHoles","Closes holes in open shapes, turning them solids")} def IsActive(self): - if FreeCADGui.Selection.getSelection(): - return True - else: - return False + return bool(FreeCADGui.Selection.getSelection()) def Activated(self): for o in FreeCADGui.Selection.getSelection(): @@ -1072,10 +1054,7 @@ class _CommandCheck: 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Check","Checks the selected objects for problems")} def IsActive(self): - if FreeCADGui.Selection.getSelection(): - return True - else: - return False + return bool(FreeCADGui.Selection.getSelection()) def Activated(self): result = check(FreeCADGui.Selection.getSelection()) diff --git a/src/Mod/Arch/ArchWall.py b/src/Mod/Arch/ArchWall.py index 2face74c2..0303751ba 100644 --- a/src/Mod/Arch/ArchWall.py +++ b/src/Mod/Arch/ArchWall.py @@ -345,11 +345,8 @@ class _CommandMergeWalls: 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_MergeWalls","Merges the selected walls, if possible")} def IsActive(self): - if FreeCADGui.Selection.getSelection(): - return True - else: - return False - + return bool(FreeCADGui.Selection.getSelection()) + def Activated(self): walls = FreeCADGui.Selection.getSelection() if len(walls) == 1: