Skip to content

Commit

Permalink
Merge branch 'DataEx_1' into 'master'
Browse files Browse the repository at this point in the history
[DataExplorer] small fix in TranslateDataDialog

See merge request ogs/ogs!4673
  • Loading branch information
endJunction committed Jul 17, 2023
2 parents 26e7598 + 57216b1 commit 065b669
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
23 changes: 13 additions & 10 deletions Applications/DataExplorer/DataView/TranslateDataDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
#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)
Expand Down Expand Up @@ -151,7 +163,7 @@ void TranslateDataDialog::accept()
displacement[2]);

std::vector<std::string> const selectedData =
this->getSelectedObjects(_selData.stringList());
getSelectedObjects(_selData.stringList());

auto const geoNames = _geo_models->getGeometryNames();

Expand All @@ -167,13 +179,4 @@ void TranslateDataDialog::accept()
}

this->done(QDialog::Accepted);
}

std::vector<std::string> TranslateDataDialog::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;
}
1 change: 0 additions & 1 deletion Applications/DataExplorer/DataView/TranslateDataDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ class TranslateDataDialog : public QDialog, private Ui_TranslateData
QDialog* parent = nullptr);

private:
std::vector<std::string> getSelectedObjects(QStringList list);
void moveGeometry(Eigen::Vector3d const& displacement,
std::string const& name);
void moveMesh(Eigen::Vector3d const& displacement, std::string const& name);
Expand Down

0 comments on commit 065b669

Please sign in to comment.