Merge pull request #354 from ickby/fixes

Fixes one Extension and two PartDesign bugs
FreeCAD · Nov 29, 2016 · 313d893 · 313d893
2 parents 8d1bea8 + ddc9d9c
commit 313d893
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/src/App/Extension.h b/src/App/Extension.h
@@ -292,6 +292,7 @@ class ExtensionPythonT : public ExtensionT
 
     ExtensionPythonT() {
         ExtensionT::m_isPythonExtension = true;
+        ExtensionT::initExtension(ExtensionPythonT::getExtensionClassTypeId());
 
         EXTENSION_ADD_PROPERTY(ExtensionProxy,(Py::Object()));
     }

diff --git a/src/Mod/PartDesign/App/Body.cpp b/src/Mod/PartDesign/App/Body.cpp
@@ -257,6 +257,9 @@ bool Body::isAllowed(const App::DocumentObject* f)
 
 Body* Body::findBodyOf(const App::DocumentObject* feature)
 {
+    if(!feature)
+        return nullptr;
+
     return static_cast<Body*>(BodyBase::findBodyOf(feature));
 }
 

diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
@@ -200,13 +200,14 @@ void TaskMirroredParameters::onSelectionChanged(const Gui::SelectionChanges& msg
             }
             exitSelectionMode();
         } else {
-            if ( selectionMode == reference) {
-                std::vector<std::string> mirrorPlanes;
-                App::DocumentObject* selObj;
-                PartDesign::Mirrored* pcMirrored = static_cast<PartDesign::Mirrored*>(getObject());
-                getReferencedSelection(pcMirrored, msg, selObj, mirrorPlanes);
-                if (!selObj)
+            std::vector<std::string> mirrorPlanes;
+            App::DocumentObject* selObj;
+            PartDesign::Mirrored* pcMirrored = static_cast<PartDesign::Mirrored*>(getObject());
+            getReferencedSelection(pcMirrored, msg, selObj, mirrorPlanes);
+            if (!selObj)
                     return;
+
+            if ( selectionMode == reference || selObj->isDerivedFrom ( App::Plane::getClassTypeId () ) ) {
                 pcMirrored->MirrorPlane.setValue(selObj, mirrorPlanes);
                 recomputeFeature();
                 updateUI();

diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
@@ -242,13 +242,14 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges&
             exitSelectionMode();
         }
         else {
-            if (selectionMode == reference) {
-                std::vector<std::string> axes;
-                App::DocumentObject* selObj;
-                PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
-                getReferencedSelection(pcPolarPattern, msg, selObj, axes);
-                if(!selObj)
+            std::vector<std::string> axes;
+            App::DocumentObject* selObj;
+            PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
+            getReferencedSelection(pcPolarPattern, msg, selObj, axes);
+            if(!selObj)
                     return;
+
+            if (selectionMode == reference || selObj->isDerivedFrom ( App::Line::getClassTypeId () ) ) {
                 pcPolarPattern->Axis.setValue(selObj, axes);
                 recomputeFeature();
                 updateUI();

diff --git a/src/Mod/Test/Document.py b/src/Mod/Test/Document.py
@@ -220,6 +220,20 @@ def allowObject(self, obj):
     del obj
     del grp
     del grp2
+
+  def testExtensionBug0002785(self):
+
+        class MyExtension():
+            def __init__(self, obj):
+                obj.addExtension("App::GroupExtensionPython", self)
+
+        obj = self.Doc.addObject("App::DocumentObject", "myObj")
+        MyExtension(obj)
+        self.failUnless(obj.hasExtension("App::GroupExtension"))
+        self.failUnless(obj.hasExtension("App::GroupExtensionPython"))
+        self.Doc.removeObject(obj.Name)
+        del obj
+
 
   def tearDown(self):
     #closing doc