diff --git a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp index dd8cc1c32569b19d6119cd8f7b4e758c9343e2d3..688b50882266f3dd1b2a5f198130230d06db762e 100644 --- a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp +++ b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp @@ -74,7 +74,7 @@ void MeshElementRemovalDialog::accept() { QList<QListWidgetItem*> items = this->materialListWidget->selectedItems(); for (int i=0; i<items.size(); ++i) - ex.searchByMaterialID(items[i]->text().toInt()); + ex.searchByPropertyValue(items[i]->text().toInt()); anything_checked = true; } if (this->boundingBoxCheckBox->isChecked()) diff --git a/MeshLib/MeshSearch/ElementSearch.cpp b/MeshLib/MeshSearch/ElementSearch.cpp index 7fe5bb274909c073497474141df7a2beb7683391..f8d30092812a372b52566b60e9f9940cfb61bf06 100644 --- a/MeshLib/MeshSearch/ElementSearch.cpp +++ b/MeshLib/MeshSearch/ElementSearch.cpp @@ -21,26 +21,6 @@ ElementSearch::ElementSearch(const MeshLib::Mesh &mesh) { } -std::size_t ElementSearch::searchByMaterialID(int const matID) -{ - boost::optional<MeshLib::PropertyVector<int> const&> opt_pv( - this->_mesh.getProperties().getPropertyVector<int>("MaterialIDs") - ); - if (!opt_pv) - return 0; - - MeshLib::PropertyVector<int> const& pv(opt_pv.get()); - - std::vector<std::size_t> matchedIDs; - for (std::size_t i(0); i<pv.getNumberOfTuples(); ++i) { - if (pv[i]==matID) - matchedIDs.push_back(i); - } - - this->updateUnion(matchedIDs); - return matchedIDs.size(); -} - template <typename Container, typename Predicate> std::vector<std::size_t> filter(Container const& container, Predicate const& p) { diff --git a/MeshLib/MeshSearch/ElementSearch.h b/MeshLib/MeshSearch/ElementSearch.h index b2c6672388d21ac77655739935a1a956c5ed4cc0..98e38e60cfd458949aa49072a8473faaddc10b13 100644 --- a/MeshLib/MeshSearch/ElementSearch.h +++ b/MeshLib/MeshSearch/ElementSearch.h @@ -73,9 +73,6 @@ public: return matchedIDs.size(); } - /// Marks all elements with the given Material ID. - std::size_t searchByMaterialID(int const matID); - /// Marks all elements of the given element type. std::size_t searchByElementType(MeshElemType eleType);