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

FEM: apply std::ranges

Browse Source
This commit is contained in:
bofdahof
2025-03-12 17:48:04 +10:00
committed by Chris Hennes
parent fbd195ccf2
commit 1c4ecf576b
17 changed files with 44 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Fem/App/FemConstraint.cpp
View File

@@ -197,14 +197,13 @@ void Constraint::onChanged(const App::Property* prop)
App::DocumentObject::onChanged(prop);
}
void Constraint::slotChangedObject(const App::DocumentObject& obj, const App::Property& prop)
void Constraint::slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop)
{
if (obj.isDerivedFrom<App::GeoFeature>()
&& (prop.isDerivedFrom<App::PropertyPlacement>() || obj.isRemoving())) {
auto values = References.getValues();
for (const auto ref : values) {
if (Obj.isDerivedFrom<App::GeoFeature>()
&& (Prop.isDerivedFrom<App::PropertyPlacement>() || Obj.isRemoving())) {
for (const auto ref : References.getValues()) {
auto v = ref->getInListEx(true);
if ((&obj == ref) || (std::find(v.begin(), v.end(), &obj) != v.end())) {
if ((&Obj == ref) || (std::ranges::find(v, &Obj) != v.end())) {
this->touch();
return;
}

2
src/Mod/Fem/App/FemMesh.cpp
View File

@@ -521,7 +521,7 @@ std::map<int, int> FemMesh::getccxVolumesByFace(const TopoDS_Face& face) const
int missing_node = 0;
for (int i = 0; i < 4; i++) {
// search for the ID of the volume which is not part of 'element_face_nodes'
if (std::find(element_face_nodes.begin(), element_face_nodes.end(), apair.second[i])
if (std::ranges::find(element_face_nodes, apair.second[i])
== element_face_nodes.end()) {
missing_node = i + 1;
break;

10
src/Mod/Fem/App/FemPostFilter.cpp
View File

@@ -826,8 +826,7 @@ void FemPostContoursFilter::refreshFields()
Field.setValue(m_fields);
// search if the current field is in the available ones and set it
std::vector<std::string>::iterator it =
std::find(FieldsArray.begin(), FieldsArray.end(), fieldName);
const auto it = std::ranges::find(FieldsArray, fieldName);
if (!fieldName.empty() && it != FieldsArray.end()) {
Field.setValue(fieldName.c_str());
}
@@ -884,7 +883,7 @@ void FemPostContoursFilter::refreshVectors()
VectorMode.setValue(m_vectors);
// apply stored name
auto it = std::find(vectorArray.begin(), vectorArray.end(), vectorName);
const auto it = std::ranges::find(vectorArray, vectorName);
if (!vectorName.empty() && it != vectorArray.end()) {
VectorMode.setValue(vectorName.c_str());
}
@@ -1004,8 +1003,7 @@ DocumentObjectExecReturn* FemPostScalarClipFilter::execute()
Scalars.setValue(m_scalarFields);
// search if the current field is in the available ones and set it
std::vector<std::string>::iterator it =
std::find(ScalarsArray.begin(), ScalarsArray.end(), val);
const auto it = std::ranges::find(ScalarsArray, val);
if (!val.empty() && it != ScalarsArray.end()) {
Scalars.setValue(val.c_str());
}
@@ -1123,7 +1121,7 @@ DocumentObjectExecReturn* FemPostWarpVectorFilter::execute()
Vector.setValue(m_vectorFields);
// search if the current field is in the available ones and set it
std::vector<std::string>::iterator it = std::find(VectorArray.begin(), VectorArray.end(), val);
const auto it = std::ranges::find(VectorArray, val);
if (!val.empty() && it != VectorArray.end()) {
Vector.setValue(val.c_str());
}

4
src/Mod/Fem/App/FemVTKTools.cpp
View File

@@ -1533,7 +1533,7 @@ void readResults(std::ifstream& ifstr,
for (auto it = sub.begin(); it != sub.end(); it += 12, ++countScaPos) {
valueFromLine(it, 12, value);
// search if value is scalar or vector/matrix component
auto pos = std::find(scalarPos.begin(), scalarPos.end(), countScaPos);
auto pos = std::ranges::find(scalarPos, countScaPos);
if (pos == scalarPos.end()) {
vecValues.emplace_back(value);
}
@@ -1552,7 +1552,7 @@ void readResults(std::ifstream& ifstr,
for (auto it = sub.begin(); it != sub.end(); it += 12) {
valueFromLine(it, 12, value);
// search if value is scalar or vector/matrix component
auto pos = std::find(scalarPos.begin(), scalarPos.end(), countScaPos);
auto pos = std::ranges::find(scalarPos, countScaPos);
if (pos == scalarPos.end()) {
vecValues.emplace_back(value);
}

15
src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
View File

@@ -230,9 +230,7 @@ void TaskFemConstraintContact::addToSelectionSlave()
QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked"));
return;
}
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -279,9 +277,7 @@ void TaskFemConstraintContact::removeFromSelectionSlave()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -359,8 +355,7 @@ void TaskFemConstraintContact::addToSelectionMaster()
QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked"));
return;
}
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
for (auto itr = std::ranges::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
@@ -408,9 +403,7 @@ void TaskFemConstraintContact::removeFromSelectionMaster()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that

7
src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
View File

@@ -254,8 +254,7 @@ void TaskFemConstraintDisplacement::addToSelection()
App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
bool addMe = true;
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
for (auto itr = std::ranges::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
@@ -325,9 +324,7 @@ void TaskFemConstraintDisplacement::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that

8
src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
View File

@@ -124,9 +124,7 @@ void TaskFemConstraintFixed::addToSelection()
ConstraintView->getObject()->getDocument()->getObject(it.getFeatName());
for (const auto& subName : subNames) { // for every selected sub element
bool addMe = true;
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -194,9 +192,7 @@ void TaskFemConstraintFixed::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that

8
src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
View File

@@ -833,9 +833,7 @@ void TaskFemConstraintFluidBoundary::addToSelection()
App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
bool addMe = true;
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -905,9 +903,7 @@ void TaskFemConstraintFluidBoundary::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that

8
src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
View File

@@ -139,9 +139,7 @@ void TaskFemConstraintForce::addToSelection()
App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
bool addMe = true;
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -210,9 +208,7 @@ void TaskFemConstraintForce::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that

7
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
View File

@@ -294,8 +294,7 @@ void TaskFemConstraintHeatflux::addToSelection()
}
for (const auto& subName : subNames) { // for every selected sub element
bool addMe = true;
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
for (auto itr = std::ranges::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
@@ -358,9 +357,7 @@ void TaskFemConstraintHeatflux::removeFromSelection()
// SubElements
}
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that

9
src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
View File

@@ -171,8 +171,7 @@ void TaskFemConstraintPlaneRotation::addToSelection()
return;
}
}
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
for (auto itr = std::ranges::find(SubElements, subName);
itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
@@ -231,9 +230,7 @@ void TaskFemConstraintPlaneRotation::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -248,7 +245,7 @@ void TaskFemConstraintPlaneRotation::removeFromSelection()
}
}
}
std::sort(itemsToDel.begin(), itemsToDel.end());
std::ranges::sort(itemsToDel);
while (!itemsToDel.empty()) {
Objects.erase(Objects.begin() + itemsToDel.back());
SubElements.erase(SubElements.begin() + itemsToDel.back());

10
src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
View File

@@ -149,9 +149,7 @@ void TaskFemConstraintPressure::addToSelection()
QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked"));
return;
}
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -198,9 +196,7 @@ void TaskFemConstraintPressure::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -215,7 +211,7 @@ void TaskFemConstraintPressure::removeFromSelection()
}
}
}
std::sort(itemsToDel.begin(), itemsToDel.end());
std::ranges::sort(itemsToDel);
while (!itemsToDel.empty()) {
Objects.erase(Objects.begin() + itemsToDel.back());
SubElements.erase(SubElements.begin() + itemsToDel.back());

6
src/Mod/Fem/Gui/TaskFemConstraintRigidBody.cpp
View File

@@ -289,8 +289,7 @@ void TaskFemConstraintRigidBody::addToSelection()
for (size_t subIt = 0; subIt < (subNames.size());
++subIt) { // for every selected sub element
bool addMe = true;
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subNames[subIt]);
for (auto itr = std::ranges::find(SubElements, subNames[subIt]);
itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
@@ -361,8 +360,7 @@ void TaskFemConstraintRigidBody::removeFromSelection()
for (size_t subIt = 0; subIt < (subNames.size());
++subIt) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subNames[subIt]);
for (auto itr = std::ranges::find(SubElements, subNames[subIt]);
itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),

8
src/Mod/Fem/Gui/TaskFemConstraintSpring.cpp
View File

@@ -147,9 +147,7 @@ void TaskFemConstraintSpring::addToSelection()
QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked"));
return;
}
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -196,9 +194,7 @@ void TaskFemConstraintSpring::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that

10
src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
View File

@@ -204,9 +204,7 @@ void TaskFemConstraintTemperature::addToSelection()
ConstraintView->getObject()->getDocument()->getObject(it.getFeatName());
for (const auto& subName : subNames) { // for every selected sub element
bool addMe = true;
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -254,9 +252,7 @@ void TaskFemConstraintTemperature::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -271,7 +267,7 @@ void TaskFemConstraintTemperature::removeFromSelection()
}
}
}
std::sort(itemsToDel.begin(), itemsToDel.end());
std::ranges::sort(itemsToDel);
while (!itemsToDel.empty()) {
Objects.erase(Objects.begin() + itemsToDel.back());
SubElements.erase(SubElements.begin() + itemsToDel.back());

10
src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
View File

@@ -349,9 +349,7 @@ void TaskFemConstraintTransform::addToSelection()
}
}
}
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -433,9 +431,7 @@ void TaskFemConstraintTransform::removeFromSelection()
const App::DocumentObject* obj = it.getObject();
for (const auto& subName : subNames) { // for every selected sub element
for (std::vector<std::string>::iterator itr =
std::find(SubElements.begin(), SubElements.end(), subName);
itr != SubElements.end();
for (auto itr = std::ranges::find(SubElements, subName); itr != SubElements.end();
itr = std::find(++itr,
SubElements.end(),
subName)) { // for every sub element in selection that
@@ -450,7 +446,7 @@ void TaskFemConstraintTransform::removeFromSelection()
}
}
}
std::sort(itemsToDel.begin(), itemsToDel.end());
std::ranges::sort(itemsToDel);
while (!itemsToDel.empty()) {
Objects.erase(Objects.begin() + itemsToDel.back());
SubElements.erase(SubElements.begin() + itemsToDel.back());

4
src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
View File

@@ -430,7 +430,7 @@ void ViewProviderFemPostObject::updateProperties()
m_coloringEnum.setEnums(colorArrays);
Field.setValue(m_coloringEnum);
std::vector<std::string>::iterator it = std::find(colorArrays.begin(), colorArrays.end(), val);
auto it = std::ranges::find(colorArrays, val);
if (!val.empty() && it != colorArrays.end()) {
Field.setValue(val.c_str());
}
@@ -472,7 +472,7 @@ void ViewProviderFemPostObject::updateProperties()
m_vectorEnum.setEnums(colorArrays);
VectorMode.setValue(m_vectorEnum);
it = std::find(colorArrays.begin(), colorArrays.end(), val);
it = std::ranges::find(colorArrays, val);
if (!val.empty() && it != colorArrays.end()) {
VectorMode.setValue(val.c_str());
}