FEM Post: Fix cutter error and "remove crashs"

This commit is contained in:
Stefan Tröger 2016-01-01 21:03:35 +01:00 committed by wmayer
parent dd72ea6ab0
commit 9c61e2f386
6 changed files with 11 additions and 8 deletions

View File

@ -391,3 +391,12 @@ short int FemPostCutFilter::mustExecute(void) const {
else return App::DocumentObject::mustExecute(); else return App::DocumentObject::mustExecute();
} }
DocumentObjectExecReturn* FemPostCutFilter::execute(void) {
if(!m_cutter->GetCutFunction())
return StdReturn;
return Fem::FemPostFilter::execute();
}

View File

@ -164,6 +164,7 @@ public:
return "FemGui::ViewProviderFemPostCut"; return "FemGui::ViewProviderFemPostCut";
} }
virtual short int mustExecute(void) const; virtual short int mustExecute(void) const;
virtual App::DocumentObjectExecReturn* execute(void);
protected: protected:
virtual void onChanged(const App::Property* prop); virtual void onChanged(const App::Property* prop);

View File

@ -84,7 +84,6 @@ FemPostPlaneFunction::~FemPostPlaneFunction() {
void FemPostPlaneFunction::onChanged(const Property* prop) { void FemPostPlaneFunction::onChanged(const Property* prop) {
Base::Console().Message("Changed origin and normal\n");
if(prop == &Origin) { if(prop == &Origin) {
const Base::Vector3d& vec = Origin.getValue(); const Base::Vector3d& vec = Origin.getValue();
m_plane->SetOrigin(vec[0], vec[1], vec[2]); m_plane->SetOrigin(vec[0], vec[1], vec[2]);

View File

@ -1,4 +1,3 @@
<<<<<<< 5ad8d55fe07f22805dab9d61746caf74d0deda72
/*************************************************************************** /***************************************************************************
* Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) *
* * * *

View File

@ -157,7 +157,7 @@ ViewProviderFemPostFunction::~ViewProviderFemPostFunction()
m_geometrySeperator->unref(); m_geometrySeperator->unref();
m_manip->unref(); m_manip->unref();
m_scale->unref(); m_scale->unref();
m_transform->unref(); //transfom us unrefed when it is replaced by the dragger
} }
void ViewProviderFemPostFunction::attach(App::DocumentObject *pcObj) void ViewProviderFemPostFunction::attach(App::DocumentObject *pcObj)
@ -492,8 +492,6 @@ ViewProviderFemPostSphereFunction::ViewProviderFemPostSphereFunction() {
} }
ViewProviderFemPostSphereFunction::~ViewProviderFemPostSphereFunction() { ViewProviderFemPostSphereFunction::~ViewProviderFemPostSphereFunction() {
m_sphereNode->unref();
} }
SoTransformManip* ViewProviderFemPostSphereFunction::setupManipulator() { SoTransformManip* ViewProviderFemPostSphereFunction::setupManipulator() {

View File

@ -235,9 +235,6 @@ public:
protected: protected:
virtual void draggerUpdate(SoDragger* mat); virtual void draggerUpdate(SoDragger* mat);
virtual void updateData(const App::Property*); virtual void updateData(const App::Property*);
private:
SoSphere* m_sphereNode;
}; };
} //namespace FemGui } //namespace FemGui