Fem: Reset field color bar - fixes #13695 (#13820)

* Fem: Reset field color bar - fixes #13695 * Fem: Hide input filter if new filer is created
FreeCAD · May 6, 2024 · 42d772c · 42d772c
1 parent 0513f10
commit 42d772c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/Mod/Fem/Gui/Command.cpp b/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
 
 
@@ -1691,6 +1692,22 @@ void setupFilter(Gui::Command* cmd, std::string Name)
         femFilter->Input.setValue(selObject);
     }
 
+    femFilter->Data.setValue(static_cast<Fem::FemPostObject*>(selObject)->Data.getValue());
+    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());
+
+    // hide selected filter
+    cmd->doCommand(Gui::Command::Doc,
+                   "App.activeDocument().%s.ViewObject.Visibility = False",
+                   selObject->getNameInDocument());
+
     cmd->updateActive();
     // open the dialog to edit the filter
     cmd->doCommand(Gui::Command::Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());

diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
@@ -811,11 +811,13 @@ void ViewProviderFemPostObject::filterArtifacts(vtkDataSet* dset)
             m_surface->SetInputData(dset);
         }
     }
+
+    m_blockPropertyChanges = false;
+
     // restore initial vsibility
     if (!visibility) {
         this->Visibility.setValue(visibility);
     }
-    m_blockPropertyChanges = false;
 }
 
 bool ViewProviderFemPostObject::setupPipeline()
@@ -1041,7 +1043,7 @@ void ViewProviderFemPostObject::show()
 
 void ViewProviderFemPostObject::OnChange(Base::Subject<int>& /*rCaller*/, int /*rcReason*/)
 {
-    bool ResetColorBarRange = false;
+    bool ResetColorBarRange = true;
     WriteColorData(ResetColorBarRange);
 }