From b0b243bee79cd5924210e2c8241cde2d30b51ab1 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Thu, 24 Mar 2022 02:37:10 +0100
Subject: [PATCH] [FEM] scale fix for post meshes

- post result meshes must inherit the parent scaling
- also change Scale to enum as proposed by @wwmayer
---
 src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp | 34 ++++++++++++++++---
 src/Mod/Fem/Gui/ViewProviderFemPostObject.h   |  4 ++-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
index ef508f76d7..c313b091f3 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
@@ -47,6 +47,7 @@
 #include <Gui/Document.h>
 #include <Gui/SoFCColorBar.h>
 #include <Gui/TaskView/TaskDialog.h>
+#include <Mod/Fem/App/FemPostPipeline.h>
 
 #include "ViewProviderFemPostObject.h"
 #include "TaskPostBoxes.h"
@@ -60,6 +61,8 @@ typedef const vtkIdType* vtkIdTypePtr;
 typedef vtkIdType* vtkIdTypePtr;
 #endif
 
+const char* ViewProviderFemPostObject::ScaleEnums[] = { "1", "1000", nullptr };
+
 PROPERTY_SOURCE(FemGui::ViewProviderFemPostObject, Gui::ViewProviderDocumentObject)
 
 ViewProviderFemPostObject::ViewProviderFemPostObject() : m_blockPropertyChanges(false)
@@ -68,7 +71,9 @@ ViewProviderFemPostObject::ViewProviderFemPostObject() : m_blockPropertyChanges(
     ADD_PROPERTY_TYPE(Field, ((long)0), "Coloring", App::Prop_None, "Select the field used for calculating the color");
     ADD_PROPERTY_TYPE(VectorMode, ((long)0), "Coloring", App::Prop_None, "Select what to show for a vector field");
     ADD_PROPERTY(Transparency, (0));
-    ADD_PROPERTY(Scale, (1.0));
+    ADD_PROPERTY_TYPE(Scale, (0L), "Base", (App::PropertyType)(App::Prop_None), "Scale factor of the mesh");
+    Scale.setEnums(ScaleEnums);
+    Scale.setReadOnly(true);
 
     sPixmap = "fem-femmesh-from-shape";
 
@@ -426,12 +431,33 @@ void ViewProviderFemPostObject::WritePointData(vtkPoints* points, vtkDataArray*
     // because for Elmer we work with SI units and thus get a scaled result we need to transform
     auto Label = std::string(pcObject->Label.getValue());
     auto found = Label.find(std::string("Elmer"));
-    if (found != std::string::npos && Scale.getValue() != 1000.0)
-        Scale.setValue(1000.0);
+    if (found != std::string::npos && Scale.getValueAsString() != "1000")
+        Scale.setValue("1000");
+
+    // we must inherit the Scale of parent meshes (for example for clip filters)
+    auto parents = pcObject->getInList();
+    if (parents.size()) {
+        for (auto itParents = parents.begin(); itParents != parents.end(); ++itParents) {
+            if ((*itParents)->getTypeId() == Base::Type::fromName("Fem::FemPostPipeline")) {
+                auto vpObject = dynamic_cast<FemGui::ViewProviderFemPostObject*>(
+                    Gui::Application::Instance->getViewProvider(*itParents));
+                if (vpObject) {
+                    auto propScale = Base::freecad_dynamic_cast<App::PropertyEnumeration>(
+                        vpObject->getPropertyByName("Scale"));
+                    if (propScale) {
+                        if (propScale->getValue() != Scale.getValue()) {
+                            Scale.setValue(propScale->getValue());
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     m_coordinates->point.startEditing();
     m_coordinates->point.setNum(points->GetNumberOfPoints());
-    auto scale = Scale.getValue();
+    double scale = (Scale.getValueAsString() == "1") ? 1.0 : 1000.0;
     for (i = 0; i < points->GetNumberOfPoints(); i++) {
         p = points->GetPoint(i);
         m_coordinates->point.set1Value(i, p[0] * scale, p[1] * scale, p[2] * scale);
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
index 8e6e890212..e4531c4842 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h
@@ -77,7 +77,7 @@ public:
     App::PropertyEnumeration            Field;
     App::PropertyEnumeration            VectorMode;
     App::PropertyPercent                Transparency;
-    App::PropertyFloat                  Scale;
+    App::PropertyEnumeration            Scale;
 
     void attach(App::DocumentObject *pcObject);
     void setDisplayMode(const char* ModeName);
@@ -141,6 +141,8 @@ protected:
     vtkSmartPointer<vtkExtractEdges>            m_wireframe, m_wireframeSurface;
     vtkSmartPointer<vtkVertexGlyphFilter>       m_points, m_pointsSurface;
 
+    static const char* ScaleEnums[];
+
 private:
     void updateProperties();
     void update3D();