kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[FEM] Refactor TaskFemConstraintOnBoundary (#6615)

Browse Source 
* Now the behavior is consistent with behavior of PD fillets, for example.
See https://forum.freecadweb.org/viewtopic.php?f=18&t=67135#p580192. In the
future it may be possible to reuse some code from there.

* When the last selected item is removed we need to reset the existing
highlighting separately.

* Use `Gui::ButtonGroup` in `TaskFemConstraintOnBoundary`
This commit is contained in:
Ajinkya Dahale
2022-03-20 20:02:10 -04:00
committed by GitHub
parent d6a9a941ac
commit 300fbc22ea
11 changed files with 76 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.cpp
View File

@@ -56,16 +56,14 @@ void ViewProviderFemConstraintOnBoundary::highlightReferences(const bool on)
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<Part::Feature*>(subSet.first);
Part::Feature* base = dynamic_cast<Part::Feature*>(subSet.first);
if (!base) continue;
PartGui::ViewProviderPart* vp = dynamic_cast<PartGui::ViewProviderPart*>(
Gui::Application::Instance->getViewProvider(base));
if (vp == nullptr) continue;
if (!vp) continue;
if (on) {
// if somehow the subnames are empty, clear any existing colors
if (on && !subSet.second.empty()) {
// identify the type of subelements
// TODO: Assumed here the subelements are of the same type.
// It is a requirement but we should keep safeguards.
@@ -107,22 +105,53 @@ void ViewProviderFemConstraintOnBoundary::highlightReferences(const bool on)
}
}
else {
if (subSet.second[0].find("Vertex") != std::string::npos &&
!originalPointColors[base].empty()) {
if (!originalPointColors[base].empty()) {
vp->PointColorArray.setValues(originalPointColors[base]);
originalPointColors[base].clear();
}
else if (subSet.second[0].find("Edge") != std::string::npos &&
!originalLineColors[base].empty()) {
else if (!originalLineColors[base].empty()) {
vp->LineColorArray.setValues(originalLineColors[base]);
originalLineColors[base].clear();
}
else if (subSet.second[0].find("Face") != std::string::npos &&
!originalFaceColors[base].empty()) {
else if (!originalFaceColors[base].empty()) {
vp->DiffuseColor.setValues(originalFaceColors[base]);
originalFaceColors[base].clear();
}
}
}
if (subSets.empty()) {
// there is nothing selected but previous selection may have highlighting
// reset that highlighting here
for (auto& ogPair : originalPointColors) {
if (ogPair.second.empty()) continue;
PartGui::ViewProviderPart* vp = dynamic_cast<PartGui::ViewProviderPart*>(
Gui::Application::Instance->getViewProvider(ogPair.first));
if (!vp) continue;
vp->PointColorArray.setValues(ogPair.second);
ogPair.second.clear();
}
for (auto& ogPair : originalLineColors) {
if (ogPair.second.empty()) continue;
PartGui::ViewProviderPart* vp = dynamic_cast<PartGui::ViewProviderPart*>(
Gui::Application::Instance->getViewProvider(ogPair.first));
if (!vp) continue;
vp->LineColorArray.setValues(ogPair.second);
ogPair.second.clear();
}
for (auto& ogPair : originalFaceColors) {
if (ogPair.second.empty()) continue;
PartGui::ViewProviderPart* vp = dynamic_cast<PartGui::ViewProviderPart*>(
Gui::Application::Instance->getViewProvider(ogPair.first));
if (!vp) continue;
vp->DiffuseColor.setValues(ogPair.second);
ogPair.second.clear();
}
}
}