Part: AttachmentEditor: withdraw code to use Show module

FreeCAD · Jun 19, 2016 · 32f5466 · 32f5466
1 parent 541e840
commit 32f5466
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 202 deletions.
diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt
@@ -289,11 +289,9 @@ SET(Part_Scripts
     JoinFeatures.py
     AttachmentEditor/__init__.py
     AttachmentEditor/Commands.py
-    AttachmentEditor/DepGraphTools.py
     AttachmentEditor/FrozenClass.py
     AttachmentEditor/TaskAttachmentEditor.py
     AttachmentEditor/TaskAttachmentEditor.ui
-    AttachmentEditor/TempoVis.py
 )
 
 add_library(Part SHARED ${Part_SRCS})

diff --git a/src/Mod/Part/AttachmentEditor/DepGraphTools.py b/src/Mod/Part/AttachmentEditor/DepGraphTools.py
diff --git a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py
@@ -31,8 +31,16 @@
 from Units import Quantity as Q
 
 from AttachmentEditor.FrozenClass import FrozenClass
-from AttachmentEditor.TempoVis import TempoVis
-from AttachmentEditor.DepGraphTools import getAllDependent
+try:
+    from Show.TempoVis import TempoVis
+    from Show.DepGraphTools import getAllDependent
+except ImportError as err:
+    def TempoVis(doc):
+        return None
+    def getAllDependent(feature):
+        return []
+    App.Console.PrintWarning("AttachmentEditor: Failed to import some code from Show module. Functionality will be limited.\n")
+    App.Console.PrintWarning(err.message)
 
 if App.GuiUp:
     import FreeCADGui as Gui
@@ -280,9 +288,10 @@ def __init__(self, obj_to_attach,
         self.updateRefButtons()
 
         self.tv = TempoVis(self.obj.Document)
-        self.tv.hide_all_dependent(self.obj)
-        self.tv.show(self.obj)
-        self.tv.show([obj for (obj,subname) in self.attacher.References])
+        if self.tv: # tv will still be None if Show module is unavailable
+            self.tv.hide_all_dependent(self.obj)
+            self.tv.show(self.obj)
+            self.tv.show([obj for (obj,subname) in self.attacher.References])
 
     # task dialog handling
     def getStandardButtons(self):
@@ -582,4 +591,5 @@ def updatePreview(self):
     def cleanUp(self):
         '''stuff that needs to be done when dialog is closed.'''
         Gui.Selection.removeObserver(self)
-        self.tv.restore()
+        if self.tv:
+            self.tv.restore()
diff --git a/src/Mod/Part/AttachmentEditor/TempoVis.py b/src/Mod/Part/AttachmentEditor/TempoVis.py
diff --git a/src/Mod/Part/CMakeLists.txt b/src/Mod/Part/CMakeLists.txt
@@ -20,11 +20,9 @@ INSTALL(
     FILES
         AttachmentEditor/__init__.py
         AttachmentEditor/Commands.py
-        AttachmentEditor/DepGraphTools.py
         AttachmentEditor/FrozenClass.py
         AttachmentEditor/TaskAttachmentEditor.py
         AttachmentEditor/TaskAttachmentEditor.ui
-        AttachmentEditor/TempoVis.py
     DESTINATION
         Mod/Part/AttachmentEditor
        )