Fem: calculator

Author: marioalexis84

src/Mod/Fem/App/FemPostFilter.cpp

@@ -1190,10 +1190,11 @@ FemPostCalculatorFilter::~FemPostCalculatorFilter() = default;
 
 DocumentObjectExecReturn* FemPostCalculatorFilter::execute()
 {
-    printf("EXECITER\n");
-    m_calculator->AddCoordinateScalarVariable("X", 0);
-    m_calculator->AddCoordinateScalarVariable("Y", 1);
-    m_calculator->AddCoordinateScalarVariable("Z", 2);
+    if (!m_calculator->GetFunction()) {
+        return StdReturn;
+    }
+    updateAvailableFields();
+
     //    std::string val;
     //    if (Vector.getValue() >= 0) {
     //        val = Vector.getValueAsString();
@@ -1238,7 +1239,10 @@ void FemPostCalculatorFilter::onChanged(const Property* prop)
     else if (prop == &FieldName) {
         m_calculator->SetResultArrayName(FieldName.getValue());
     }
-    printf("FUNCION: %s\n", m_calculator->GetFunction());
+    else if (prop == &Data) {
+        updateAvailableFields();
+    }
+    printf("FUNCION: %s\t%s\n", m_calculator->GetFunction(), prop->getName());
     Fem::FemPostFilter::onChanged(prop);
 }
 
@@ -1251,3 +1255,43 @@ short int FemPostCalculatorFilter::mustExecute() const
         return FemPostFilter::mustExecute();
     }
 }
+
+void FemPostCalculatorFilter::updateAvailableFields()
+{
+    printf("EXECITER\n");
+    // clear all variables
+    m_calculator->RemoveAllVariables();
+    m_calculator->AddCoordinateScalarVariable("X", 0);
+    m_calculator->AddCoordinateScalarVariable("Y", 1);
+    m_calculator->AddCoordinateScalarVariable("Z", 2);
+
+    std::vector<std::string> scalars;
+    std::vector<std::string> vectors;
+    //    std::vector<std::string> tensors;
+
+    vtkSmartPointer<vtkDataObject> data = getInputData();
+    vtkDataSet* dset = vtkDataSet::SafeDownCast(data);
+    if (!dset) {
+        return;
+    }
+    vtkPointData* pd = dset->GetPointData();
+
+    // get all vector fields
+    for (int i = 0; i < pd->GetNumberOfArrays(); ++i) {
+        std::string name1 = pd->GetArrayName(i);
+        std::string name2 = name1;
+        std::replace(name2.begin(), name2.end(), ' ', '_');
+        if (pd->GetArray(i)->GetNumberOfComponents() == 3) {
+            //            printf("NOMBRE: %s\n", name2.c_str());
+            m_calculator->AddVectorVariable(name2.c_str(), name1.c_str());
+            // add components as scalar variable
+            m_calculator->AddScalarVariable((name2 + "_X").c_str(), name1.c_str(), 0);
+            m_calculator->AddScalarVariable((name2 + "_Y").c_str(), name1.c_str(), 1);
+            m_calculator->AddScalarVariable((name2 + "_Z").c_str(), name1.c_str(), 2);
+        }
+        else if (pd->GetArray(i)->GetNumberOfComponents() == 1) {
+            //            printf("NOMBRE SCA: %s\n", name2.c_str());
+            m_calculator->AddScalarVariable(name2.c_str(), name1.c_str());
+        }
+    }
+}

src/Mod/Fem/App/FemPostFilter.h

@@ -377,6 +377,8 @@ class FemExport FemPostCalculatorFilter: public FemPostFilter
     App::DocumentObjectExecReturn* execute() override;
     void onChanged(const App::Property* prop) override;
 
+    void updateAvailableFields();
+
 private:
     vtkSmartPointer<vtkArrayCalculator> m_calculator;
 };

src/Mod/Fem/Gui/TaskPostBoxes.cpp

@@ -2079,13 +2079,18 @@ void TaskPostCalculator::onFieldNameChanged()
     std::string name = ui->let_field_name->text().toStdString();
     auto obj = getObject<Fem::FemPostCalculatorFilter>();
     obj->FieldName.setValue(name);
+    recompute();
+    getTypedView<ViewProviderFemPostCalculator>()->Field.setValue(name.c_str());
 }
 
 void TaskPostCalculator::onFunctionChanged()
 {
     std::string function = ui->let_function->text().toStdString();
     auto obj = getObject<Fem::FemPostCalculatorFilter>();
     obj->Function.setValue(function);
+    auto view = getTypedView<ViewProviderFemPostCalculator>();
+    recompute();
+    view->updateMaterial();
 }
 
 

src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp

@@ -228,6 +228,19 @@ ViewProviderFemPostCalculator::ViewProviderFemPostCalculator()
 
 ViewProviderFemPostCalculator::~ViewProviderFemPostCalculator() = default;
 
+void ViewProviderFemPostCalculator::updateData(const App::Property* prop)
+{
+    auto obj = getObject<Fem::FemPostCalculatorFilter>();
+    if (prop == &obj->Data) {
+        printf("updata Material\n");
+        // update color bar
+        updateMaterial();
+        Field.touch();
+    }
+
+    return ViewProviderFemPostObject::updateData(prop);
+}
+
 void ViewProviderFemPostCalculator::setupTaskDialog(TaskDlgPost* dlg)
 {
     // add the function box

src/Mod/Fem/Gui/ViewProviderFemPostFilter.h

@@ -166,6 +166,8 @@ class FemGuiExport ViewProviderFemPostCalculator: public ViewProviderFemPostObje
     ViewProviderFemPostCalculator();
     ~ViewProviderFemPostCalculator() override;
 
+    void updateData(const App::Property* prop) override;
+
 protected:
     void setupTaskDialog(TaskDlgPost* dlg) override;
 };

src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp

@@ -655,11 +655,15 @@ void ViewProviderFemPostObject::updateMaterial()
 
 void ViewProviderFemPostObject::WriteColorData(bool ResetColorBarRange)
 {
+    printf("colordata1\n");
     if (!setupPipeline()) {
+        printf("colordata2\n");
         return;
     }
 
+    printf("colordata3\n");
     if (Field.getEnumVector().empty() || Field.getValue() == 0) {
+        printf("colordata3.1\n");
         m_material->diffuseColor.setValue(SbColor(0.8, 0.8, 0.8));
         float trans = Base::fromPercent(Transparency.getValue());
         m_material->transparency.setValue(trans);
@@ -675,6 +679,7 @@ void ViewProviderFemPostObject::WriteColorData(bool ResetColorBarRange)
     vtkPolyData* pd = m_currentAlgorithm->GetOutput();
     vtkDataArray* data = pd->GetPointData()->GetArray(array);
     if (!data) {
+        printf("colordata3.2\n");
         return;
     }
 
@@ -687,10 +692,12 @@ void ViewProviderFemPostObject::WriteColorData(bool ResetColorBarRange)
 
     // build the lookuptable
     if (ResetColorBarRange) {
+        printf("colordata4\n");
         double range[2];
         data->GetRange(range, component);
         setRangeOfColorBar(static_cast<float>(range[0]), static_cast<float>(range[1]));
     }
+    printf("colordata5\n");
 
     vtkIdType numPts = pd->GetNumberOfPoints();
     m_material->diffuseColor.setNum(numPts);
@@ -914,6 +921,7 @@ void ViewProviderFemPostObject::onChanged(const App::Property* prop)
     }
 
     if (prop == &Field && setupPipeline()) {
+        printf("RECOMPUTE FIELD\n");
         updateProperties();
         WriteColorData(ResetColorBarRange);
     }