Fem: Fix filter data

Author: marioalexis84

src/Mod/Fem/App/FemPostFilter.cpp

@@ -461,6 +461,11 @@ FemPostClipFilter::FemPostClipFilter()
 
     m_extractor->SetExtractInside(0);
     setActiveFilterPipeline("extract");
+
+    //    m_implicitFallback = vtkSmartPointer<vtkBox>::New();
+
+    //    m_clipper->SetClipFunction(m_implicitFallback);
+    //    m_extractor->SetImplicitFunction(m_implicitFallback);
 }
 
 FemPostClipFilter::~FemPostClipFilter() = default;
@@ -476,6 +481,10 @@ void FemPostClipFilter::onChanged(const Property* prop)
             m_extractor->SetImplicitFunction(
                 static_cast<FemPostFunction*>(Function.getValue())->getImplicitFunction());
         }
+        else {
+            //            m_clipper->SetClipFunction(m_implicitFallback);
+            //            m_extractor->SetImplicitFunction(m_implicitFallback);
+        }
     }
     else if (prop == &InsideOut) {
 
@@ -815,6 +824,10 @@ FemPostCutFilter::FemPostCutFilter()
     cut.target = m_cutter;
     addFilterPipeline(cut, "cut");
     setActiveFilterPipeline("cut");
+
+    //    m_implicitFallback = vtkSmartPointer<vtkPlane>::New();
+    // m_implicitFallback->SetOrigin(0.0,0.0,0.0);
+    //    m_cutter->SetCutFunction(m_implicitFallback);
 }
 
 FemPostCutFilter::~FemPostCutFilter() = default;
@@ -827,6 +840,9 @@ void FemPostCutFilter::onChanged(const Property* prop)
             m_cutter->SetCutFunction(
                 static_cast<FemPostFunction*>(Function.getValue())->getImplicitFunction());
         }
+        else {
+            //            m_cutter->SetCutFunction(m_implicitFallback);
+        }
     }
 
     Fem::FemPostFilter::onChanged(prop);

src/Mod/Fem/App/FemPostFilter.h

@@ -23,6 +23,8 @@
 #ifndef Fem_FemPostFilter_H
 #define Fem_FemPostFilter_H
 
+#include <vtkBox.h>
+#include <vtkPlane.h>
 #include <vtkContourFilter.h>
 #include <vtkCutter.h>
 #include <vtkExtractGeometry.h>
@@ -56,9 +58,9 @@ class FemExport FemPostFilter: public Fem::FemPostObject
 
     App::DocumentObjectExecReturn* execute() override;
 
-protected:
     vtkDataObject* getInputData();
 
+protected:
     // pipeline handling for derived filter
     struct FilterPipeline
     {
@@ -182,6 +184,7 @@ class FemExport FemPostClipFilter: public FemPostFilter
 private:
     vtkSmartPointer<vtkTableBasedClipDataSet> m_clipper;
     vtkSmartPointer<vtkExtractGeometry> m_extractor;
+    //    vtkSmartPointer<vtkBox> m_implicitFallback;
 };
 
 
@@ -251,6 +254,7 @@ class FemExport FemPostCutFilter: public FemPostFilter
 
 private:
     vtkSmartPointer<vtkCutter> m_cutter;
+    //    vtkSmartPointer<vtkPlane> m_implicitFallback;
 };
 
 

src/Mod/Fem/Gui/Command.cpp

@@ -58,6 +58,7 @@
 
 #ifdef FC_USE_VTK
 #include <Mod/Fem/App/FemPostPipeline.h>
+#include <Mod/Fem/Gui/ViewProviderFemPostObject.h>
 #endif
 
 
@@ -1690,6 +1691,17 @@ void setupFilter(Gui::Command* cmd, std::string Name)
     if (!selectionIsPipeline) {
         femFilter->Input.setValue(selObject);
     }
+    auto t = static_cast<Fem::FemPostObject*>(selObject);
+    femFilter->Data.setValue(t->Data.getValue());
+    App::GetApplication().getActiveDocument()->recomputeFeature(selObject, true);
+    auto selObjectView = static_cast<FemGui::ViewProviderFemPostObject*>(
+        Gui::Application::Instance->getViewProvider(selObject));
+    cmd->doCommand(Gui::Command::Doc,
+                   "App.activeDocument().ActiveObject.ViewObject.Field = \"%s\"",
+                   selObjectView->Field.getValueAsString());
+    cmd->doCommand(Gui::Command::Doc,
+                   "App.activeDocument().ActiveObject.ViewObject.VectorMode = \"%s\"",
+                   selObjectView->VectorMode.getValueAsString());
 
     cmd->updateActive();
     // open the dialog to edit the filter

src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp

@@ -1041,7 +1041,7 @@ void ViewProviderFemPostObject::show()
 
 void ViewProviderFemPostObject::OnChange(Base::Subject<int>& /*rCaller*/, int /*rcReason*/)
 {
-    bool ResetColorBarRange = false;
+    bool ResetColorBarRange = true;
     WriteColorData(ResetColorBarRange);
 }