BaseFeature: improve attacher disabling

lattice2AttachablePlacement.py

@@ -40,7 +40,7 @@ EDIT_ATTACHMENT = 56 # Viewprovider edit mode number
 def makeAttachablePlacement(name):
     '''makeAttachablePlacement(name): makes an attachable Placement object.'''
     if Compat.attach_extension_era:
-        obj = lattice2BaseFeature.makeLatticeFeature(name, AttachablePlacement, ViewProviderAttachablePlacement, no_disable_attacher= True)
+        obj = lattice2BaseFeature.makeLatticeFeature(name, AttachablePlacement, ViewProviderAttachablePlacement)
     else:
         #obsolete!
         obj = FreeCAD.ActiveDocument.addObject("Part::AttachableObjectPython",name)
@@ -53,15 +53,12 @@ def makeAttachablePlacement(name):
 class AttachableFeature(lattice2BaseFeature.LatticeFeature):
     "Base class for attachable features"
     
+    attachable = True
+    
     def derivedInit(self,obj):
         if Compat.attach_extension_era:
             if not obj.hasExtension('Part::AttachExtension'): #PartDesign-related hack: the placement already has attachextension if created in PD
                 obj.addExtension('Part::AttachExtensionPython', None)
-        
-    def onDocumentRestored(self, selfobj):
-        #PartDesign-related hack: this dummy override disables disabling of attacher
-        pass 
-
 
 class AttachablePlacement(AttachableFeature):
     "Attachable Lattice Placement object"

lattice2BaseFeature.py

@@ -50,11 +50,10 @@ def getDefShapeColor():
     return (r/255.0, g/255.0, b/255.0, (255-o)/255.0)
     
 
-def makeLatticeFeature(name, AppClass, ViewClass, no_body = False, no_disable_attacher = False):
+def makeLatticeFeature(name, AppClass, ViewClass, no_body = False):
     '''makeLatticeFeature(name, AppClass, ViewClass, no_body = False): makes a document object for a LatticeFeature-derived object.
     
-    no_body: if False, the Lattice object will end up in an active body, and Part2DObject will be used.
-    no_disable_attacher: if True, attachment properties of Part2DObject won't be hidden'''
+    no_body: if False, the Lattice object will end up in an active body, and Part2DObject will be used.'''
     
     body = activeBody()
     if body and not no_body:
@@ -105,6 +104,8 @@ def getMarkerSizeEstimate(ListOfPlacements):
 class LatticeFeature(object):
     "Base object for lattice objects (arrays of placements)"
     
+    attachable = False
+    
     def __init__(self,obj):
         # please, don't override. Override derivedInit instead.
         obj.addProperty('App::PropertyString', 'Type', "Lattice", "module_name.class_name of this object, for proxy recovery", 0, True, True)
@@ -134,8 +135,12 @@ class LatticeFeature(object):
         self.derivedInit(obj)
         self.assureProperties(obj)
         
+        self.updateReadonlyness(obj)
+        if not self.attachable:
+            self.disableAttacher(obj)
+
         obj.Proxy = self
-        
+    
     def assureProperties(self, selfobj):
         """#overrideme Method to reconstruct missing properties, that appeared as new functionality was introduced. 
         Auto called from __init__ (and before derivedInit), and from execute (before derivedExecute)."""
@@ -357,8 +362,8 @@ class LatticeFeature(object):
                 selfobj.MapMode = selfobj.MapMode #trigger attachment, to make it update property states
     
     def onDocumentRestored(self, selfobj):
-        #override to have attachment!
-        self.disableAttacher(selfobj)
+        if not self.attachable:
+            self.disableAttacher(selfobj)
         self.assureProperties(selfobj)
         self.updateReadonlyness(selfobj)