code cleanings

kbwbe · May 12, 2019 · fade1a2 · fade1a2
1 parent 196e905
commit fade1a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/a2p_importedPart_class.py b/a2p_importedPart_class.py
@@ -31,7 +31,7 @@
 from FreeCAD import  Base
 from PySide import QtGui
 import a2plib
-
+from a2p_versionmanagement import A2P_VERSION
 #==============================================================================
 class Proxy_importPart:
     '''
@@ -46,6 +46,7 @@ def setProperties(self,obj):
         propList = obj.PropertiesList
         if not "a2p_Version" in propList:
             obj.addProperty("App::PropertyString", "a2p_Version", "importPart")
+            obj.a2p_Version = A2P_VERSION
         if not "sourceFile" in propList:
             obj.addProperty("App::PropertyFile", "sourceFile", "importPart")
         if not "sourcePart" in propList:
@@ -58,6 +59,7 @@ def setProperties(self,obj):
             obj.addProperty("App::PropertyBool","fixedPosition","importPart")
         if not "subassemblyImport" in propList:
             obj.addProperty("App::PropertyBool","subassemblyImport","importPart")
+            obj.subassemblyImport = False
         if not "updateColors" in propList:
             obj.addProperty("App::PropertyBool","updateColors","importPart")
             obj.updateColors = True

diff --git a/a2p_importpart.py b/a2p_importpart.py
@@ -55,7 +55,7 @@
     )
 
 import a2p_lcs_support
-from a2p_importedPart_class import Proxy_importPart
+from a2p_importedPart_class import Proxy_importPart, ImportedPartViewProviderProxy
 
 PYVERSION =  sys.version_info[0]
 
@@ -580,9 +580,14 @@ def updateImportedParts(doc):
     for obj in doc.Objects:
         if hasattr(obj, 'sourceFile') and a2plib.to_str(obj.sourceFile) != a2plib.to_str('converted'):
 
-            if not "sourcePart" in obj.PropertiesList:
-                obj.addProperty("App::PropertyString", "sourcePart", "importPart")
-
+
+            #repair data structures (perhaps an old Assembly2 import was found)
+            if hasattr(obj,"Content") and 'importPart' in obj.Content: # be sure to have an assembly object
+                if obj.Proxy is None:
+                    #print (u"Repair Proxy of: {}, Proxy: {}".format(obj.Label, obj.Proxy))
+                    Proxy_importPart(obj)
+                    ImportedPartViewProviderProxy(obj.ViewObject)
+
             assemblyPath = os.path.normpath(os.path.split(doc.FileName)[0])
             absPath = a2plib.findSourceFileInProject(obj.sourceFile, assemblyPath)