Attacher: Py: implement Attacher attribute of AttachableObject

FreeCAD · May 13, 2016 · dcc8926 · dcc8926
1 parent 7000d55
commit dcc8926
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/src/Mod/Part/App/AttachableObject.h b/src/Mod/Part/App/AttachableObject.h
@@ -78,7 +78,7 @@ class PartExport AttachableObject : public Part::Feature
      */
     bool changeAttacherType(const char* typeName);
 
-    Attacher::AttachEngine &attacher(void) const {return *_attacher;}
+    Attacher::AttachEngine &attacher(void) const {if(!_attacher) throw Base::Exception("AttachableObject: no attacher is set."); return *_attacher;}
 
 
     App::PropertyString         AttacherType;

diff --git a/src/Mod/Part/App/AttachableObjectPy.xml b/src/Mod/Part/App/AttachableObjectPy.xml
@@ -30,5 +30,12 @@ typename: string. The following are accepted so far:
 'Attacher::AttachEnginePoint'</UserDocu>
       </Documentation>
     </Methode>
+
+    <Attribute Name="Attacher" ReadOnly="true">
+      <Documentation>
+        <UserDocu>AttachEngine object driving this AttachableObject. Returns a copy.</UserDocu>
+      </Documentation>
+      <Parameter Name="Attacher" Type="Object" />
+    </Attribute>
   </PythonExport>
 </GenerateModel>
diff --git a/src/Mod/Part/App/AttachableObjectPyImp.cpp b/src/Mod/Part/App/AttachableObjectPyImp.cpp
@@ -4,6 +4,8 @@
 #include "Mod/Part/App/AttachableObject.h"
 #include "OCCError.h"
 
+#include "AttachEnginePy.h"
+
 // inclusion of the generated files (generated out of AttachableObjectPy.xml)
 #include "AttachableObjectPy.h"
 #include "AttachableObjectPy.cpp"
@@ -53,6 +55,24 @@ PyObject* AttachableObjectPy::changeAttacherType(PyObject *args)
     return Py::new_reference_to(Py::Boolean(ret));
 }
 
+Py::Object AttachableObjectPy::getAttacher(void) const
+{
+    try {
+        this->getAttachableObjectPtr()->attacher(); //throws if attacher is not set
+    } catch (Base::Exception) {
+        return Py::None();
+    }
+
+    try {
+        return Py::Object( new Attacher::AttachEnginePy(this->getAttachableObjectPtr()->attacher().copy()), true);
+    } catch (Standard_Failure) {
+        Handle_Standard_Failure e = Standard_Failure::Caught();
+        throw Py::Exception(Part::PartExceptionOCCError, e->GetMessageString());
+    } catch (Base::Exception &e) {
+        throw Py::Exception(Base::BaseExceptionFreeCADError, e.what());
+    }
+
+}
 
 PyObject *AttachableObjectPy::getCustomAttributes(const char* /*attr*/) const
 {