#6 OpenRocket import

davesrocketshop · Dec 24, 2022 · bbb4d4a · bbb4d4a
1 parent e10ecef
commit bbb4d4a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/Ui/Commands/CmdBodyTube.py b/Ui/Commands/CmdBodyTube.py
@@ -44,6 +44,8 @@ def makeBodyTube(name='BodyTube'):
         ViewProviderBodyTube(obj.ViewObject)
 
         addToStage(obj)
+        FreeCADGui.Selection.clearSelection()
+        FreeCADGui.Selection.addSelection(obj)
     return obj
 
 class CmdBodyTube(Command):

diff --git a/Ui/Commands/CmdRocket.py b/Ui/Commands/CmdRocket.py
@@ -44,11 +44,6 @@ def makeRocket(name='Rocket', makeSustainer=True):
 
     if makeSustainer:
         sustainer = makeStage()
-        # sustainer.Label = 'Sustainer'
-        # obj.Proxy.addChild(sustainer)
-        # FreeCADGui.ActiveDocument.ActiveView.setActiveObject('stage', sustainer)
-        # FreeCADGui.Selection.clearSelection()
-        # FreeCADGui.Selection.addSelection(sustainer)
     else:
         FreeCADGui.Selection.clearSelection()
         FreeCADGui.Selection.addSelection(obj)

diff --git a/Ui/Commands/Command.py b/Ui/Commands/Command.py
@@ -31,12 +31,11 @@ class Command:
     def part_feature_selected(self):
         if FreeCADGui.ActiveDocument is None:
             return False
-        # sel = FreeCADGui.Selection.getSelection()
-        # if len(sel) == 1 and (sel[0].isDerivedFrom("Part::Feature") or sel[0].isDerivedFrom("App::GeometryFeature")):
-        #     return True
-        # else:
-        #     return False
-        return True
+        sel = FreeCADGui.Selection.getSelection()
+        if len(sel) == 1 and (sel[0].isDerivedFrom("Part::Feature") or sel[0].isDerivedFrom("App::GeometryFeature")):
+            return True
+        else:
+            return False
 
     def part_fin_selected(self):
         if FreeCADGui.ActiveDocument is not None:
@@ -48,15 +47,14 @@ def part_fin_selected(self):
 
     def part_eligible_feature(self, feature):
         if FreeCADGui.ActiveDocument is not None:
-            # sel = FreeCADGui.Selection.getSelection()
-            # if len(sel) == 1 and (sel[0].isDerivedFrom("Part::FeaturePython") or sel[0].isDerivedFrom("App::GeometryFeature")):
-            #     if isinstance(feature, list):
-            #         for f in feature:
-            #             if sel[0].Proxy.eligibleChild(f):
-            #                 return True
-            #     elif sel[0].Proxy.eligibleChild(feature):
-            #         return True
-            return True
+            sel = FreeCADGui.Selection.getSelection()
+            if len(sel) == 1 and (sel[0].isDerivedFrom("Part::FeaturePython") or sel[0].isDerivedFrom("App::GeometryPython")):
+                if isinstance(feature, list):
+                    for f in feature:
+                        if sel[0].Proxy.eligibleChild(f):
+                            return True
+                elif sel[0].Proxy.eligibleChild(feature):
+                    return True
         return False
 
     def no_rocket_builder(self):