Support macros and console logs in Assembly

bgbsww · Sep 21, 2024 · 163f9b3 · 163f9b3
1 parent d7a922c
commit 163f9b3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/Mod/Assembly/CommandCreateAssembly.py b/src/Mod/Assembly/CommandCreateAssembly.py
@@ -70,6 +70,7 @@ def Activated(self):
         App.setActiveTransaction("Create assembly")
 
         activeAssembly = UtilsAssembly.activeAssembly()
+        Gui.addModule("UtilsAssembly")
         if activeAssembly:
             commands = (
                 "activeAssembly = UtilsAssembly.activeAssembly()\n"

diff --git a/src/Mod/Assembly/CommandCreateBom.py b/src/Mod/Assembly/CommandCreateBom.py
@@ -324,6 +324,7 @@ def isNameDuplicate(self, name):
 
     def createBomObject(self):
         assembly = UtilsAssembly.activeAssembly()
+        Gui.addModule("UtilsAssembly")
         if assembly is not None:
             commands = (
                 "bom_group = UtilsAssembly.getBomGroup(assembly)\n"

diff --git a/src/Mod/Assembly/CommandInsertLink.py b/src/Mod/Assembly/CommandInsertLink.py
@@ -78,12 +78,14 @@ def IsActive(self):
     def Activated(self):
         Gui.addModule("UtilsAssembly")
         Gui.addModule("CommandInsertLink")
-        Gui.doCommand("assembly = UtilsAssembly.activeAssembly()")
-        if not Gui.doCommandEval("assembly"):
+        if not UtilsAssembly.activeAssembly():
             return
-        Gui.doCommand("view = Gui.activeDocument().activeView()")
-
-        Gui.doCommand("panel = CommandInsertLink.TaskAssemblyInsertLink(assembly, view)")
+        commands = (
+            "assembly = UtilsAssembly.activeAssembly()\n",
+            "view = Gui.activeDocument().activeView()\n",
+            "panel = CommandInsertLink.TaskAssemblyInsertLink(assembly, view)\n",
+        )
+        Gui.doCommand(commands)
         self.panel = Gui.doCommandEval("panel")
         Gui.Control.showDialog(self.panel)
 
@@ -129,8 +131,12 @@ def accept(self):
         # if self.partMoving:
         #    self.endMove()
         Gui.addModule("UtilsAssembly")
-        # cmds = UtilsAssembly.generatePropertySettings("obj", self.assembly)
-        # Gui.doCommand(cmds)
+        print("InsertLink")
+        print(self.assembly)
+        print(self.insertionStack)
+        print(self.buildPartList())
+        # commands = UtilsAssembly.generatePropertySettings("obj", self.assembly)
+        # Gui.doCommand(commands)
 
         App.closeActiveTransaction()
         return True

diff --git a/src/Mod/Assembly/JointObject.py b/src/Mod/Assembly/JointObject.py
@@ -548,7 +548,7 @@ def setJointType(self, joint, jointType):
 
     def onChanged(self, joint, prop):
         """Do something when a property has changed"""
-        App.Console.PrintMessage("Change property: " + str(prop) + "\n")
+        # App.Console.PrintMessage("Change property: " + str(prop) + "\n")
 
         # during loading the onchanged may be triggered before full init.
         if App.isRestoring():