Fem: Calculator2

Author: marioalexis84

src/Mod/Fem/App/FemPostFilter.cpp

@@ -1177,6 +1177,16 @@ FemPostCalculatorFilter::FemPostCalculatorFilter()
                       "Calculator",
                       App::Prop_None,
                       "Expression of the unction to evaluate");
+    ADD_PROPERTY_TYPE(ReplacementValue,
+                      (0.0f),
+                      "Calculator",
+                      App::Prop_None,
+                      "Value used to replace invalid operations");
+    ADD_PROPERTY_TYPE(ReplaceInvalid,
+                      (false),
+                      "Calculator",
+                      App::Prop_None,
+                      "Replace invalid values");
 
     FilterPipeline calculator;
     m_calculator = vtkSmartPointer<vtkArrayCalculator>::New();
@@ -1239,6 +1249,12 @@ void FemPostCalculatorFilter::onChanged(const Property* prop)
     else if (prop == &FieldName) {
         m_calculator->SetResultArrayName(FieldName.getValue());
     }
+    else if (prop == &ReplaceInvalid) {
+        m_calculator->SetReplaceInvalidValues(ReplaceInvalid.getValue());
+    }
+    else if (prop == &ReplacementValue) {
+        m_calculator->SetReplacementValue(ReplacementValue.getValue());
+    }
     else if (prop == &Data) {
         updateAvailableFields();
     }
@@ -1295,3 +1311,13 @@ void FemPostCalculatorFilter::updateAvailableFields()
         }
     }
 }
+
+const std::vector<std::string>& FemPostCalculatorFilter::getScalarVariables()
+{
+    return m_calculator->GetScalarVariableNames();
+}
+
+const std::vector<std::string>& FemPostCalculatorFilter::getVectorVariables()
+{
+    return m_calculator->GetVectorVariableNames();
+}

src/Mod/Fem/App/FemPostFilter.h

@@ -366,13 +366,19 @@ class FemExport FemPostCalculatorFilter: public FemPostFilter
 
     App::PropertyString FieldName;
     App::PropertyString Function;
+    App::PropertyFloat ReplacementValue;
+    App::PropertyBool ReplaceInvalid;
 
     const char* getViewProviderName() const override
     {
         return "FemGui::ViewProviderFemPostCalculator";
     }
     short int mustExecute() const override;
 
+    const std::vector<std::string>& getScalarVariables();
+    const std::vector<std::string>& getVectorVariables();
+
+
 protected:
     App::DocumentObjectExecReturn* execute() override;
     void onChanged(const App::Property* prop) override;

src/Mod/Fem/Gui/TaskPostBoxes.cpp

@@ -2045,10 +2045,20 @@ TaskPostCalculator::TaskPostCalculator(ViewProviderFemPostCalculator* view, QWid
     ui->let_function->setText(QString::fromUtf8(obj->Function.getValue()));
     ui->let_function->blockSignals(false);
 
+    ui->ckb_replace_invalid->setChecked(obj->ReplaceInvalid.getValue());
+    ui->dsb_replacement_value->setEnabled(obj->ReplaceInvalid.getValue());
+    ui->dsb_replacement_value->setValue(obj->ReplacementValue.getValue());
+    ui->dsb_replacement_value->setMaximum(FLOAT_MAX);
+    ui->dsb_replacement_value->setMinimum(FLOAT_MIN);
+
+    // fill completer with available fields
     QCompleter* completer = new QCompleter(this);
     auto fields = view->Field.getEnumVector();
     QStringList qlist;
-    for (const auto& f : fields) {
+    for (const auto& f : obj->getScalarVariables()) {
+        qlist << QString::fromStdString(f);
+    }
+    for (const auto& f : obj->getVectorVariables()) {
         qlist << QString::fromStdString(f);
     }
 
@@ -2072,6 +2082,14 @@ void TaskPostCalculator::setupConnections()
             &QLineEdit::editingFinished,
             this,
             &TaskPostCalculator::onFunctionChanged);
+    connect(ui->dsb_replacement_value,
+            qOverload<double>(&QDoubleSpinBox::valueChanged),
+            this,
+            &TaskPostCalculator::onReplacementValueChanged);
+    connect(ui->ckb_replace_invalid,
+            &QCheckBox::toggled,
+            this,
+            &TaskPostCalculator::onReplaceInvalidChanged);
 }
 
 void TaskPostCalculator::onFieldNameChanged()
