diff --git a/src/Mod/Fem/Gui/AppFemGui.cpp b/src/Mod/Fem/Gui/AppFemGui.cpp index 36424fec8a..302a161f6f 100644 --- a/src/Mod/Fem/Gui/AppFemGui.cpp +++ b/src/Mod/Fem/Gui/AppFemGui.cpp @@ -52,6 +52,7 @@ #include "ViewProviderSetFaces.h" #include "ViewProviderSetGeometry.h" #include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" #include "ViewProviderFemConstraintBearing.h" #include "ViewProviderFemConstraintFixed.h" #include "ViewProviderFemConstraintForce.h" @@ -116,6 +117,7 @@ PyMOD_INIT_FUNC(FemGui) FemGui::ViewProviderFemConstraint ::init(); FemGui::ViewProviderFemConstraintPython ::init(); + FemGui::ViewProviderFemConstraintOnBoundary ::init(); FemGui::ViewProviderFemConstraintBearing ::init(); FemGui::ViewProviderFemConstraintContact ::init(); FemGui::ViewProviderFemConstraintDisplacement ::init(); diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 097e6a446f..15a705b9f7 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -42,6 +42,7 @@ link_directories(${SMESH_LIB_PATH}) set(FemGui_LIBS Fem FreeCADGui + PartGui ) @@ -220,6 +221,8 @@ SET(FemGui_SRCS_ViewProvider FemSelectionGate.h ViewProviderFemConstraint.cpp ViewProviderFemConstraint.h + ViewProviderFemConstraintOnBoundary.cpp + ViewProviderFemConstraintOnBoundary.h ViewProviderFemConstraintBearing.cpp ViewProviderFemConstraintBearing.h ViewProviderFemConstraintFixed.cpp diff --git a/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.cpp index e738e9ab89..42b5649905 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.cpp @@ -59,10 +59,12 @@ using namespace Gui; TaskFemConstraintOnBoundary::TaskFemConstraintOnBoundary(ViewProviderFemConstraint *ConstraintView, QWidget *parent, const char* pixmapname) : TaskFemConstraint(ConstraintView, parent, pixmapname) { + ConstraintView->highlightReferences(true); } TaskFemConstraintOnBoundary::~TaskFemConstraintOnBoundary() { + ConstraintView->highlightReferences(false); } void TaskFemConstraintOnBoundary::_addToSelection(bool checked) @@ -73,6 +75,7 @@ void TaskFemConstraintOnBoundary::_addToSelection(bool checked) if (selection.empty()) { this->clearButtons(refAdd); selChangeMode = refAdd; + ConstraintView->highlightReferences(true); } else { this->addToSelection(); clearButtons(none); @@ -90,6 +93,7 @@ void TaskFemConstraintOnBoundary::_removeFromSelection(bool checked) if (selection.empty()) { this->clearButtons(refRemove); selChangeMode = refRemove; + ConstraintView->highlightReferences(true); } else { this->removeFromSelection(); clearButtons(none); @@ -116,6 +120,7 @@ void TaskFemConstraintOnBoundary::onSelectionChanged(const Gui::SelectionChanges default: return; } + ConstraintView->highlightReferences(true); } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h index e3433c7001..c000a08a96 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h @@ -68,6 +68,9 @@ public: std::vector claimChildren(void)const; void setupContextMenu(QMenu*, QObject*, const char*); + /// Highlight the references that have been selected + virtual void highlightReferences(const bool /* on */) {} + static std::string gethideMeshShowPartStr(); static std::string gethideMeshShowPartStr(const std::string showConstr); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp index b9fa4f3120..94ca552bdf 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp @@ -44,7 +44,7 @@ using namespace FemGui; -PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintDisplacement, FemGui::ViewProviderFemConstraint) +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintDisplacement, FemGui::ViewProviderFemConstraintOnBoundary) ViewProviderFemConstraintDisplacement::ViewProviderFemConstraintDisplacement() { diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h index 06939eaeb2..8641b151f0 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h @@ -26,11 +26,11 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTDISPLACEMENT_H #define GUI_VIEWPROVIDERFEMCONSTRAINTDISPLACEMENT_H -#include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" namespace FemGui { -class FemGuiExport ViewProviderFemConstraintDisplacement : public FemGui::ViewProviderFemConstraint +class FemGuiExport ViewProviderFemConstraintDisplacement : public FemGui::ViewProviderFemConstraintOnBoundary { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintDisplacement); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp index 41f2055683..77fdaf5ea4 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp @@ -46,7 +46,7 @@ using namespace FemGui; -PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintFixed, FemGui::ViewProviderFemConstraint) +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintFixed, FemGui::ViewProviderFemConstraintOnBoundary) ViewProviderFemConstraintFixed::ViewProviderFemConstraintFixed() diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h index 5044488abf..19be407be5 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h @@ -25,12 +25,12 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTFIXED_H #define GUI_VIEWPROVIDERFEMCONSTRAINTFIXED_H -#include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" namespace FemGui { -class FemGuiExport ViewProviderFemConstraintFixed : public FemGui::ViewProviderFemConstraint +class FemGuiExport ViewProviderFemConstraintFixed : public FemGui::ViewProviderFemConstraintOnBoundary { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintFixed); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp index 2bcd624095..9b4a0e038a 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp @@ -45,7 +45,7 @@ using namespace FemGui; -PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintFluidBoundary, FemGui::ViewProviderFemConstraint) +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintFluidBoundary, FemGui::ViewProviderFemConstraintOnBoundary) ViewProviderFemConstraintFluidBoundary::ViewProviderFemConstraintFluidBoundary() diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h index c36f045c8f..718b30779e 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h @@ -25,12 +25,12 @@ #ifndef GUI_VIEWPROVIDERFEMFLUIDBOUNDARY_H #define GUI_VIEWPROVIDERFEMFLUIDBOUNDARY_H -#include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" namespace FemGui { -class FemGuiExport ViewProviderFemConstraintFluidBoundary : public FemGui::ViewProviderFemConstraint +class FemGuiExport ViewProviderFemConstraintFluidBoundary : public FemGui::ViewProviderFemConstraintOnBoundary { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintFluidBoundary); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp index 8b6c3aaf68..002b9705b6 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp @@ -45,7 +45,7 @@ using namespace FemGui; -PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintForce, FemGui::ViewProviderFemConstraint) +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintForce, FemGui::ViewProviderFemConstraintOnBoundary) ViewProviderFemConstraintForce::ViewProviderFemConstraintForce() diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h index 1eeff7d2dc..50ece3c06a 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h @@ -25,12 +25,12 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTFORCE_H #define GUI_VIEWPROVIDERFEMCONSTRAINTFORCE_H -#include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" namespace FemGui { -class FemGuiExport ViewProviderFemConstraintForce : public FemGui::ViewProviderFemConstraint +class FemGuiExport ViewProviderFemConstraintForce : public FemGui::ViewProviderFemConstraintOnBoundary { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintForce); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp index 104053078f..b053b4cfd6 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp @@ -50,7 +50,7 @@ using namespace FemGui; -PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintHeatflux, FemGui::ViewProviderFemConstraint) +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintHeatflux, FemGui::ViewProviderFemConstraintOnBoundary) ViewProviderFemConstraintHeatflux::ViewProviderFemConstraintHeatflux() { diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h index 819fef2e83..3e01aee490 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h @@ -26,11 +26,11 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTHEATFLUX_H #define GUI_VIEWPROVIDERFEMCONSTRAINTHEATFLUX_H -#include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" namespace FemGui { -class FemGuiExport ViewProviderFemConstraintHeatflux : public FemGui::ViewProviderFemConstraint +class FemGuiExport ViewProviderFemConstraintHeatflux : public FemGui::ViewProviderFemConstraintOnBoundary { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintHeatflux); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.cpp new file mode 100644 index 0000000000..5c5267e328 --- /dev/null +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.cpp @@ -0,0 +1,128 @@ +/*************************************************************************** + * Copyright (c) 2022 FreeCAD Developers * + * Author: Ajinkya Dahale * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + + +#include "PreCompiled.h" + +#ifndef _PreComp_ +# include +# include +#endif + +#include "Mod/Fem/App/FemConstraint.h" +#include "TaskFemConstraintOnBoundary.h" +#include "ViewProviderFemConstraintOnBoundary.h" +#include +#include +#include +#include +#include + +using namespace FemGui; + +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintOnBoundary, FemGui::ViewProviderFemConstraint) + +ViewProviderFemConstraintOnBoundary::ViewProviderFemConstraintOnBoundary() +{ +} + +ViewProviderFemConstraintOnBoundary::~ViewProviderFemConstraintOnBoundary() +{ +} + +void ViewProviderFemConstraintOnBoundary::highlightReferences(const bool on) +{ + Fem::Constraint* pcConstraint = static_cast(this->getObject()); + const auto& subSets = pcConstraint->References.getSubListValues(); + + for (auto& subSet : subSets) { + // if somehow the subnames are empty, we have nothing to do + if (subSet.second.empty()) + continue; + + Part::Feature* base = static_cast(subSet.first); + PartGui::ViewProviderPart* vp = dynamic_cast( + Gui::Application::Instance->getViewProvider(base)); + if (vp == nullptr) continue; + + if (on) { + // identify the type of subelements + // TODO: Assumed here the subelements are of the same type. + // It is a requirement but we should keep safeguards. + if (subSet.second[0].find("Vertex") != std::string::npos) { + // make sure original colors are remembered + if (originalPointColors[base].empty()) + originalPointColors[base] = vp->PointColorArray.getValues(); + std::vector colors = originalPointColors[base]; + + // go through the subelements with constraint and recolor them + // TODO: Replace `ShapeColor` with anything more appropriate + PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), colors.empty()?ShapeColor.getValue():colors[0]); + highlighter.getVertexColors(subSet.second, colors); + vp->PointColorArray.setValues(colors); + } + else if (subSet.second[0].find("Edge") != std::string::npos) { + // make sure original colors are remembered + if (originalLineColors[base].empty()) + originalLineColors[base] = vp->LineColorArray.getValues(); + std::vector colors = originalLineColors[base]; + + // go through the subelements with constraint and recolor them + // TODO: Replace `ShapeColor` with anything more appropriate + PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), colors.empty()?ShapeColor.getValue():colors[0]); + highlighter.getEdgeColors(subSet.second, colors); + vp->LineColorArray.setValues(colors); + } + else if (subSet.second[0].find("Face") != std::string::npos) { + // make sure original colors are remembered + if (originalFaceColors[base].empty()) + originalFaceColors[base] = vp->DiffuseColor.getValues(); + std::vector colors = originalFaceColors[base]; + + // go through the subelements with constraint and recolor them + // TODO: Replace `FaceColor` with anything more appropriate + PartGui::ReferenceHighlighter highlighter(base->Shape.getValue(), colors.empty()?FaceColor.getValue():colors[0]); + highlighter.getFaceColors(subSet.second, colors); + vp->DiffuseColor.setValues(colors); + } + } + else { + if (subSet.second[0].find("Vertex") != std::string::npos && + !originalPointColors[base].empty()) { + vp->PointColorArray.setValues(originalPointColors[base]); + originalPointColors[base].clear(); + } + else if (subSet.second[0].find("Edge") != std::string::npos && + !originalLineColors[base].empty()) { + vp->LineColorArray.setValues(originalLineColors[base]); + originalLineColors[base].clear(); + } + else if (subSet.second[0].find("Face") != std::string::npos && + !originalFaceColors[base].empty()) { + vp->DiffuseColor.setValues(originalFaceColors[base]); + originalFaceColors[base].clear(); + } + } + } +} + diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h new file mode 100644 index 0000000000..31bf1d4e09 --- /dev/null +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h @@ -0,0 +1,51 @@ +/*************************************************************************** + * Copyright (c) 2022 FreeCAD Developers * + * Author: Ajinkya Dahale * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + +#ifndef GUI_VIEWPROVIDERFEMCONSTRAINTONBOUNDARY_H +#define GUI_VIEWPROVIDERFEMCONSTRAINTONBOUNDARY_H + +#include + +#include "ViewProviderFemConstraint.h" + +namespace FemGui { + +class FemGuiExport ViewProviderFemConstraintOnBoundary : public FemGui::ViewProviderFemConstraint +{ + PROPERTY_HEADER(FemGui::ViewProviderFemConstraintOnBoundary); + +public: + ViewProviderFemConstraintOnBoundary(); + virtual ~ViewProviderFemConstraintOnBoundary(); + + void highlightReferences(const bool on) override; + +private: + std::map< Part::Feature*, std::vector > originalPointColors; + std::map< Part::Feature*, std::vector > originalLineColors; + std::map< Part::Feature*, std::vector > originalFaceColors; +}; + +} + +#endif // GUI_VIEWPROVIDERFEMCONSTRAINTONBOUNDARY_H diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp index 8d1deefdf3..0df5133189 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp @@ -42,7 +42,7 @@ using namespace FemGui; -PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintPressure, FemGui::ViewProviderFemConstraint) +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintPressure, FemGui::ViewProviderFemConstraintOnBoundary) ViewProviderFemConstraintPressure::ViewProviderFemConstraintPressure() { diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h index 616aa00e41..642f361f89 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h @@ -24,11 +24,11 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTPRESSURE_H #define GUI_VIEWPROVIDERFEMCONSTRAINTPRESSURE_H -#include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" namespace FemGui { -class FemGuiExport ViewProviderFemConstraintPressure : public FemGui::ViewProviderFemConstraint +class FemGuiExport ViewProviderFemConstraintPressure : public FemGui::ViewProviderFemConstraintOnBoundary { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintPressure); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.cpp index f6c5ab5f29..82877b43e6 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.cpp @@ -42,7 +42,7 @@ using namespace FemGui; -PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintSpring, FemGui::ViewProviderFemConstraint) +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintSpring, FemGui::ViewProviderFemConstraintOnBoundary) ViewProviderFemConstraintSpring::ViewProviderFemConstraintSpring() { diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h index c9e9aa32d8..6a79ed41f3 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h @@ -24,11 +24,11 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTSPRING_H #define GUI_VIEWPROVIDERFEMCONSTRAINTSPRING_H -#include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" namespace FemGui { -class FemGuiExport ViewProviderFemConstraintSpring : public FemGui::ViewProviderFemConstraint +class FemGuiExport ViewProviderFemConstraintSpring : public FemGui::ViewProviderFemConstraintOnBoundary { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintSpring); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp index d03b70f9a7..23c970f036 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp @@ -51,7 +51,7 @@ using namespace FemGui; -PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintTemperature, FemGui::ViewProviderFemConstraint) +PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintTemperature, FemGui::ViewProviderFemConstraintOnBoundary) ViewProviderFemConstraintTemperature::ViewProviderFemConstraintTemperature() { diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h index 4fefa97c4f..b6c2640054 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h @@ -26,11 +26,11 @@ #ifndef GUI_VIEWPROVIDERFEMCONSTRAINTTemperature_H #define GUI_VIEWPROVIDERFEMCONSTRAINTTemperature_H -#include "ViewProviderFemConstraint.h" +#include "ViewProviderFemConstraintOnBoundary.h" namespace FemGui { -class FemGuiExport ViewProviderFemConstraintTemperature : public FemGui::ViewProviderFemConstraint +class FemGuiExport ViewProviderFemConstraintTemperature : public FemGui::ViewProviderFemConstraintOnBoundary { PROPERTY_HEADER(FemGui::ViewProviderFemConstraintTemperature);