diff --git a/src/Mod/Fem/App/FemPostFilter.cpp b/src/Mod/Fem/App/FemPostFilter.cpp index ecbd2bbcb0..3b5c600680 100644 --- a/src/Mod/Fem/App/FemPostFilter.cpp +++ b/src/Mod/Fem/App/FemPostFilter.cpp @@ -326,11 +326,6 @@ FemPostDataAtPointFilter::FemPostDataAtPointFilter() "DataAtPoint", App::Prop_None, "Center of the point"); - ADD_PROPERTY_TYPE(Radius, - (0), - "DataAtPoint", - App::Prop_None, - "Radius around the point (unused)"); ADD_PROPERTY_TYPE(PointData, (0), "DataAtPoint", App::Prop_None, "Point data values"); ADD_PROPERTY_TYPE(FieldName, (""), "DataAtPoint", App::Prop_None, "Field used for plotting"); ADD_PROPERTY_TYPE(Unit, (""), "DataAtPoint", App::Prop_None, "Unit used for the field"); diff --git a/src/Mod/Fem/App/FemPostFilter.h b/src/Mod/Fem/App/FemPostFilter.h index e630e88906..bdb97daf83 100644 --- a/src/Mod/Fem/App/FemPostFilter.h +++ b/src/Mod/Fem/App/FemPostFilter.h @@ -133,7 +133,6 @@ public: ~FemPostDataAtPointFilter() override; App::PropertyVectorDistance Center; - App::PropertyDistance Radius; App::PropertyString FieldName; App::PropertyFloatList PointData; App::PropertyString Unit; diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp index 71af5460e5..4562da3ae5 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp @@ -22,6 +22,10 @@ #include "PreCompiled.h" +#ifndef _PreComp_ +#include +#endif + #include #include "TaskPostBoxes.h" @@ -58,8 +62,16 @@ void ViewProviderFemPostDataAlongLine::setupTaskDialog(TaskDlgPost* dlg) // data at point filter PROPERTY_SOURCE(FemGui::ViewProviderFemPostDataAtPoint, FemGui::ViewProviderFemPostObject) +App::PropertyFloatConstraint::Constraints ViewProviderFemPostDataAtPoint::sizeRange = {1.0, + 64.0, + 1.0}; + ViewProviderFemPostDataAtPoint::ViewProviderFemPostDataAtPoint() { + float pSize = m_drawStyle->pointSize.getValue(); + ADD_PROPERTY_TYPE(PointSize, (pSize), "Object Style", App::Prop_None, "Set point size"); + PointSize.setConstraints(&sizeRange); + sPixmap = "FEM_PostFilterDataAtPoint"; } @@ -75,6 +87,15 @@ void ViewProviderFemPostDataAtPoint::onSelectionChanged(const Gui::SelectionChan // because a single point does not make sense with a color range. } +void ViewProviderFemPostDataAtPoint::onChanged(const App::Property* prop) +{ + if (prop == &PointSize) { + m_drawStyle->pointSize.setValue(PointSize.getValue()); + } + + ViewProviderFemPostObject::onChanged(prop); +} + ViewProviderFemPostDataAtPoint::~ViewProviderFemPostDataAtPoint() = default; void ViewProviderFemPostDataAtPoint::setupTaskDialog(TaskDlgPost* dlg) diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h index 5a2b00fe8f..52194b87f1 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.h @@ -59,12 +59,19 @@ class FemGuiExport ViewProviderFemPostDataAtPoint: public ViewProviderFemPostObj public: /// constructor. ViewProviderFemPostDataAtPoint(); + + App::PropertyFloatConstraint PointSize; + void show() override; + void onChanged(const App::Property* prop) override; void onSelectionChanged(const Gui::SelectionChanges&) override; ~ViewProviderFemPostDataAtPoint() override; protected: void setupTaskDialog(TaskDlgPost* dlg) override; + +private: + static App::PropertyFloatConstraint::Constraints sizeRange; };