@@ -2090,8 +2108,22 @@ void TaskPostCalculator::onFunctionChanged()
     obj->Function.setValue(function);
     auto view = getTypedView<ViewProviderFemPostCalculator>();
     recompute();
-    view->updateMaterial();
+    //    view->updateMaterial();
 }
 
+void TaskPostCalculator::onReplaceInvalidChanged(bool state)
+{
+    auto obj = static_cast<Fem::FemPostCalculatorFilter*>(getObject());
+    obj->ReplaceInvalid.setValue(state);
+    ui->dsb_replacement_value->setEnabled(state);
+    recompute();
+}
+
+void TaskPostCalculator::onReplacementValueChanged(double value)
+{
+    auto obj = static_cast<Fem::FemPostCalculatorFilter*>(getObject());
+    obj->ReplacementValue.setValue(value);
+    recompute();
+}
 
 #include "moc_TaskPostBoxes.cpp"

src/Mod/Fem/Gui/TaskPostBoxes.h

@@ -529,6 +529,8 @@ class TaskPostCalculator: public TaskPostBox
     void setupConnections();
     void onFieldNameChanged();
     void onFunctionChanged();
+    void onReplaceInvalidChanged(bool state);
+    void onReplacementValueChanged(double value);
 
 private:
     QWidget* proxy;

src/Mod/Fem/Gui/TaskPostCalculator.ui

@@ -19,7 +19,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="lbl_field_name">
        <property name="text">
-        <string>Field Name</string>
+        <string>Field Name:</string>
        </property>
       </widget>
      </item>
@@ -30,16 +30,34 @@
      <item row="1" column="0">
       <widget class="QLabel" name="lbl_function">
        <property name="text">
-        <string>Function</string>
+        <string>Function:</string>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QLineEdit" name="let_function">
       </widget>
      </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="ckb_replace_invalid">
+       <property name="text">
+        <string>Replacement Value:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="Gui::DoubleSpinBox" name="dsb_replacement_value">
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Gui::DoubleSpinBox</class>
+   <extends>QWidget</extends>
+   <header>Gui/SpinBox.h</header>
+  </customwidget>
+ </customwidgets>
 </ui>

src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp

@@ -230,15 +230,18 @@ ViewProviderFemPostCalculator::~ViewProviderFemPostCalculator() = default;
 
 void ViewProviderFemPostCalculator::updateData(const App::Property* prop)
 {
+    printf("PROP NAME: %s\n", prop->getName());
     auto obj = getObject<Fem::FemPostCalculatorFilter>();
     if (prop == &obj->Data) {
         printf("updata Material\n");
         // update color bar
+        ViewProviderFemPostObject::updateData(prop);
         updateMaterial();
-        Field.touch();
+        //        Field.touch();
+    }
+    else {
+        return ViewProviderFemPostObject::updateData(prop);
     }
-
-    return ViewProviderFemPostObject::updateData(prop);
 }
 
 void ViewProviderFemPostCalculator::setupTaskDialog(TaskDlgPost* dlg)

src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp

@@ -690,6 +690,9 @@ void ViewProviderFemPostObject::WriteColorData(bool ResetColorBarRange)
         component = 0;
     }
 
+    double ranges[2];
+    data->GetRange(ranges, component);
+    printf("DATA: %s\t%f\t%f\n", data->GetName(), ranges[0], ranges[1]);
     // build the lookuptable
     if (ResetColorBarRange) {
         printf("colordata4\n");