From 53312d2d1087b224a1da3e0e1804fc3e1e6df017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= <stefantroeger@gmx.net>
Date: Fri, 1 Jan 2016 21:03:35 +0100
Subject: [PATCH] FEM Post: Fix cutter error and "remove crashs"

---
 src/Mod/Fem/App/FemPostFilter.cpp               | 9 +++++++++
 src/Mod/Fem/App/FemPostFilter.h                 | 1 +
 src/Mod/Fem/App/FemPostFunction.cpp             | 1 -
 src/Mod/Fem/Gui/AppFemGui.cpp                   | 1 -
 src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp | 4 +---
 src/Mod/Fem/Gui/ViewProviderFemPostFunction.h   | 3 ---
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Mod/Fem/App/FemPostFilter.cpp b/src/Mod/Fem/App/FemPostFilter.cpp
index f217736385..a54a1e982a 100644
--- a/src/Mod/Fem/App/FemPostFilter.cpp
+++ b/src/Mod/Fem/App/FemPostFilter.cpp
@@ -391,3 +391,12 @@ short int FemPostCutFilter::mustExecute(void) const {
     else return App::DocumentObject::mustExecute();
 }
 
+DocumentObjectExecReturn* FemPostCutFilter::execute(void) {
+    
+    if(!m_cutter->GetCutFunction())
+        return StdReturn;
+    
+    return Fem::FemPostFilter::execute();
+}
+
+
diff --git a/src/Mod/Fem/App/FemPostFilter.h b/src/Mod/Fem/App/FemPostFilter.h
index e5ed2d3558..3f6dd3fc42 100644
--- a/src/Mod/Fem/App/FemPostFilter.h
+++ b/src/Mod/Fem/App/FemPostFilter.h
@@ -164,6 +164,7 @@ public:
         return "FemGui::ViewProviderFemPostCut";
     }
     virtual short int mustExecute(void) const;
+    virtual App::DocumentObjectExecReturn* execute(void);
     
 protected:
     virtual void onChanged(const App::Property* prop);
diff --git a/src/Mod/Fem/App/FemPostFunction.cpp b/src/Mod/Fem/App/FemPostFunction.cpp
index 2fea928885..1e8aab48f5 100644
--- a/src/Mod/Fem/App/FemPostFunction.cpp
+++ b/src/Mod/Fem/App/FemPostFunction.cpp
@@ -84,7 +84,6 @@ FemPostPlaneFunction::~FemPostPlaneFunction() {
 
 void FemPostPlaneFunction::onChanged(const Property* prop) {
     
-    Base::Console().Message("Changed origin and normal\n");
     if(prop == &Origin) {
         const Base::Vector3d& vec = Origin.getValue();
         m_plane->SetOrigin(vec[0], vec[1], vec[2]);
diff --git a/src/Mod/Fem/Gui/AppFemGui.cpp b/src/Mod/Fem/Gui/AppFemGui.cpp
index 0461efb99e..97c27cc96f 100644
--- a/src/Mod/Fem/Gui/AppFemGui.cpp
+++ b/src/Mod/Fem/Gui/AppFemGui.cpp
@@ -1,4 +1,3 @@
-<<<<<<< 5ad8d55fe07f22805dab9d61746caf74d0deda72
 /***************************************************************************
  *   Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de)              *
  *                                                                         *
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
index fabd6136bf..050f7452f4 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
@@ -157,7 +157,7 @@ ViewProviderFemPostFunction::~ViewProviderFemPostFunction()
     m_geometrySeperator->unref();
     m_manip->unref();
     m_scale->unref();
-    m_transform->unref();
+    //transfom us unrefed when it is replaced by the dragger
 }
 
 void ViewProviderFemPostFunction::attach(App::DocumentObject *pcObj)
@@ -492,8 +492,6 @@ ViewProviderFemPostSphereFunction::ViewProviderFemPostSphereFunction() {
 }
 
 ViewProviderFemPostSphereFunction::~ViewProviderFemPostSphereFunction() {
-
-    m_sphereNode->unref();
 }
 
 SoTransformManip* ViewProviderFemPostSphereFunction::setupManipulator() {
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
index c6ec994f69..0880a10343 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
@@ -235,9 +235,6 @@ public:
 protected:
     virtual void draggerUpdate(SoDragger* mat);
     virtual void updateData(const App::Property*);
-
-private:
-    SoSphere* m_sphereNode;
 };
 
 } //namespace FemGui