extract getSelectedObjects()

ufz · Oct 9, 2023 · 7036941 · 7036941
1 parent 2fb9389
commit 7036941
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 50 deletions.
diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Source files
 set(SOURCES
+    Utils.cpp
     OGSError.cpp
     QNonScalableGraphicsTextItem.cpp
     RecentFiles.cpp
@@ -14,6 +15,7 @@ set(SOURCES
 # Header files
 set(HEADERS
     LastSavedFileDirectory.h
+    Utils.h
     OGSError.h
     QNonScalableGraphicsTextItem.h
     TreeItem.h

diff --git a/Applications/DataExplorer/Base/Utils.cpp b/Applications/DataExplorer/Base/Utils.cpp
@@ -0,0 +1,22 @@
+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2023, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#include "Base/Utils.h"
+
+namespace Utils
+{
+std::vector<std::string> getSelectedObjects(QStringList const& list)
+{
+    std::vector<std::string> indexList;
+    std::transform(list.begin(), list.end(), std::back_inserter(indexList),
+                   [](auto const& index) { return index.toStdString(); });
+    return indexList;
+}
+}  // namespace Utils
diff --git a/Applications/DataExplorer/Base/Utils.h b/Applications/DataExplorer/Base/Utils.h
@@ -0,0 +1,18 @@
+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2023, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#include <QStringList>
+#include <string>
+#include <vector>
+
+namespace Utils
+{
+std::vector<std::string> getSelectedObjects(QStringList const& list);
+}
diff --git a/Applications/DataExplorer/DataView/AddFaultsToVoxelGridDialog.cpp b/Applications/DataExplorer/DataView/AddFaultsToVoxelGridDialog.cpp
@@ -19,21 +19,11 @@
 #include <string>
 
 #include "Base/OGSError.h"
+#include "Base/Utils.h"
 #include "MeshLib/Mesh.h"
 #include "MeshModel.h"
 #include "MeshToolsLib/MeshGenerators/AddFaultToVoxelGrid.h"
 
-namespace
-{
-std::vector<std::string> getSelectedObjects(QStringList const& list)
-{
-    std::vector<std::string> indexList;
-    std::transform(list.begin(), list.end(), std::back_inserter(indexList),
-                   [](auto const& index) { return index.toStdString(); });
-    return indexList;
-}
-}  // namespace
-
 QString no_voxel_str = "[No voxel grid available.]";
 
 AddFaultsToVoxelGridDialog::AddFaultsToVoxelGridDialog(MeshModel& mesh_model,
@@ -131,7 +121,7 @@ void AddFaultsToVoxelGridDialog::accept()
     }
 
     std::vector<std::string> const selected_faults =
-        getSelectedObjects(_selFaults.stringList());
+        Utils::getSelectedObjects(_selFaults.stringList());
 
     if (this->_selFaults.rowCount() == 0)
     {

diff --git a/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp b/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
@@ -22,6 +22,7 @@
 #include "Base/OGSError.h"
 #include "Base/StrictDoubleValidator.h"
 #include "Base/StrictIntValidator.h"
+#include "Base/Utils.h"
 #include "GMSHPrefsDialog.h"
 #include "GeoLib/GEOObjects.h"
 
@@ -147,7 +148,7 @@ void GMSHPrefsDialog::accept()
     }
 
     std::vector<std::string> selectedObjects =
-        this->getSelectedObjects(_selGeo->stringList());
+        Utils::getSelectedObjects(_selGeo->stringList());
     unsigned max_number_of_points_in_quadtree_leaf(10);
     double mesh_density_scaling_pnts(0.5);
     double mesh_density_scaling_stations(0.05);
@@ -191,12 +192,4 @@ void GMSHPrefsDialog::accept()
 void GMSHPrefsDialog::reject()
 {
     this->done(QDialog::Rejected);
-}
-
-std::vector<std::string> GMSHPrefsDialog::getSelectedObjects(QStringList list)
-{
-    std::vector<std::string> indexList;
-    std::transform(list.begin(), list.end(), std::back_inserter(indexList),
-                   [](auto const& index) { return index.toStdString(); });
-    return indexList;
-}
+}
diff --git a/Applications/DataExplorer/DataView/Layers2GridDialog.cpp b/Applications/DataExplorer/DataView/Layers2GridDialog.cpp
@@ -16,24 +16,14 @@
 #include <QStringListModel>
 
 #include "Base/StrictDoubleValidator.h"
+#include "Base/Utils.h"
 #include "GeoLib/AABB.h"
 #include "MeshLib/IO/writeMeshToFile.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/Node.h"
 #include "MeshModel.h"
 #include "MeshToolsLib/MeshGenerators/VoxelGridFromLayeredMeshes.h"
 
-namespace
-{
-std::vector<std::string> getSelectedObjects(QStringList const& list)
-{
-    std::vector<std::string> indexList;
-    std::transform(list.begin(), list.end(), std::back_inserter(indexList),
-                   [](auto const& index) { return index.toStdString(); });
-    return indexList;
-}
-}  // namespace
-
 Layers2GridDialog::Layers2GridDialog(MeshModel& mesh_model, QDialog* parent)
     : QDialog(parent), _mesh_model(mesh_model)
 {
@@ -127,7 +117,7 @@ void Layers2GridDialog::updateExpectedVoxel()
     }
 
     std::vector<std::string> layered_meshes =
-        getSelectedObjects(_layeredMeshes.stringList());
+        Utils::getSelectedObjects(_layeredMeshes.stringList());
     auto* const mesh_top = _mesh_model.getMesh(layered_meshes.front());
     auto* const mesh_bottom = _mesh_model.getMesh(layered_meshes.back());
     auto const& nodes_top = mesh_top->getNodes();
@@ -194,7 +184,7 @@ void Layers2GridDialog::accept()
     double const zinput = (zin.toDouble(&ok)) ? zin.toDouble() : xin.toDouble();
 
     std::vector<std::string> layered_meshes =
-        getSelectedObjects(_layeredMeshes.stringList());
+        Utils::getSelectedObjects(_layeredMeshes.stringList());
 
     std::vector<const MeshLib::Mesh*> layers;
     layers.reserve(layered_meshes.size());

diff --git a/Applications/DataExplorer/DataView/TranslateDataDialog.cpp b/Applications/DataExplorer/DataView/TranslateDataDialog.cpp
@@ -17,25 +17,14 @@
 #include <QStringList>
 
 #include "Base/StrictDoubleValidator.h"
+#include "Base/Utils.h"
 #include "GEOModels.h"
 #include "GeoLib/AABB.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/Node.h"
 #include "MeshModel.h"
 #include "MeshToolsLib/MeshEditing/moveMeshNodes.h"
 
-namespace
-{
-std::vector<std::string> getSelectedObjects(
-    QStringList const& list)
-{
-    std::vector<std::string> indexList;
-    std::transform(list.begin(), list.end(), std::back_inserter(indexList),
-                   [](auto const& index) { return index.toStdString(); });
-    return indexList;
-}
-}  // namespace
-
 TranslateDataDialog::TranslateDataDialog(MeshModel* mesh_model,
                                          GEOModels* geo_models,
                                          QDialog* parent)
@@ -163,7 +152,7 @@ void TranslateDataDialog::accept()
          displacement[2]);
 
     std::vector<std::string> const selectedData =
-        getSelectedObjects(_selData.stringList());
+        Utils::getSelectedObjects(_selData.stringList());
 
     auto const geoNames = _geo_models->getGeometryNames();
 

diff --git a/MeshToolsLib/MeshGenerators/AddFaultToVoxelGrid.cpp b/MeshToolsLib/MeshGenerators/AddFaultToVoxelGrid.cpp
@@ -183,8 +183,8 @@ bool isVoxelGrid(MeshLib::Mesh const& mesh)
         return false;
     }
     return true;
-}  // namespace
-}  // namespace
+}
+}  // namespace MeshToolsLib::MeshGenerator::AddFaultToVoxelGrid
 namespace MeshToolsLib::MeshGenerator::AddFaultToVoxelGrid
 {
 bool addFaultToVoxelGrid(MeshLib::Mesh* mesh,