diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index a6f3693eebf2c5a6063319f285208cd00dd6c0b9..de1917a035adebcb96819811c3c5769b99ef94b5 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -1018,7 +1018,9 @@ void ProjectData::parseChemicalSystem(
std::string const& output_directory)
{
if (!config)
+ {
return;
+ }
#ifdef OGS_BUILD_PROCESS_COMPONENTTRANSPORT
INFO(
diff --git a/Applications/DataExplorer/Base/CheckboxDelegate.cpp b/Applications/DataExplorer/Base/CheckboxDelegate.cpp
index df72f99f460bfd784b970864aa04fc7f702388eb..7690b890ccd3302917e60ec3453304acf1321083 100644
--- a/Applications/DataExplorer/Base/CheckboxDelegate.cpp
+++ b/Applications/DataExplorer/Base/CheckboxDelegate.cpp
@@ -36,9 +36,13 @@ void CheckboxDelegate::paint(QPainter* painter, const QStyleOptionViewItem& opti
QStyleOptionButton styleOptionButton;
styleOptionButton.state |= QStyle::State_Enabled;
if (checked)
+ {
styleOptionButton.state |= QStyle::State_On;
+ }
else
+ {
styleOptionButton.state |= QStyle::State_Off;
+ }
styleOptionButton.rect = this->checkboxRect(option);
@@ -46,7 +50,9 @@ void CheckboxDelegate::paint(QPainter* painter, const QStyleOptionViewItem& opti
&styleOptionButton, painter);
}
else
+ {
QItemDelegate::paint(painter, option, index);
+ }
}
bool CheckboxDelegate::editorEvent(QEvent* event, QAbstractItemModel* model,
@@ -60,18 +66,26 @@ bool CheckboxDelegate::editorEvent(QEvent* event, QAbstractItemModel* model,
auto* mouse_event = static_cast<QMouseEvent*>(event);
if (mouse_event->button() != Qt::LeftButton ||
!checkboxRect(option).contains(mouse_event->pos()))
+ {
return false;
+ }
if (event->type() == QEvent::MouseButtonDblClick)
+ {
return true;
+ }
}
else if (event->type() == QEvent::KeyPress)
{
if (static_cast<QKeyEvent*>(event)->key() != Qt::Key_Space &&
static_cast<QKeyEvent*>(event)->key() != Qt::Key_Select)
+ {
return false;
+ }
}
else
+ {
return false;
+ }
bool checked = index.model()->data(index, Qt::DisplayRole).toBool();
return model->setData(index, !checked, Qt::EditRole);
diff --git a/Applications/DataExplorer/Base/ColorPickerPushButton.cpp b/Applications/DataExplorer/Base/ColorPickerPushButton.cpp
index 20f0ed02f0e943f6fe6aab24198de4e3d0f3bad9..2057ecc2c708024940dec8b17f7c05d68b1122b8 100644
--- a/Applications/DataExplorer/Base/ColorPickerPushButton.cpp
+++ b/Applications/DataExplorer/Base/ColorPickerPushButton.cpp
@@ -29,7 +29,9 @@ void ColorPickerPushButton::mouseReleaseEvent(QMouseEvent* e)
Q_UNUSED(e);
QColor newColor = QColorDialog::getColor(_color, nullptr, "Choose a color");
if (!newColor.isValid())
+ {
return;
+ }
setColor(newColor);
@@ -65,9 +67,13 @@ void ColorPickerPushButton::setColor( QColor color )
QColor hsv = _color.toHsv();
QString textColorStr;
if (hsv.valueF() < 0.5f)
+ {
textColorStr = "color: rgb(255, 255, 255);";
+ }
else
+ {
textColorStr = "color: rgb(0, 0, 0);";
+ }
QString stylesheetStr = "background-color: ";
stylesheetStr.append(colorToCss(_color));
diff --git a/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp b/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp
index 70364eb6f4ff0789be022a35da6ea7555f1a249a..72675c1c7a1d1389b45d0d76bdff39ec1435a077 100644
--- a/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp
+++ b/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp
@@ -30,7 +30,9 @@ QNonScalableGraphicsTextItem::QNonScalableGraphicsTextItem(const QString & text,
QGraphicsTextItem(parent)
{
if (!text.isEmpty())
+ {
setPlainText(text);
+ }
setAcceptDrops(true);
setAcceptHoverEvents(true);
setFlag(QGraphicsItem::ItemIgnoresTransformations, true);
diff --git a/Applications/DataExplorer/Base/RecentFiles.cpp b/Applications/DataExplorer/Base/RecentFiles.cpp
index ea4bd4b511106be5c003e4524e2fe7a9bfaef0b6..892805aa8dd407c7dee0a690200589de3100bcf9 100644
--- a/Applications/DataExplorer/Base/RecentFiles.cpp
+++ b/Applications/DataExplorer/Base/RecentFiles.cpp
@@ -52,7 +52,9 @@ void RecentFiles::setCurrentFile( const QString& filename )
files.removeAll(filename);
files.prepend(filename);
while (files.size() > _maxFiles)
+ {
files.removeLast();
+ }
settings.setValue("recentFileList", files);
@@ -74,7 +76,9 @@ void RecentFiles::updateRecentFileActions()
}
for (int i = numFiles; i < _maxFiles; ++i)
+ {
_fileActions[i]->setVisible(false);
+ }
}
QString RecentFiles::strippedName( const QString& fullFileName )
diff --git a/Applications/DataExplorer/Base/TreeItem.cpp b/Applications/DataExplorer/Base/TreeItem.cpp
index 7844c7d103202e548463eac5e2cc69810a02f2fd..4702ade0c49f8bad134e4b521a443d4aaf2a626d 100644
--- a/Applications/DataExplorer/Base/TreeItem.cpp
+++ b/Applications/DataExplorer/Base/TreeItem.cpp
@@ -52,7 +52,9 @@ void TreeItem::appendChild(TreeItem* item)
TreeItem* TreeItem::child(int row) const
{
if (_childItems.count() > row)
+ {
return _childItems.value(row);
+ }
return nullptr;
}
@@ -71,7 +73,9 @@ int TreeItem::childCount() const
int TreeItem::row() const
{
if (_parentItem)
+ {
return _parentItem->_childItems.indexOf(const_cast<TreeItem*>(this));
+ }
return 0;
}
@@ -98,7 +102,9 @@ QVariant TreeItem::data(int column) const
bool TreeItem::setData( int column, const QVariant &value )
{
if (column < 0 || column >= _itemData.size())
+ {
return false;
+ }
_itemData[column] = value;
return true;
@@ -117,10 +123,14 @@ TreeItem* TreeItem::parentItem() const
bool TreeItem::removeChildren(int position, int count)
{
if (position < 0 || position + count > _childItems.size())
+ {
return false;
+ }
for (int row = 0; row < count; ++row)
+ {
delete _childItems.takeAt(position);
+ }
return true;
}
diff --git a/Applications/DataExplorer/Base/TreeModel.cpp b/Applications/DataExplorer/Base/TreeModel.cpp
index 2237be77556b7dd6b88da1edd393e34db1f5a869..4934ae56593f6ff3d4c0d9f849656bd992614b2c 100644
--- a/Applications/DataExplorer/Base/TreeModel.cpp
+++ b/Applications/DataExplorer/Base/TreeModel.cpp
@@ -51,18 +51,26 @@ TreeModel::~TreeModel()
QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) const
{
if (!hasIndex(row, column, parent))
+ {
return QModelIndex();
+ }
TreeItem* parentItem;
if (!parent.isValid())
+ {
parentItem = _rootItem;
+ }
else
+ {
parentItem = static_cast<TreeItem*>(parent.internalPointer());
+ }
TreeItem* childItem = parentItem->child(row);
if (childItem)
+ {
return createIndex(row, column, childItem);
+ }
return QModelIndex();
}
@@ -73,13 +81,17 @@ QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) con
QModelIndex TreeModel::parent(const QModelIndex &index) const
{
if (!index.isValid())
+ {
return QModelIndex();
+ }
auto* childItem = static_cast<TreeItem*>(index.internalPointer());
TreeItem* parentItem = childItem->parentItem();
if (parentItem == _rootItem)
+ {
return QModelIndex();
+ }
return createIndex(parentItem->row(), 0, parentItem);
}
@@ -92,12 +104,18 @@ int TreeModel::rowCount(const QModelIndex &parent) const
{
TreeItem* parentItem;
if (parent.column() > 0)
+ {
return 0;
+ }
if (!parent.isValid())
+ {
parentItem = _rootItem;
+ }
else
+ {
parentItem = static_cast<TreeItem*>(parent.internalPointer());
+ }
return parentItem->childCount();
}
@@ -108,7 +126,9 @@ int TreeModel::rowCount(const QModelIndex &parent) const
int TreeModel::columnCount(const QModelIndex &parent) const
{
if (parent.isValid())
+ {
return static_cast<TreeItem*>(parent.internalPointer())->columnCount();
+ }
return _rootItem->columnCount();
}
@@ -123,7 +143,9 @@ void TreeModel::updateData()
QVariant TreeModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid())
+ {
return QVariant();
+ }
if (role == Qt::EditRole || role == Qt::DisplayRole)
{
@@ -138,7 +160,9 @@ QVariant TreeModel::data(const QModelIndex &index, int role) const
bool TreeModel::setData( const QModelIndex &index, const QVariant &value, int role /* = Qt::EditRole */ )
{
if (!index.isValid())
+ {
return false;
+ }
if (role == Qt::EditRole)
{
@@ -151,7 +175,9 @@ bool TreeModel::setData( const QModelIndex &index, const QVariant &value, int ro
Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
{
if (!index.isValid())
+ {
return nullptr;
+ }
return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
}
@@ -165,7 +191,9 @@ TreeItem* TreeModel::getItem(const QModelIndex &index) const
{
auto* item = static_cast<TreeItem*>(index.internalPointer());
if (item)
+ {
return item;
+ }
}
return _rootItem;
}
@@ -173,7 +201,9 @@ TreeItem* TreeModel::getItem(const QModelIndex &index) const
QVariant TreeModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+ {
return _rootItem->data(section);
+ }
return QVariant();
}
@@ -211,7 +241,9 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem* parent)
while (position < lines[number].length())
{
if (lines[number].mid(position, 1) != " ")
+ {
break;
+ }
position++;
}
@@ -223,7 +255,9 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem* parent)
QStringList columnStrings = lineData.split("\t", QString::SkipEmptyParts);
QList<QVariant> columnData;
for (int column = 0; column < columnStrings.count(); ++column)
+ {
columnData << columnStrings[column];
+ }
if (position > indentations.last())
{
@@ -238,11 +272,13 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem* parent)
}
}
else
+ {
while (position < indentations.last() && parents.count() > 0)
{
parents.pop_back();
indentations.pop_back();
}
+ }
// Append a new item to the current parent's list of children.
parents.last()->appendChild(new TreeItem(columnData, parents.last()));
diff --git a/Applications/DataExplorer/Base/TreeModelIterator.cpp b/Applications/DataExplorer/Base/TreeModelIterator.cpp
index 573a78a940f7843909aae1122d4dfae684a3c908..af1e5e1b5646218b951c0dffc110937d96a4b4f5 100644
--- a/Applications/DataExplorer/Base/TreeModelIterator.cpp
+++ b/Applications/DataExplorer/Base/TreeModelIterator.cpp
@@ -35,7 +35,9 @@ TreeItem* TreeModelIterator::operator*() const
TreeModelIterator& TreeModelIterator::operator++()
{
if (_current)
+ {
_current = next(_current);
+ }
return *this;
}
@@ -43,7 +45,9 @@ TreeModelIterator& TreeModelIterator::operator++()
TreeItem* TreeModelIterator::next( const TreeItem* current )
{
if (!current)
+ {
return nullptr;
+ }
TreeItem* next = nullptr;
if (current->childCount())
@@ -69,7 +73,9 @@ TreeItem* TreeModelIterator::next( const TreeItem* current )
: _model->rootItem()->child(_currentIndex + 1);
}
if (next)
+ {
++(_currentIndex);
+ }
}
return next;
}
diff --git a/Applications/DataExplorer/DataView/AddLayerToMeshDialog.cpp b/Applications/DataExplorer/DataView/AddLayerToMeshDialog.cpp
index 34b09e504b08753ba67c5a9d113bce316503bb2a..be6b84f8899ce512278e3ab49780ed2a056bc3bd 100644
--- a/Applications/DataExplorer/DataView/AddLayerToMeshDialog.cpp
+++ b/Applications/DataExplorer/DataView/AddLayerToMeshDialog.cpp
@@ -29,12 +29,18 @@ AddLayerToMeshDialog::AddLayerToMeshDialog(QDialog* parent)
void AddLayerToMeshDialog::accept()
{
if (this->nameEdit->text().isEmpty())
+ {
OGSError::box("Please enter a name for the new Mesh.");
+ }
else if (this->thicknessEdit->text().isEmpty() ||
- this->thicknessEdit->text().toDouble() <= 0)
+ this->thicknessEdit->text().toDouble() <= 0)
+ {
OGSError::box("Thickness needs to be larger 0");
+ }
else
+ {
this->done(QDialog::Accepted);
+ }
}
void AddLayerToMeshDialog::reject()
diff --git a/Applications/DataExplorer/DataView/ColorTableModel.cpp b/Applications/DataExplorer/DataView/ColorTableModel.cpp
index 5666d63cebc544c7fb38eab578837b97e9d24469..fd5bba629a7aef4ee59d2f6fcd94a916535181b4 100644
--- a/Applications/DataExplorer/DataView/ColorTableModel.cpp
+++ b/Applications/DataExplorer/DataView/ColorTableModel.cpp
@@ -35,7 +35,9 @@ QVariant ColorTableModel::headerData( int section, Qt::Orientation orientation,
int role /*= Qt::DisplayRole*/ ) const
{
if (role != Qt::DisplayRole)
+ {
return QVariant();
+ }
if (orientation == Qt::Horizontal)
{
@@ -47,16 +49,22 @@ QVariant ColorTableModel::headerData( int section, Qt::Orientation orientation,
}
}
else
+ {
return QString("Row %1").arg(section);
+ }
}
QVariant ColorTableModel::data( const QModelIndex& index, int role ) const
{
if (!index.isValid())
+ {
return QVariant();
+ }
if (index.row() >= _listOfPairs.size() || index.row() < 0)
+ {
return QVariant();
+ }
if (role == Qt::DisplayRole)
{
diff --git a/Applications/DataExplorer/DataView/ColorTableView.cpp b/Applications/DataExplorer/DataView/ColorTableView.cpp
index a1d8b6d3fddc41cafd518de8b053a4e13f46b70a..60e7b9827beaaf3ec005eec527e9eed1482dedb4 100644
--- a/Applications/DataExplorer/DataView/ColorTableView.cpp
+++ b/Applications/DataExplorer/DataView/ColorTableView.cpp
@@ -40,14 +40,18 @@ void ColorTableViewDelegate::paint(QPainter* painter,
}
}
else
+ {
QItemDelegate::paint(painter, option, index);
+ }
}
QSize ColorTableViewDelegate::sizeHint( const QStyleOptionViewItem &option,
const QModelIndex &index ) const
{
QSize s = QItemDelegate::sizeHint(option, index);
- if( s.isValid() )
+ if (s.isValid())
+ {
s.setHeight((int)(0.5 * s.height()));
+ }
return s;
}
diff --git a/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
index 12b96ebd1b460c1b860069c9462a88ad829b6f8e..d3cd85b5aaea56c4b0196806c016d2d16c5f3b22 100644
--- a/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
+++ b/Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
@@ -35,7 +35,9 @@ CondFromRasterDialog::CondFromRasterDialog(std::vector<MeshLib::Mesh*> msh_vec,
this->scalingEdit->setValidator (_scale_validator);
for (auto mesh : _msh_vec)
+ {
this->meshBox->addItem(QString::fromStdString(mesh->getName()));
+ }
this->directButton->setChecked(true);
}
@@ -87,12 +89,13 @@ void CondFromRasterDialog::accept()
MeshLib::Mesh* mesh(nullptr);
for (auto mesh_ : _msh_vec)
+ {
if (mesh_->getName() == mesh_name)
{
mesh = mesh_;
break;
}
-
+ }
if (this->directButton->isChecked())
{
diff --git a/Applications/DataExplorer/DataView/CreateStructuredGridDialog.cpp b/Applications/DataExplorer/DataView/CreateStructuredGridDialog.cpp
index d83ea235128ad6b6574f200c24d73763782715f0..eb0eb93d83c82f7d613b000bb5c4bedc79b49ada 100644
--- a/Applications/DataExplorer/DataView/CreateStructuredGridDialog.cpp
+++ b/Applications/DataExplorer/DataView/CreateStructuredGridDialog.cpp
@@ -162,7 +162,9 @@ bool CreateStructuredGridDialog::inputIsEmpty() const
void CreateStructuredGridDialog::accept()
{
if (inputIsEmpty())
+ {
return;
+ }
if ((this->xLengthEdit->text().toDouble() <= 0) ||
(this->yLengthEdit->text().toDouble() <= 0) ||
@@ -186,48 +188,78 @@ void CreateStructuredGridDialog::accept()
std::string const name (this->meshNameEdit->text().toStdString());
MeshLib::Mesh* mesh (nullptr);
if (this->lineButton->isChecked())
+ {
if (this->meshExtentButton->isChecked())
+ {
mesh = MeshLib::MeshGenerator::generateLineMesh(
this->xLengthEdit->text().toDouble(), this->xElemEdit->text().toInt(), origin, name);
+ }
else
+ {
mesh = MeshLib::MeshGenerator::generateLineMesh(
- this->xElemEdit->text().toInt(), this->xLengthEdit->text().toDouble(), origin, name);
+ this->xElemEdit->text().toInt(),
+ this->xLengthEdit->text().toDouble(), origin, name);
+ }
+ }
else if (this->triButton->isChecked())
+ {
if (this->meshExtentButton->isChecked())
+ {
mesh = MeshLib::MeshGenerator::generateRegularTriMesh(
this->xLengthEdit->text().toDouble(), this->yLengthEdit->text().toDouble(),
this->xElemEdit->text().toInt(), this->yElemEdit->text().toInt(),
origin, name);
+ }
else
+ {
mesh = MeshLib::MeshGenerator::generateRegularTriMesh(
- this->xElemEdit->text().toInt(), this->yElemEdit->text().toInt(),
- this->xLengthEdit->text().toDouble(), this->yLengthEdit->text().toDouble(),
- origin, name);
+ this->xElemEdit->text().toInt(),
+ this->yElemEdit->text().toInt(),
+ this->xLengthEdit->text().toDouble(),
+ this->yLengthEdit->text().toDouble(), origin, name);
+ }
+ }
else if (this->quadButton->isChecked())
+ {
if (this->meshExtentButton->isChecked())
+ {
mesh = MeshLib::MeshGenerator::generateRegularQuadMesh(
this->xLengthEdit->text().toDouble(), this->yLengthEdit->text().toDouble(),
this->xElemEdit->text().toInt(), this->yElemEdit->text().toInt(),
origin, name);
+ }
else
+ {
mesh = MeshLib::MeshGenerator::generateRegularQuadMesh(
- this->xElemEdit->text().toInt(), this->yElemEdit->text().toInt(),
- this->xLengthEdit->text().toDouble(), this->yLengthEdit->text().toDouble(),
- origin, name);
+ this->xElemEdit->text().toInt(),
+ this->yElemEdit->text().toInt(),
+ this->xLengthEdit->text().toDouble(),
+ this->yLengthEdit->text().toDouble(), origin, name);
+ }
+ }
else if (this->prismButton->isChecked())
+ {
if (this->meshExtentButton->isChecked())
+ {
mesh = MeshLib::MeshGenerator::generateRegularPrismMesh(
this->xLengthEdit->text().toDouble(), this->yLengthEdit->text().toDouble(),
this->zLengthEdit->text().toDouble(), this->xElemEdit->text().toInt(),
this->yElemEdit->text().toInt(), this->zElemEdit->text().toInt(),
origin, name);
+ }
else
+ {
mesh = MeshLib::MeshGenerator::generateRegularPrismMesh(
- this->xLengthEdit->text().toDouble(), this->yLengthEdit->text().toDouble(),
- this->zLengthEdit->text().toDouble(), this->xElemEdit->text().toInt(),
- this->yElemEdit->text().toInt(), this->zElemEdit->text().toInt(),
- origin, name);
- else if (this->hexButton->isChecked()) {
+ this->xLengthEdit->text().toDouble(),
+ this->yLengthEdit->text().toDouble(),
+ this->zLengthEdit->text().toDouble(),
+ this->xElemEdit->text().toInt(),
+ this->yElemEdit->text().toInt(),
+ this->zElemEdit->text().toInt(), origin, name);
+ }
+ }
+ else if (this->hexButton->isChecked())
+ {
if (this->meshExtentButton->isChecked())
{
mesh = MeshLib::MeshGenerator::generateRegularHexMesh(
diff --git a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
index 83e91d817cac8cc9140fbcc71c0e15be6de07624..00c126d6a9938e7fc346b2c55cdfbeba2b0461fd 100644
--- a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
+++ b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
@@ -39,7 +39,9 @@ void DataExplorerSettingsDialog::on_gmshPathButton_clicked()
settings.value("DataExplorerGmshPath").toString(),
"*gmsh*");
if (!file_name.isEmpty())
+ {
this->gmshPathEdit->setText(file_name);
+ }
}
void DataExplorerSettingsDialog::accept()
diff --git a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp
index 7b1231b1271d20e336ec0f12c30cfa05b277efb4..7c5d15fc712c967eddb6d6c5c144b06443fb99a2 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp
@@ -75,7 +75,9 @@ DetailWindow::DetailWindow(QString filename, QWidget* parent) : QWidget(parent)
DiagramList::readList(filename, lists);
for (auto& list : lists)
+ {
stationView->addGraph(list);
+ }
resizeWindow();
}
@@ -94,9 +96,11 @@ DetailWindow::DetailWindow(std::vector<std::size_t> data, QWidget* parent) : QWi
std::size_t nEntries = data.size();
std::vector< std::pair<float, float> > list_data(nEntries);
- for (std::size_t i=0; i<nEntries; i++)
+ for (std::size_t i = 0; i < nEntries; i++)
+ {
list_data.emplace_back(static_cast<float>(i),
static_cast<float>(data[i]));
+ }
auto* list = new DiagramList();
list->setList(list_data);
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
index 30e968f84727e6e54adfc34d7bd7d6a79b5e7cc6..5247100142b4355d47a284460627fce88d247b29 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
@@ -36,8 +36,12 @@ float DiagramList::calcMinXValue()
float min = std::numeric_limits<float>::max();
std::size_t nCoords = _coords.size();
for (std::size_t i = 0; i < nCoords; i++)
+ {
if (_coords[i].first < min)
+ {
min = _coords[i].first;
+ }
+ }
return min;
}
@@ -46,8 +50,12 @@ float DiagramList::calcMaxXValue()
float max = std::numeric_limits<float>::lowest();
std::size_t nCoords = _coords.size();
for (std::size_t i = 0; i < nCoords; i++)
+ {
if (_coords[i].first > max)
+ {
max = _coords[i].first;
+ }
+ }
return max;
}
@@ -56,8 +64,12 @@ float DiagramList::calcMinYValue()
float min = std::numeric_limits<float>::max();
std::size_t nCoords = _coords.size();
for (std::size_t i = 0; i < nCoords; i++)
+ {
if (_coords[i].second < min)
+ {
min = _coords[i].second;
+ }
+ }
return min;
}
@@ -66,8 +78,12 @@ float DiagramList::calcMaxYValue()
float max = std::numeric_limits<float>::lowest();
std::size_t nCoords = _coords.size();
for (std::size_t i = 0; i < nCoords; i++)
+ {
if (_coords[i].second > max)
+ {
max = _coords[i].second;
+ }
+ }
return max;
}
@@ -188,7 +204,9 @@ int DiagramList::readList(const QString &path, std::vector<DiagramList*> &lists)
{
startDate = currentDate;
for (int i = 0; i < nLists; i++)
+ {
lists[i]->setStartDate(startDate);
+ }
first_loop = false;
}
@@ -222,7 +240,9 @@ int DiagramList::readList(const QString &path, std::vector<DiagramList*> &lists)
file.close();
for (int i = 0; i < nLists; i++)
+ {
lists[i]->update();
+ }
return nLists;
}
@@ -238,17 +258,22 @@ int DiagramList::readList(const SensorData* data, std::vector<DiagramList*> &lis
const std::size_t start = data->getStartTime();
const std::size_t end = data->getEndTime();
const std::size_t stepsize = data->getStepSize();
- for (std::size_t i = start; i <= end; i+=stepsize)
+ for (std::size_t i = start; i <= end; i += stepsize)
+ {
time_steps.push_back(i);
+ }
}
else
+ {
time_steps = data->getTimeSteps();
+ }
bool is_date (false);
if (!(BaseLib::int2date(time_steps[0])).empty())
+ {
is_date = true;
-
+ }
std::size_t nValues (time_steps.size());
@@ -280,8 +305,10 @@ int DiagramList::readList(const SensorData* data, std::vector<DiagramList*> &lis
{
l->setXUnit("time step");
for (std::size_t j = 0; j < nValues; j++)
+ {
lists[i]->addNextPoint(static_cast<float>(time_steps[j]),
(*time_series)[j]);
+ }
}
lists[i]->update();
@@ -294,13 +321,19 @@ void DiagramList::truncateToRange(QDateTime const& start, QDateTime const& end)
{
auto start_secs = static_cast<float>(_startDate.secsTo(start));
if (start_secs < 0)
+ {
start_secs = 0;
+ }
auto end_secs = static_cast<float>(_startDate.secsTo(end));
if (end_secs < start_secs)
+ {
end_secs = _coords.back().first;
+ }
if (start_secs == 0 && end_secs == _coords.back().first)
+ {
return;
+ }
_coords.erase(
std::remove_if(_coords.begin(), _coords.end(),
@@ -310,7 +343,9 @@ void DiagramList::truncateToRange(QDateTime const& start, QDateTime const& end)
_coords.end());
_startDate = start;
for (auto& c : _coords)
+ {
c.first -= start_secs;
+ }
update();
}
@@ -318,7 +353,9 @@ void DiagramList::setList(
std::vector<std::pair<QDateTime, float>> const& coords)
{
if (coords.empty())
+ {
return;
+ }
this->_startDate = coords[0].first;
_coords.emplace_back(0.0f, coords[0].second);
@@ -337,7 +374,9 @@ void DiagramList::setList(
void DiagramList::setList(std::vector<std::pair<float, float>> const& coords)
{
if (coords.empty())
+ {
return;
+ }
this->_startDate = QDateTime();
std::copy(coords.begin(), coords.end(), std::back_inserter(_coords));
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
index b075d3531045270e238401d94f7dcefcd62f9325..e573d3f469a3876bdf95444d8e3158351bc91fa8 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
@@ -96,12 +96,14 @@ void DiagramPrefsDialog::accept()
}
for (std::size_t i = 0; i < _list.size(); i++)
+ {
if (_visability[i]->isChecked())
{
_list[i]->truncateToRange(start_date, end_date);
_window->addList(_list[i]);
window_is_empty = false;
}
+ }
if (!window_is_empty)
{
@@ -128,7 +130,9 @@ void DiagramPrefsDialog::on_loadFileButton_clicked()
"",
"Time series files (*.stn *.txt)");
if (!fileName.isEmpty())
+ {
loadFile(fileName);
+ }
}
int DiagramPrefsDialog::loadFile(const QString &filename)
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
index 82af2470704386280d5077186e36493e6c0a0262..9e6ebf6915ff9c0a617a218884e0d133b574d50c 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
@@ -51,19 +51,29 @@ DiagramScene::~DiagramScene()
delete _xUnit;
delete _yUnit;
for (auto& graphCaption : _graphCaptions)
+ {
delete graphCaption;
+ }
_graphCaptions.clear();
for (auto& graph : _graphs)
+ {
delete graph;
+ }
_graphs.clear();
for (auto& text : _xTicksText)
+ {
delete text;
+ }
_xTicksText.clear();
for (auto& text : _yTicksText)
+ {
delete text;
+ }
_yTicksText.clear();
for (auto& list : _lists)
+ {
delete list;
+ }
_lists.clear();
}
@@ -106,7 +116,9 @@ void DiagramScene::addGraph(DiagramList* list)
_lists.push_back(list);
for (auto& list : _lists)
+ {
drawGraph(list);
+ }
update();
}
@@ -136,12 +148,18 @@ void DiagramScene::adjustAxis(qreal& min, qreal& max, int& numberOfTicks)
double grossStep = (max - min) / MinTicks;
double step = pow(10.0, std::floor(log10(grossStep)));
if (5 * step < grossStep)
+ {
step *= 5;
+ }
else if (2 * step < grossStep)
+ {
step *= 2;
+ }
numberOfTicks = int(ceil(max / step) - std::floor(min / step));
if (numberOfTicks < MinTicks)
+ {
numberOfTicks = MinTicks;
+ }
min = std::floor(min / step) * step;
max = ceil(max / step) * step;
}
@@ -164,13 +182,21 @@ void DiagramScene::clearGrid()
removeItem(_grid);
for (auto& text : _xTicksText)
+ {
removeItem(text);
+ }
for (auto& text : _yTicksText)
+ {
removeItem(text);
+ }
for (auto& graph : _graphs)
+ {
removeItem(graph);
+ }
for (auto& graphCaption : _graphCaptions)
+ {
removeItem(graphCaption);
+ }
_xTicksText.clear();
_yTicksText.clear();
@@ -306,15 +332,25 @@ void DiagramScene::setDiagramBoundaries(DiagramList* list)
if (!_lists.isEmpty())
{
if (list->minXValue() < _unscaledBounds.left())
+ {
_unscaledBounds.setLeft(list->minXValue());
+ }
if (list->minYValue() < _unscaledBounds.top())
+ {
_unscaledBounds.setTop(list->minYValue());
+ }
if (list->maxXValue() > _unscaledBounds.right())
+ {
_unscaledBounds.setRight(list->maxXValue());
+ }
if (list->maxYValue() > _unscaledBounds.bottom())
+ {
_unscaledBounds.setBottom(list->maxYValue());
+ }
if (_startDate > list->getStartDate())
+ {
_startDate = list->getStartDate();
+ }
}
else
{
diff --git a/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
index 68dc8f9afc93f1d06cc30d812ebb2aeac21bb507..3103e4da7cad619a4b974b39458d219505cab25e 100644
--- a/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
@@ -157,7 +157,9 @@ void QGraphicsGrid::paint(QPainter* painter,
Q_UNUSED (widget)
if (!_bounds.isValid())
+ {
return;
+ }
/* draw outside rectangle */
QBrush brush(Qt::NoBrush);
diff --git a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
index 022effb4bc35eba3199f0fa837aa5a8f4b6f5084..662e4409e22327ad9097d27dc472b391f43e624a 100644
--- a/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
+++ b/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
@@ -127,7 +127,9 @@ int DirectConditionGenerator::writeToFile(const std::string &name) const
if (out)
{
for (const auto& direct_value : _direct_values)
+ {
out << direct_value.first << "\t" << direct_value.second << "\n";
+ }
out.close();
}
diff --git a/Applications/DataExplorer/DataView/ElementTreeModel.cpp b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
index 526dd37d6e09a5d18649a7c1aeb1056cd8312268..79e04f4623b7091f9c0ae40457f6803f609f14f9 100644
--- a/Applications/DataExplorer/DataView/ElementTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
@@ -49,7 +49,9 @@ void ElementTreeModel::setElement(vtkUnstructuredGridAlgorithm const*const grid,
dynamic_cast<MeshLib::VtkMappedMeshSource const* const>(grid);
if (!source)
+ {
return;
+ }
const MeshLib::Mesh* mesh = source->GetMesh();
const MeshLib::Element* elem = mesh->getElement(elem_index);
@@ -189,7 +191,11 @@ void ElementTreeModel::setMesh(MeshLib::Mesh const& mesh)
}
if (array_info.size() == 1)
- array_info << "[ ?" << "? ]" << "";
+ {
+ array_info << "[ ?"
+ << "? ]"
+ << "";
+ }
auto* vec_item = new TreeItem(array_info, _rootItem);
_rootItem->appendChild(vec_item);
}
diff --git a/Applications/DataExplorer/DataView/ElementTreeView.cpp b/Applications/DataExplorer/DataView/ElementTreeView.cpp
index 72721af403660ad0789d04e1bdcfd008c1ec5449..e7f0d0c7de2742445c6710791196e0f65db548dd 100644
--- a/Applications/DataExplorer/DataView/ElementTreeView.cpp
+++ b/Applications/DataExplorer/DataView/ElementTreeView.cpp
@@ -32,7 +32,9 @@ void ElementTreeView::updateView()
std::size_t nColumns =
(this->model() != nullptr) ? this->model()->columnCount() : 0;
for (std::size_t i = 1; i < nColumns; i++)
+ {
resizeColumnToContents(i);
+ }
this->expandAll();
}
@@ -44,12 +46,14 @@ void ElementTreeView::selectionChanged( const QItemSelection &selected, const QI
emit removeSelectedMeshComponent();
const QModelIndex idx = *(selected.indexes().begin());
- if (idx.parent().isValid()) // not root node
+ if (idx.parent().isValid())
+ { // not root node
if (idx.parent().parent().isValid()) // not property node
{
const TreeItem* tree_item = static_cast<TreeModel*>(this->model())->getItem(idx);
const unsigned node_index = tree_item->data(0).toString().mid(5).toUInt();
emit nodeSelected(static_cast<ElementTreeModel*>(this->model())->getSource(), node_index, false);
}
+ }
}
}
diff --git a/Applications/DataExplorer/DataView/FemConditionModel.cpp b/Applications/DataExplorer/DataView/FemConditionModel.cpp
index 70e036053ffc63c30da421d96d564d43b8de29da..de53a05ff5a201a2f6e6ad63af111dfbad68e22b 100644
--- a/Applications/DataExplorer/DataView/FemConditionModel.cpp
+++ b/Applications/DataExplorer/DataView/FemConditionModel.cpp
@@ -41,11 +41,15 @@ void FemConditionModel::setFemCondition(DataHolderLib::FemCondition* cond)
QList<QVariant> type_data;
std::string type_str;
if (cond->getConditionClassStr() == "Boundary Condition")
+ {
type_str = DataHolderLib::BoundaryCondition::convertTypeToString(
static_cast<DataHolderLib::BoundaryCondition*>(cond)->getType());
+ }
else if (cond->getConditionClassStr() == "Source Term")
+ {
type_str = DataHolderLib::SourceTerm::convertTypeToString(
static_cast<DataHolderLib::SourceTerm*>(cond)->getType());
+ }
type_data << "Type:" << QString::fromStdString(type_str);
TreeItem* type_item = new TreeItem(type_data, cond_item);
cond_item->appendChild(type_item);
diff --git a/Applications/DataExplorer/DataView/FemConditionView.cpp b/Applications/DataExplorer/DataView/FemConditionView.cpp
index 378f8623a4328645cb92101e4856a5445cb58b32..345070ad186e2d76d2465dfaf8731548eb701e26 100644
--- a/Applications/DataExplorer/DataView/FemConditionView.cpp
+++ b/Applications/DataExplorer/DataView/FemConditionView.cpp
@@ -25,7 +25,9 @@ void FemConditionView::updateView()
std::size_t nColumns =
(this->model() != nullptr) ? this->model()->columnCount() : 0;
for (std::size_t i = 1; i < nColumns; i++)
+ {
resizeColumnToContents(i);
+ }
this->expandAll();
}
diff --git a/Applications/DataExplorer/DataView/GEOModels.cpp b/Applications/DataExplorer/DataView/GEOModels.cpp
index 3f9c83934d4c22103920ca2482f8dbd18a601c6b..696aa909c6804135302d136452741a35b56dd922 100644
--- a/Applications/DataExplorer/DataView/GEOModels.cpp
+++ b/Applications/DataExplorer/DataView/GEOModels.cpp
@@ -78,11 +78,17 @@ void GEOModels::removeGeometry(std::string const& geo_name,
GeoLib::GEOTYPE const type)
{
if (type == GeoLib::GEOTYPE::SURFACE)
+ {
_geo_objects.removeSurfaceVec(geo_name);
+ }
if (type == GeoLib::GEOTYPE::POLYLINE)
+ {
_geo_objects.removePolylineVec(geo_name);
+ }
if (type == GeoLib::GEOTYPE::POINT)
+ {
_geo_objects.removePointVec(geo_name);
+ }
}
void GEOModels::addPointVec(std::string const& name)
@@ -168,8 +174,10 @@ void GEOModels::connectPolylineSegments(
{
const std::vector<GeoLib::Polyline*>* polylines = plyVec->getVector();
std::vector<GeoLib::Polyline*> ply_list;
- for (auto & elem : indexlist)
- ply_list.push_back( (*polylines)[elem] );
+ for (auto& elem : indexlist)
+ {
+ ply_list.push_back((*polylines)[elem]);
+ }
// connect polylines
GeoLib::Polyline* new_line = GeoLib::Polyline::constructPolylineFromSegments(
@@ -209,13 +217,19 @@ void GEOModels::connectPolylineSegments(
}
if (!ply_name.empty())
+ {
plyVec->setNameOfElementByID(polylines->size(), ply_name);
+ }
}
else
+ {
OGSError::box("Error connecting polyines.");
+ }
}
else
+ {
OGSError::box("Corresponding geometry not found.");
+ }
}
void GEOModels::addNameForElement(std::string const& geometry_name,
@@ -224,11 +238,17 @@ void GEOModels::addNameForElement(std::string const& geometry_name,
std::string const& new_name)
{
if (object_type == GeoLib::GEOTYPE::POINT)
+ {
_geo_objects.getPointVecObj(geometry_name)->setNameForElement(id, new_name);
+ }
else if (object_type == GeoLib::GEOTYPE::POLYLINE)
+ {
_geo_objects.getPolylineVecObj(geometry_name)->setNameForElement(id, new_name);
+ }
else if (object_type == GeoLib::GEOTYPE::SURFACE)
+ {
_geo_objects.getSurfaceVecObj(geometry_name)->setNameForElement(id, new_name);
+ }
else
ERR("GEOModels::addNameForElement() - Unknown GEOTYPE %s.",
GeoLib::convertGeoTypeToString(object_type).c_str());
@@ -248,9 +268,11 @@ void GEOModels::addNameForObjectPoints(const std::string &geometry_name,
const auto* ply = dynamic_cast<const GeoLib::Polyline*>(obj);
std::size_t nPoints = ply->getNumberOfPoints();
for (std::size_t i = 0; i < nPoints; i++)
+ {
pnt_vec->setNameForElement(
ply->getPointID(i),
new_name + "_Point" + std::to_string(ply->getPointID(i)));
+ }
}
else if (object_type == GeoLib::GEOTYPE::SURFACE)
{
diff --git a/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp b/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
index c295263066c5de27769a69434684cced2041a966..304aa482f62c796d79cfa36ed5ff99dd7aecc989 100644
--- a/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
+++ b/Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
@@ -58,13 +58,17 @@ GMSHPrefsDialog::GMSHPrefsDialog(GeoLib::GEOObjects const& geoObjects, QDialog*
geoObjects.getStationVectorNames(geo_station_names);
for (auto& geo_station_name : geo_station_names)
+ {
geoNames.push_back(geo_station_name);
+ }
std::size_t nGeoObjects(geoNames.size());
QStringList list;
for (unsigned i = 0; i < nGeoObjects; ++i)
+ {
list.append(QString::fromStdString(geoNames[i]));
+ }
if (list.empty())
{
@@ -151,16 +155,24 @@ void GMSHPrefsDialog::accept()
max_number_of_points_in_quadtree_leaf = BaseLib::str2number<unsigned> (
param1->text().toStdString().c_str());
if (max_number_of_points_in_quadtree_leaf == 0)
+ {
max_number_of_points_in_quadtree_leaf = 10;
+ }
mesh_density_scaling_pnts = fabs (param2->text().toDouble());
if (mesh_density_scaling_pnts < min_scaling_factor)
+ {
mesh_density_scaling_pnts = min_scaling_factor;
+ }
mesh_density_scaling_stations = param3->text().toDouble();
if (mesh_density_scaling_stations < min_scaling_factor)
+ {
mesh_density_scaling_stations = min_scaling_factor;
+ }
}
else
+ {
val4 = param4->text().toDouble();
+ }
bool delete_geo_file = this->geoFileDelete->isChecked();
emit requestMeshing(selectedObjects,
@@ -181,6 +193,8 @@ std::vector<std::string> GMSHPrefsDialog::getSelectedObjects(QStringList list)
{
std::vector<std::string> indexList;
for (auto& index : list)
+ {
indexList.push_back(index.toStdString());
+ }
return indexList;
}
diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
index 3f92382a73ecd7919489dda9a8d37e802f39eaab..082a7265282b5075d77b768d635e0180e2b6f48d 100644
--- a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
+++ b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
@@ -27,8 +27,10 @@ GeoOnMeshMappingDialog::GeoOnMeshMappingDialog(
setupUi(this);
for (const auto& mesh : mesh_vec)
+ {
this->meshNameComboBox->addItem(
QString::fromStdString(mesh->getName()));
+ }
}
GeoOnMeshMappingDialog::~GeoOnMeshMappingDialog() = default;
@@ -41,7 +43,9 @@ int GeoOnMeshMappingDialog::getDataSetChoice() const
void GeoOnMeshMappingDialog::on_meshNameComboBox_currentIndexChanged(int idx)
{
if (idx == 1)
+ {
this->normalMappingButton->setChecked(true);
+ }
bool is_enabled(idx != 1);
this->normalMappingButton->setEnabled(is_enabled);
diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.cpp b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
index 473339c044ee7a418359255c6c8a8af3920dae7a..e0bf87cbc516379d782e2909d410ae070ea69f56 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
@@ -70,8 +70,13 @@ void GeoTreeModel::addPointList(QString geoName, GeoLib::PointVec const& pointVe
static_cast<const GeoLib::Point*>(&pnt)));
}
- for (auto pnt = pointVec.getNameIDMapBegin(); pnt != pointVec.getNameIDMapEnd(); ++pnt)
- QVariant pnt_data (pointList->child(pnt->second)->setData(4, QString::fromStdString(pnt->first)));
+ for (auto pnt = pointVec.getNameIDMapBegin();
+ pnt != pointVec.getNameIDMapEnd();
+ ++pnt)
+ {
+ QVariant pnt_data(pointList->child(pnt->second)
+ ->setData(4, QString::fromStdString(pnt->first)));
+ }
INFO("Geometry '%s' built. %d points added.", geoName.toStdString().c_str(),
nPoints);
@@ -88,7 +93,9 @@ void GeoTreeModel::addPolylineList(QString geoName, GeoLib::PolylineVec const& p
for (int i = 0; i < nLists; i++)
{
if (_rootItem->child(i)->data(0).toString().compare(geoName) == 0)
+ {
geo = _rootItem->child(i);
+ }
}
if (geo == nullptr)
@@ -116,6 +123,7 @@ void GeoTreeModel::appendPolylines(const std::string &name, GeoLib::PolylineVec
for (auto& list : _lists)
{
if (name == list->data(0).toString().toStdString())
+ {
for (int j = 0; j < list->childCount(); j++)
{
auto* parent = static_cast<GeoObjectListItem*>(list->child(j));
@@ -129,6 +137,7 @@ void GeoTreeModel::appendPolylines(const std::string &name, GeoLib::PolylineVec
return;
}
}
+ }
}
OGSError::box("Error adding polyline to geometry.");
}
@@ -165,8 +174,13 @@ void GeoTreeModel::addChildren(GeoObjectListItem* plyList,
}
}
- for (auto pnt = polyline_vec.getNameIDMapBegin(); pnt != polyline_vec.getNameIDMapEnd(); ++pnt)
- QVariant pnt_data (plyList->child(pnt->second)->setData(1, QString::fromStdString(pnt->first)));
+ for (auto pnt = polyline_vec.getNameIDMapBegin();
+ pnt != polyline_vec.getNameIDMapEnd();
+ ++pnt)
+ {
+ QVariant pnt_data(plyList->child(pnt->second)
+ ->setData(1, QString::fromStdString(pnt->first)));
+ }
INFO("%d polylines added.", end_index - start_index);
}
@@ -180,7 +194,9 @@ void GeoTreeModel::addSurfaceList(QString geoName, GeoLib::SurfaceVec const& sur
for (int i = 0; i < nLists; i++)
{
if (_rootItem->child(i)->data(0).toString().compare(geoName) == 0)
+ {
geo = _rootItem->child(i);
+ }
}
if (geo == nullptr)
@@ -273,8 +289,13 @@ void GeoTreeModel::addChildren(GeoObjectListItem* sfcList,
}
}
- for (auto pnt = surface_vec.getNameIDMapBegin(); pnt != surface_vec.getNameIDMapEnd(); ++pnt)
- QVariant pnt_data (sfcList->child(pnt->second)->setData(1, QString::fromStdString(pnt->first)));
+ for (auto pnt = surface_vec.getNameIDMapBegin();
+ pnt != surface_vec.getNameIDMapEnd();
+ ++pnt)
+ {
+ QVariant pnt_data(sfcList->child(pnt->second)
+ ->setData(1, QString::fromStdString(pnt->first)));
+ }
INFO("%d surfaces added.", end_index - start_index);
}
@@ -306,9 +327,11 @@ void GeoTreeModel::renameGeometry(std::string const& old_name,
void GeoTreeModel::removeGeoList(const std::string& name, GeoLib::GEOTYPE type)
{
for (std::size_t i = 0; i < _lists.size(); i++)
+ {
if (name == _lists[i]->data(0).toString().toStdString())
{
for (int j = 0; j < _lists[i]->childCount(); j++)
+ {
if (type ==
static_cast<GeoObjectListItem*>(_lists[i]->child(j))->getType())
{
@@ -317,12 +340,14 @@ void GeoTreeModel::removeGeoList(const std::string& name, GeoLib::GEOTYPE type)
removeRows(j, 1, parent(index));
break;
}
+ }
if (_lists[i]->childCount() == 0)
{
_lists.erase(_lists.begin() + i);
removeRows(i, 1, QModelIndex());
}
}
+ }
}
vtkPolyDataAlgorithm* GeoTreeModel::vtkSource(const std::string &name, GeoLib::GEOTYPE type) const
@@ -331,13 +356,17 @@ vtkPolyDataAlgorithm* GeoTreeModel::vtkSource(const std::string &name, GeoLib::G
for (std::size_t i = 0; i < nLists; i++)
{
if (name == _lists[i]->data(0).toString().toStdString())
+ {
for (int j = 0; j < _lists[i]->childCount(); j++)
{
auto* item =
dynamic_cast<GeoObjectListItem*>(_lists[i]->child(j));
if (item->getType() == type)
+ {
return item->vtkSource();
+ }
}
+ }
}
return nullptr;
}
diff --git a/Applications/DataExplorer/DataView/GeoTreeView.cpp b/Applications/DataExplorer/DataView/GeoTreeView.cpp
index c3978da5cb888aa0b09a8cbfe7da6c7406dcdbe5..d433fc62ee87a70d216232ec37caa4b4517c2f1a 100644
--- a/Applications/DataExplorer/DataView/GeoTreeView.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeView.cpp
@@ -72,24 +72,41 @@ void GeoTreeView::selectionChanged( const QItemSelection &selected,
emit enableSaveButton(false);
const auto* geo_type =
dynamic_cast<const GeoObjectListItem*>(tree_item);
- if (geo_type) // geometry list item
+ if (geo_type)
+ { // geometry list item
emit enableRemoveButton(true);
+ }
else
{
// highlight a point for an expanded polyline
auto* list_item = dynamic_cast<GeoObjectListItem*>(
tree_item->parentItem()->parentItem());
- if (list_item && list_item->getType() == GeoLib::GEOTYPE::POLYLINE)
- geoItemSelected(
- dynamic_cast<GeoObjectListItem*>(tree_item->parentItem()->parentItem()->parentItem()->child(0))->vtkSource(),
- tree_item->data(0).toInt());
+ if (list_item &&
+ list_item->getType() == GeoLib::GEOTYPE::POLYLINE)
+ {
+ geoItemSelected(dynamic_cast<GeoObjectListItem*>(
+ tree_item->parentItem()
+ ->parentItem()
+ ->parentItem()
+ ->child(0))
+ ->vtkSource(),
+ tree_item->data(0).toInt());
+ }
// highlight a point for an expanded surface
list_item = dynamic_cast<GeoObjectListItem*>(tree_item->parentItem()->parentItem()->parentItem());
- if (list_item && list_item->getType() == GeoLib::GEOTYPE::SURFACE)
- geoItemSelected(
- dynamic_cast<GeoObjectListItem*>(tree_item->parentItem()->parentItem()->parentItem()->parentItem()->child(0))->vtkSource(),
- tree_item->data(0).toInt());
+ if (list_item &&
+ list_item->getType() == GeoLib::GEOTYPE::SURFACE)
+ {
+ geoItemSelected(dynamic_cast<GeoObjectListItem*>(
+ tree_item->parentItem()
+ ->parentItem()
+ ->parentItem()
+ ->parentItem()
+ ->child(0))
+ ->vtkSource(),
+ tree_item->data(0).toInt());
+ }
emit enableRemoveButton(false);
}
}
@@ -145,8 +162,11 @@ void GeoTreeView::contextMenuEvent( QContextMenuEvent* event )
}
else
{
- if (!item) // Otherwise sometimes it crashes when (unmotivated ;-) ) clicking in a treeview
+ if (!item)
+ { // Otherwise sometimes it crashes when (unmotivated ;-) ) clicking in
+ // a treeview
return;
+ }
auto* parent = dynamic_cast<GeoObjectListItem*>(item->parentItem());
@@ -162,10 +182,14 @@ void GeoTreeView::contextMenuEvent( QContextMenuEvent* event )
connect(addNameAction, SIGNAL(triggered()), this, SLOT(setNameForElement()));
if (parent->getType() == GeoLib::GEOTYPE::POINT)
+ {
addCondPointAction->setEnabled(false);
+ }
else
- connect(addCondPointAction, SIGNAL(triggered()), this, SLOT(setObjectPointsAsCondition()));
-
+ {
+ connect(addCondPointAction, SIGNAL(triggered()), this,
+ SLOT(setObjectPointsAsCondition()));
+ }
}
// The current index refers to the name of a geometry-object
else if (item->childCount() > 0)
@@ -214,7 +238,9 @@ void GeoTreeView::removeGeometry()
{
QModelIndex index (this->selectionModel()->currentIndex());
if (!index.isValid())
+ {
OGSError::box("No geometry selected.");
+ }
else
{
TreeItem* item = static_cast<GeoTreeModel*>(model())->getItem(index);
@@ -268,7 +294,9 @@ void GeoTreeView::writeToFile() const
{
QModelIndex index (this->selectionModel()->currentIndex());
if (!index.isValid())
+ {
OGSError::box("No geometry selected.");
+ }
else
{
TreeItem* item = static_cast<GeoTreeModel*>(model())->getItem(index);
diff --git a/Applications/DataExplorer/DataView/LineEditDialog.cpp b/Applications/DataExplorer/DataView/LineEditDialog.cpp
index c7c6cb5227a028146d1a20d0b882eef08d6d96ab..a6dfe89bd5ea2c76b18c29dd3983ca257cea29c7 100644
--- a/Applications/DataExplorer/DataView/LineEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/LineEditDialog.cpp
@@ -94,7 +94,9 @@ void LineEditDialog::accept()
this->done(QDialog::Accepted);
}
else
+ {
OGSError::box("No polylines selected", "Error");
+ }
}
void LineEditDialog::reject()
diff --git a/Applications/DataExplorer/DataView/LinearEditDialog.cpp b/Applications/DataExplorer/DataView/LinearEditDialog.cpp
index fdeb5c3c561a4f1056f08418c9b399b3412ba6a0..407a49e45101b1f4a5292872fbce0b604ca37aa9 100644
--- a/Applications/DataExplorer/DataView/LinearEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/LinearEditDialog.cpp
@@ -42,7 +42,10 @@ void LinearEditDialog::setupDialog(const std::vector<std::size_t> &dis_nodes,
std::size_t nValues (dis_values.size());
for (std::size_t i = 0; i < nValues; i++)
- tableWidget->item(dis_nodes[i],0)->setText(QString::number(dis_values[i]));
+ {
+ tableWidget->item(dis_nodes[i], 0)
+ ->setText(QString::number(dis_values[i]));
+ }
}
LinearEditDialog::~LinearEditDialog() = default;
@@ -53,7 +56,10 @@ void LinearEditDialog::on_comboBox_currentIndexChanged(int index)
{
std::size_t nRows = tableWidget->rowCount();
for (std::size_t i = 0; i < nRows; i++)
- tableWidget->item(i,0)->setText(QString::number(_line.getPoint(i)->getCoords()[2]));
+ {
+ tableWidget->item(i, 0)->setText(
+ QString::number(_line.getPoint(i)->getCoords()[2]));
+ }
}
}
@@ -66,7 +72,9 @@ void LinearEditDialog::accept()
{
QString row_text (tableWidget->item(i,0)->text());
if (row_text.length() > 0)
+ {
linear_values.emplace_back(i, row_text.toDouble());
+ }
}
emit transmitDisValues(linear_values);
diff --git a/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp b/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
index ca625d36c8e9b869fc2dbeb08b2f3855f2a6d70f..8b2eab7bd87b20d533860382ce4fdf0242bd0413 100644
--- a/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
+++ b/Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
@@ -40,7 +40,9 @@ MergeGeometriesDialog::MergeGeometriesDialog(GeoLib::GEOObjects& geoObjects, QDi
QStringList list;
for (unsigned i = 0; i < nGeoObjects; ++i)
+ {
list.append(QString::fromStdString(geoNames[i]));
+ }
if (list.empty())
{
@@ -94,9 +96,14 @@ void MergeGeometriesDialog::on_deselectGeoButton_pressed()
void MergeGeometriesDialog::accept()
{
if (_selGeo->stringList().size() > 1)
+ {
this->done(QDialog::Accepted);
+ }
else
- OGSError::box("At least two geometries need\n to be selected for merging.");
+ {
+ OGSError::box(
+ "At least two geometries need\n to be selected for merging.");
+ }
}
void MergeGeometriesDialog::reject()
@@ -109,7 +116,9 @@ std::vector<std::string> const MergeGeometriesDialog::getSelectedGeometries() co
std::vector<std::string> indexList;
QStringList const& list (_selGeo->stringList());
for (const auto& index : list)
+ {
indexList.push_back(index.toStdString());
+ }
return indexList;
}
diff --git a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
index 6c337d0fa72068f6f746c86ab89623dbf017c70e..394588a096ba21d3322a2f1df3abe506db318368 100644
--- a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
@@ -30,10 +30,14 @@ MeshAnalysisDialog::MeshAnalysisDialog(
setupUi(this);
if (mesh_vec.empty())
+ {
this->startButton->setDisabled(true);
+ }
for (const auto& mesh : mesh_vec)
+ {
this->meshListBox->addItem(QString::fromStdString(mesh->getName()));
+ }
auto* collapse_threshold_validator =
new StrictDoubleValidator(0, 1000000, 7, this);
@@ -65,8 +69,12 @@ void MeshAnalysisDialog::on_startButton_pressed()
this->elementsMsgOutput(element_error_codes);
unsigned const n_holes (MeshLib::MeshValidation::detectHoles(mesh));
- if (n_holes>0)
- this->meshHoleOutputLabel->setText("<strong>" + QString::number(n_holes) + " hole(s) found within the mesh</strong>");
+ if (n_holes > 0)
+ {
+ this->meshHoleOutputLabel->setText(
+ "<strong>" + QString::number(n_holes) +
+ " hole(s) found within the mesh</strong>");
+ }
}
void MeshAnalysisDialog::nodesMsgOutput(std::vector<std::size_t> const& node_ids, std::vector<std::size_t> const& collapsibleNodeIds)
@@ -74,12 +82,16 @@ void MeshAnalysisDialog::nodesMsgOutput(std::vector<std::size_t> const& node_ids
const std::size_t nNodeIds (node_ids.size());
QString nodes_output("");
if (node_ids.empty())
+ {
nodes_output += "No unused nodes found.";
+ }
else
{
nodes_output += (QString::number(nNodeIds) + " nodes are not part of any element:\n");
- for (std::size_t i=0; i<nNodeIds; ++i)
+ for (std::size_t i = 0; i < nNodeIds; ++i)
+ {
nodes_output += (QString::number(node_ids[i]) + ", ");
+ }
}
this->unusedNodesText->setText(nodes_output);
@@ -87,11 +99,13 @@ void MeshAnalysisDialog::nodesMsgOutput(std::vector<std::size_t> const& node_ids
QString node_ids_str("");
unsigned count(0);
for (std::size_t i = 0; i < nNodes; ++i)
+ {
if (i != collapsibleNodeIds[i])
{
node_ids_str.append(QString::number(i) + ", ");
count++;
}
+ }
nodes_output = (count > 0) ? QString::number(count) + " nodes found:\n" : "No nodes found.";
nodes_output.append(node_ids_str);
this->collapsibleNodesText->setText(nodes_output);
diff --git a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
index 75f6ac63255a991bcbe41a4473d8546917be4c8e..cb9291eede6d87d595b21ff271a28d3bc37d5dfa 100644
--- a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
@@ -73,8 +73,10 @@ void MeshElementRemovalDialog::accept()
{
QList<QListWidgetItem*> items = this->elementTypeListWidget->selectedItems();
for (auto& item : items)
+ {
ex.searchByElementType(
MeshLib::String2MeshElemType(item->text().toStdString()));
+ }
anything_checked = true;
}
if (this->scalarArrayCheckBox->isChecked())
@@ -108,7 +110,9 @@ void MeshElementRemovalDialog::accept()
}
if (n_marked_elements > 0)
+ {
anything_checked = true;
+ }
}
if (this->boundingBoxCheckBox->isChecked())
{
@@ -142,13 +146,22 @@ void MeshElementRemovalDialog::accept()
{
MeshLib::Mesh* new_mesh = MeshLib::removeElements(*msh, ex.getSearchedElementIDs(), this->newMeshNameEdit->text().toStdString());
if (new_mesh)
+ {
emit meshAdded(new_mesh);
+ }
else
{
if (new_mesh == nullptr)
- OGSError::box("The current selection removes ALL mesh elements.\nPlease change the selection.");
+ {
+ OGSError::box(
+ "The current selection removes ALL mesh elements.\nPlease "
+ "change the selection.");
+ }
if (ex.getSearchedElementIDs().empty())
- OGSError::box("The current selection removes NO mesh elements.");
+ {
+ OGSError::box(
+ "The current selection removes NO mesh elements.");
+ }
delete new_mesh;
return;
}
@@ -258,7 +271,9 @@ void MeshElementRemovalDialog::on_scalarArrayCheckBox_toggled(bool is_checked)
MeshLib::Mesh const* const mesh =
_project.getMesh(meshNameComboBox->currentText().toStdString());
if (addScalarArrays(*mesh) > 0)
+ {
enableScalarArrayWidgets(true);
+ }
else
{
enableScalarArrayWidgets(false);
@@ -287,18 +302,26 @@ void MeshElementRemovalDialog::on_scalarArrayComboBox_currentIndexChanged(int id
Q_UNUSED(idx);
std::string const vec_name(scalarArrayComboBox->currentText().toStdString());
if (vec_name.empty())
+ {
return;
+ }
MeshLib::Mesh const* const mesh =
_project.getMesh(meshNameComboBox->currentText().toStdString());
if (mesh == nullptr)
+ {
return;
+ }
MeshLib::Properties const& properties = mesh->getProperties();
if (properties.existsPropertyVector<int>(vec_name))
+ {
setRangeValues<int>(*properties.getPropertyVector<int>(vec_name));
+ }
else if (properties.existsPropertyVector<double>(vec_name))
+ {
setRangeValues<double>(*properties.getPropertyVector<double>(vec_name));
+ }
}
template <typename T>
diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
index ab62a314cb1b1cbcfe46f3c8d1581101917660dd..82cccf89c48f4dd37835ec0d70682c649fd088f0 100644
--- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
@@ -106,9 +106,18 @@ void MeshLayerEditDialog::createWithRasters()
for (unsigned i = 0; i <= _n_layers; ++i)
{
QString text("");
- if (i==0) text = "Surface";
- else if (i == _n_layers) text = "Layer" + QString::number(_n_layers) + "-Bottom";
- else text="Layer" + QString::number(i+1) + "-Top";
+ if (i == 0)
+ {
+ text = "Surface";
+ }
+ else if (i == _n_layers)
+ {
+ text = "Layer" + QString::number(_n_layers) + "-Bottom";
+ }
+ else
+ {
+ text = "Layer" + QString::number(i + 1) + "-Top";
+ }
auto* edit(new QLineEdit(this));
QPushButton* button (new QPushButton("...", _layerBox));
@@ -123,7 +132,9 @@ void MeshLayerEditDialog::createWithRasters()
this->_layerBox->setLayout(this->_layerSelectionLayout);
this->gridLayoutLayerMapping->addWidget(_layerBox, 4, 0, 1, 3);
if (this->_n_layers > 0)
+ {
this->createMeshToolSelection();
+ }
}
void MeshLayerEditDialog::createStatic()
@@ -185,10 +196,15 @@ MeshLib::Mesh* MeshLayerEditDialog::createPrismMesh()
if (_use_rasters)
{
float minimum_thickness (_minThicknessEdit->text().toFloat());
- if (minimum_thickness <= 0) minimum_thickness = std::numeric_limits<float>::epsilon();
+ if (minimum_thickness <= 0)
+ {
+ minimum_thickness = std::numeric_limits<float>::epsilon();
+ }
std::vector<std::string> raster_paths;
- for (int i=nLayers; i>=0; --i)
+ for (int i = nLayers; i >= 0; --i)
+ {
raster_paths.push_back(this->_edits[i]->text().toStdString());
+ }
auto const rasters = FileIO::readRasters(raster_paths);
if (rasters && mapper.createLayers(*_msh, *rasters, minimum_thickness))
@@ -201,7 +217,9 @@ MeshLib::Mesh* MeshLayerEditDialog::createPrismMesh()
std::vector<float> layer_thickness;
for (unsigned i = 0; i < nLayers; ++i)
+ {
layer_thickness.push_back(this->_edits[i]->text().toFloat());
+ }
INFO("Mesh construction time: %d ms.", myTimer0.elapsed());
return mapper.createStaticLayers(*_msh, layer_thickness);
}
@@ -213,7 +231,9 @@ MeshLib::Mesh* MeshLayerEditDialog::createTetMesh()
settings.value("lastOpenedTetgenFileDirectory").toString(),
"TetGen Geometry (*.smesh)");
if (filename.isEmpty())
+ {
return nullptr;
+ }
const unsigned nLayers = _layerEdit->text().toInt();
MeshLib::Mesh* tg_mesh(nullptr);
@@ -223,15 +243,22 @@ MeshLib::Mesh* MeshLayerEditDialog::createTetMesh()
if (_use_rasters)
{
float minimum_thickness (_minThicknessEdit->text().toFloat());
- if (minimum_thickness <= 0) minimum_thickness = std::numeric_limits<float>::epsilon();
+ if (minimum_thickness <= 0)
+ {
+ minimum_thickness = std::numeric_limits<float>::epsilon();
+ }
std::vector<std::string> raster_paths;
- for (int i=nLayers; i>=0; --i)
+ for (int i = nLayers; i >= 0; --i)
+ {
raster_paths.push_back(this->_edits[i]->text().toStdString());
+ }
LayeredVolume lv;
auto const rasters = FileIO::readRasters(raster_paths);
if (rasters && lv.createLayers(*_msh, *rasters, minimum_thickness))
+ {
tg_mesh = lv.getMesh("SubsurfaceMesh").release();
+ }
if (tg_mesh)
{
@@ -243,8 +270,10 @@ MeshLib::Mesh* MeshLayerEditDialog::createTetMesh()
else
{
std::vector<float> layer_thickness;
- for (unsigned i=0; i<nLayers; ++i)
+ for (unsigned i = 0; i < nLayers; ++i)
+ {
layer_thickness.push_back(this->_edits[i]->text().toFloat());
+ }
tg_mesh = MeshLib::MeshLayerMapper::createStaticLayers(*_msh, layer_thickness);
std::vector<MeshLib::Node> tg_attr;
FileIO::TetGenInterface tetgen_interface;
@@ -268,14 +297,20 @@ void MeshLayerEditDialog::accept()
if (_n_layers==0)
{
if (_edits[0]->text().isEmpty())
+ {
all_paths_set = false;
+ }
}
else
{
int start_idx = (_use_rasters) ? 1:0;
- for (int i=start_idx; i<_edits.size(); ++i)
+ for (int i = start_idx; i < _edits.size(); ++i)
+ {
if (_edits[i]->text().isEmpty())
+ {
all_paths_set = false;
+ }
+ }
}
if (!all_paths_set)
@@ -286,14 +321,22 @@ void MeshLayerEditDialog::accept()
MeshLib::Mesh* new_mesh (nullptr);
if (_ogsMeshButton->isChecked())
+ {
new_mesh = createPrismMesh();
+ }
else
+ {
new_mesh = createTetMesh();
+ }
if (new_mesh)
+ {
emit mshEditFinished(new_mesh);
+ }
else
+ {
OGSError::box("Error creating mesh");
+ }
this->done(QDialog::Accepted);
}
diff --git a/Applications/DataExplorer/DataView/MeshModel.cpp b/Applications/DataExplorer/DataView/MeshModel.cpp
index f358e9801b0b349eae5b8e73e35fa80d8ffb93bb..68a5f8598ec6d5f616de6e596a77a8e97d4f401f 100644
--- a/Applications/DataExplorer/DataView/MeshModel.cpp
+++ b/Applications/DataExplorer/DataView/MeshModel.cpp
@@ -94,7 +94,9 @@ const MeshLib::Mesh* MeshModel::getMesh(const QModelIndex &idx) const
{
auto* item = dynamic_cast<MeshItem*>(this->getItem(idx));
if (item)
+ {
return item->getMesh();
+ }
return nullptr;
}
@@ -108,7 +110,9 @@ const MeshLib::Mesh* MeshModel::getMesh(const std::string &name) const
{
auto* item = static_cast<MeshItem*>(_rootItem->child(i));
if (item->data(0).toString().toStdString() == name)
+ {
return item->getMesh();
+ }
}
INFO("MeshModel::getMesh(): No entry found with name \"%s\".", name.c_str());
@@ -121,7 +125,9 @@ bool MeshModel::removeMesh(const QModelIndex &idx)
{
auto* item = dynamic_cast<MeshItem*>(this->getItem(idx));
if (item)
+ {
return this->removeMesh(item->getMesh()->getName());
+ }
return false;
}
return false;
@@ -163,8 +169,12 @@ void MeshModel::updateModel()
{
auto const& mesh_vec = _project.getMeshObjects();
for (auto const& mesh : mesh_vec)
- if (!getMesh(mesh->getName())) // if Mesh is not yet added to GUI, do it now
+ {
+ if (!getMesh(mesh->getName()))
+ { // if Mesh is not yet added to GUI, do it now
addMeshObject(mesh.get());
+ }
+ }
}
std::map<MeshLib::MeshElemType, QVariant> MeshModel::createMeshElemTypeMap()
@@ -173,7 +183,10 @@ std::map<MeshLib::MeshElemType, QVariant> MeshModel::createMeshElemTypeMap()
std::map<MeshLib::MeshElemType, QVariant> elem_map;
for (MeshLib::MeshElemType t : elem_types)
- elem_map[t] = QVariant(QString::fromStdString(MeshLib::MeshElemType2String(t)));
+ {
+ elem_map[t] =
+ QVariant(QString::fromStdString(MeshLib::MeshElemType2String(t)));
+ }
return elem_map;
}
@@ -196,7 +209,9 @@ vtkUnstructuredGridAlgorithm* MeshModel::vtkSource(const std::string &name) cons
{
auto* item = static_cast<MeshItem*>(_rootItem->child(i));
if (item->data(0).toString().toStdString() == name)
+ {
return item->vtkSource();
+ }
}
INFO("MeshModel::vtkSource(): No entry found with name \"%s\".", name.c_str());
diff --git a/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp b/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
index c565de0b372dbd1e68c6a91561a82286b202d64b..abfc7fa19678ce806bba7948bc4f3b05ed38e326 100644
--- a/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
@@ -49,17 +49,29 @@ void MeshQualitySelectionDialog::on_histogramPathButton_pressed()
void MeshQualitySelectionDialog::accept()
{
if (this->choiceEdges->isChecked())
+ {
_metric = MeshLib::MeshQualityType::EDGERATIO;
+ }
else if (this->choiceArea->isChecked())
+ {
_metric = MeshLib::MeshQualityType::ELEMENTSIZE;
+ }
else if (this->choiceVolume->isChecked())
+ {
_metric = MeshLib::MeshQualityType::SIZEDIFFERENCE;
+ }
else if (this->choiceAngles->isChecked())
+ {
_metric = MeshLib::MeshQualityType::EQUIANGLESKEW;
+ }
else if (this->choiceRadius->isChecked())
+ {
_metric = MeshLib::MeshQualityType::RADIUSEDGERATIO;
+ }
else
+ {
_metric = MeshLib::MeshQualityType::INVALID;
+ }
if (this->histogramCheckBox->isChecked())
{
diff --git a/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
index 7c1c2878877431c64b6f3f9459e6eb8ab43fb69b..3f338f289671c6fa85d50afd6dfbccb7a6b6bafb 100644
--- a/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
@@ -31,7 +31,9 @@ MeshValueEditDialog::~MeshValueEditDialog(void) = default;
void MeshValueEditDialog::accept()
{
if (this->condenseButton->isChecked())
+ {
MeshLib::ElementValueModification::condense(*_mesh);
+ }
else
{
if (this->edit_old_value->text().isEmpty())
diff --git a/Applications/DataExplorer/DataView/MeshView.cpp b/Applications/DataExplorer/DataView/MeshView.cpp
index eacc96b1e72f18aa94087e1de026b46d746aa51a..831a794766027394e2733c7daf7688cd3c91c8a8 100644
--- a/Applications/DataExplorer/DataView/MeshView.cpp
+++ b/Applications/DataExplorer/DataView/MeshView.cpp
@@ -62,7 +62,9 @@ void MeshView::updateView()
setColumnWidth(0,150);
std::size_t nColumns = (this->model() != nullptr) ? this->model()->columnCount() : 0;
for (std::size_t i = 1; i < nColumns; i++)
+ {
resizeColumnToContents(i);
+ }
}
void MeshView::selectionChanged( const QItemSelection &selected, const QItemSelection &deselected )
@@ -99,7 +101,9 @@ void MeshView::removeMesh()
{
QModelIndex index (this->selectionModel()->currentIndex());
if (!index.isValid())
+ {
OGSError::box("No mesh selected.");
+ }
else
{
emit requestMeshRemoval(index);
@@ -114,7 +118,9 @@ void MeshView::contextMenuEvent( QContextMenuEvent* event )
MeshItem const*const item = dynamic_cast<MeshItem*>(static_cast<TreeItem*>(index.internalPointer()));
if (item == nullptr)
+ {
return;
+ }
unsigned const mesh_dim (item->getMesh()->getDimension());
@@ -142,7 +148,9 @@ void MeshView::contextMenuEvent( QContextMenuEvent* event )
for (MeshAction a : actions)
{
if (mesh_dim >= a.min_dim && mesh_dim <= a.max_dim)
+ {
menu.addAction(a.action);
+ }
}
menu.exec(event->globalPos());
}
@@ -153,11 +161,15 @@ void MeshView::openMap2dMeshDialog()
QModelIndex const index = this->selectionModel()->currentIndex();
MeshLib::Mesh const*const mesh = model->getMesh(index);
if (mesh == nullptr)
+ {
return;
+ }
MeshMapping2DDialog dlg;
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
auto result = std::make_unique<MeshLib::Mesh>(*mesh);
result->setName(dlg.getNewMeshName());
@@ -180,7 +192,10 @@ void MeshView::openMap2dMeshDialog()
}
}
else
- MeshLib::MeshLayerMapper::mapToStaticValue(*result, dlg.getStaticValue());
+ {
+ MeshLib::MeshLayerMapper::mapToStaticValue(*result,
+ dlg.getStaticValue());
+ }
static_cast<MeshModel*>(this->model())->addMesh(std::move(result));
}
@@ -213,45 +228,64 @@ void MeshView::openAddLayerDialog()
{
QModelIndex const index = this->selectionModel()->currentIndex();
if (!index.isValid())
+ {
return;
+ }
MeshLib::Mesh const*const mesh = static_cast<MeshModel*>(this->model())->getMesh(index);
if (mesh == nullptr)
+ {
return;
+ }
AddLayerToMeshDialog dlg;
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
double const thickness (dlg.getThickness());
std::unique_ptr<MeshLib::Mesh> result(MeshLib::addLayerToMesh(
*mesh, thickness, dlg.getName(), dlg.isTopLayer()));
if (result)
+ {
static_cast<MeshModel*>(model())->addMesh(std::move(result));
+ }
else
+ {
OGSError::box("Error adding layer to mesh.");
+ }
}
void MeshView::extractSurfaceMesh()
{
QModelIndex const index = this->selectionModel()->currentIndex();
if (!index.isValid())
+ {
return;
+ }
MeshLib::Mesh const*const mesh = static_cast<MeshModel*>(this->model())->getMesh(index);
SurfaceExtractionDialog dlg;
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
MathLib::Vector3 const& dir (dlg.getNormal());
int const tolerance (dlg.getTolerance());
std::unique_ptr<MeshLib::Mesh> sfc_mesh(
MeshLib::MeshSurfaceExtraction::getMeshSurface(*mesh, dir, tolerance));
if (sfc_mesh)
+ {
static_cast<MeshModel*>(model())->addMesh(std::move(sfc_mesh));
+ }
else
- OGSError::box(" No surfaces found to extract\n using the specified parameters.");
+ {
+ OGSError::box(
+ " No surfaces found to extract\n using the specified parameters.");
+ }
}
void MeshView::convertMeshToGeometry()
@@ -265,7 +299,9 @@ void MeshView::exportToShapefile() const
{
QModelIndex const index = this->selectionModel()->currentIndex();
if (!index.isValid())
+ {
return;
+ }
QSettings const settings;
QFileInfo const fi (settings.value("lastOpenedMeshFileDirectory").toString());
@@ -276,8 +312,11 @@ void MeshView::exportToShapefile() const
if (!fileName.isEmpty())
{
LastSavedFileDirectory::setDir(fileName);
- if (!FileIO::SHPInterface::write2dMeshToSHP(fileName.toStdString(), *mesh))
+ if (!FileIO::SHPInterface::write2dMeshToSHP(fileName.toStdString(),
+ *mesh))
+ {
OGSError::box("Error exporting mesh\n to shapefile");
+ }
}
}
@@ -285,7 +324,9 @@ void MeshView::exportToTetGen()
{
QModelIndex const index = this->selectionModel()->currentIndex();
if (!index.isValid())
+ {
return;
+ }
MeshLib::Mesh const*const mesh = static_cast<MeshModel*>(this->model())->getMesh(index);
QSettings const settings;
diff --git a/Applications/DataExplorer/DataView/ModelTreeItem.cpp b/Applications/DataExplorer/DataView/ModelTreeItem.cpp
index d97e5d3ce0414422dc00b24232f8c23f3bfd0e88..9caf594cfa1bf39c07e384ac9d95d78f70e5f992 100644
--- a/Applications/DataExplorer/DataView/ModelTreeItem.cpp
+++ b/Applications/DataExplorer/DataView/ModelTreeItem.cpp
@@ -22,7 +22,9 @@ ModelTreeItem::ModelTreeItem(const QList<QVariant> &data, TreeItem* parent, Base
BaseItem* ModelTreeItem::getItem() const
{
if (_item != nullptr)
+ {
return _item;
+ }
return nullptr;
}
diff --git a/Applications/DataExplorer/DataView/ProcessModel.cpp b/Applications/DataExplorer/DataView/ProcessModel.cpp
index 95c92e4a2e737bef499990123f122b9b0ff11527..241eefe535748b6198e12744d53288297465a6c8 100644
--- a/Applications/DataExplorer/DataView/ProcessModel.cpp
+++ b/Applications/DataExplorer/DataView/ProcessModel.cpp
@@ -61,7 +61,9 @@ void ProcessModel::addCondition(DataHolderLib::FemCondition* condition)
QString const name(QString::fromStdString(condition->getProcessVarName()));
ProcessVarItem* process_var(getProcessVarItem(name));
if (process_var == nullptr)
+ {
process_var = addProcessVar(name);
+ }
addConditionItem(condition, process_var);
}
@@ -70,14 +72,18 @@ void ProcessModel::addBoundaryConditions(
conditions)
{
for (auto& cond : conditions)
+ {
addCondition(cond.get());
+ }
}
void ProcessModel::addSourceTerms(
std::vector<std::unique_ptr<DataHolderLib::SourceTerm>> const& conditions)
{
for (auto& cond : conditions)
+ {
addCondition(cond.get());
+ }
}
ProcessVarItem* ProcessModel::addProcessVar(QString const& name)
@@ -98,7 +104,9 @@ ProcessVarItem* ProcessModel::getProcessVarItem(QString const& name) const
{
auto* item(dynamic_cast<ProcessVarItem*>(_rootItem->child(i)));
if (item != nullptr && item->getName() == name)
+ {
return item;
+ }
}
return nullptr;
}
@@ -112,7 +120,9 @@ void ProcessModel::removeCondition(ProcessVarItem* process_var,
CondItem const* const cond =
dynamic_cast<CondItem*>(process_var->child(i));
if (cond->getCondition()->getParamName() != param_name.toStdString())
+ {
continue;
+ }
process_var->removeChildren(i, 1);
return;
@@ -125,7 +135,9 @@ void ProcessModel::removeCondition(QString const& process_var,
beginResetModel();
ProcessVarItem* pv_item(getProcessVarItem(process_var));
if (pv_item == nullptr)
+ {
return;
+ }
removeCondition(pv_item, param);
_project.removeBoundaryCondition(process_var.toStdString(),
@@ -139,12 +151,16 @@ void ProcessModel::removeProcessVariable(QString const& name)
beginResetModel();
ProcessVarItem* pv_item(getProcessVarItem(name));
if (pv_item == nullptr)
+ {
return;
+ }
int const n_conds = pv_item->childCount();
for (int i = n_conds - 1; i >= 0; --i)
+ {
removeCondition(pv_item,
static_cast<CondItem*>(pv_item->child(i))->getName());
+ }
_project.removePrimaryVariable(name.toStdString());
int const idx = pv_item->row();
diff --git a/Applications/DataExplorer/DataView/ProcessView.cpp b/Applications/DataExplorer/DataView/ProcessView.cpp
index d6652593bfefd88867ae91c0be04d9bb35e1cf0e..3a3be27029cda2fd584b899b6140c25abdb3019d 100644
--- a/Applications/DataExplorer/DataView/ProcessView.cpp
+++ b/Applications/DataExplorer/DataView/ProcessView.cpp
@@ -48,7 +48,9 @@ void ProcessView::selectionChanged(const QItemSelection& selected,
CondItem const* const item = dynamic_cast<CondItem*>(
static_cast<ProcessModel*>(this->model())->getItem(idx));
if (item != nullptr)
+ {
emit conditionSelected(item->getCondition());
+ }
}
else
{
@@ -57,7 +59,9 @@ void ProcessView::selectionChanged(const QItemSelection& selected,
->getItem(idx)
->child(0));
if (item != nullptr)
+ {
emit processVarSelected(item->getCondition());
+ }
}
}
emit itemSelectionChanged(selected, deselected);
diff --git a/Applications/DataExplorer/DataView/SHPImportDialog.cpp b/Applications/DataExplorer/DataView/SHPImportDialog.cpp
index 2fbe953f36557054300700318df9c25cf06293f9..30e2583af903e2d7599b4732f082c01e799932d0 100644
--- a/Applications/DataExplorer/DataView/SHPImportDialog.cpp
+++ b/Applications/DataExplorer/DataView/SHPImportDialog.cpp
@@ -68,15 +68,25 @@ void SHPImportDialog::setupDialog()
if (_shpInterface->readSHPInfo(_filename, shpType, numberOfEntities))
{
if ((shpType - 1) % 10 == 0)
+ {
type = "points";
+ }
if ((shpType - 3) % 10 == 0)
+ {
type = "polylines";
+ }
if ((shpType - 5) % 10 == 0)
+ {
type = "polygons";
+ }
if ((shpType - 8) % 10 == 0)
+ {
type = "multipoints";
+ }
if (shpType == 31)
+ {
type = "TIN elements";
+ }
_shpContentLabel =
new QLabel("The selected file contains " + QString::number(
@@ -103,7 +113,10 @@ void SHPImportDialog::setupDialog()
_choice1 = new QRadioButton("Read Polylines only");
_choice2 = new QRadioButton("Read Polylines/Surfaces");
if ((shpType - 3) % 10 == 0)
- _choice2->setDisabled(true); // disable polygon-choice if file contains only polylines
+ {
+ _choice2->setDisabled(true); // disable polygon-choice if file
+ // contains only polylines
+ }
_choice1->toggle(); // default choice
_layout->addWidget( _shpContentLabel );
_layout->addWidget( _choice1 );
@@ -127,7 +140,9 @@ void SHPImportDialog::setupDialog()
setLayout(_layout);
}
else
+ {
OGSError::box("Error reading shapefile!");
+ }
}
void SHPImportDialog::accept()
@@ -140,21 +155,29 @@ void SHPImportDialog::accept()
}
if (_fileType == 1 && _choice1->isChecked())
+ {
_shpInterface->readSHPFile(_filename,
FileIO::SHPInterface::OGSType::POINT,
list_name.toStdString(), _gmsh_path);
+ }
if (_fileType == 1 && _choice2->isChecked())
+ {
_shpInterface->readSHPFile(_filename,
FileIO::SHPInterface::OGSType::STATION,
list_name.toStdString(), _gmsh_path);
+ }
if (_fileType == 2 && _choice1->isChecked())
+ {
_shpInterface->readSHPFile(_filename,
FileIO::SHPInterface::OGSType::POLYLINE,
list_name.toStdString(), _gmsh_path);
+ }
if (_fileType == 2 && _choice2->isChecked())
+ {
_shpInterface->readSHPFile(_filename,
FileIO::SHPInterface::OGSType::POLYGON,
list_name.toStdString(), _gmsh_path);
+ }
emit shpLoaded(list_name);
this->done(QDialog::Accepted);
diff --git a/Applications/DataExplorer/DataView/SaveMeshDialog.cpp b/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
index aa28e799c6d00dd750b3c17fe142d82450d61253..0fa4356a5b00787617f214abfb061a3ad887fe93 100644
--- a/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
+++ b/Applications/DataExplorer/DataView/SaveMeshDialog.cpp
@@ -45,7 +45,9 @@ void SaveMeshDialog::on_selectDirButton_clicked()
file_type);
if (!file_name.isEmpty())
+ {
this->fileNameEdit->setText(file_name);
+ }
}
void SaveMeshDialog::on_dataModeBox_currentIndexChanged(int index)
diff --git a/Applications/DataExplorer/DataView/SelectMeshDialog.cpp b/Applications/DataExplorer/DataView/SelectMeshDialog.cpp
index ea830af367cece6cfe3ace8cc9aebaf8417ebf86..7399f9342778fe347d735fd4ac2eeb1454f161ae 100644
--- a/Applications/DataExplorer/DataView/SelectMeshDialog.cpp
+++ b/Applications/DataExplorer/DataView/SelectMeshDialog.cpp
@@ -45,7 +45,9 @@ void SelectMeshDialog::setupDialog(const std::list<std::string> &msh_names)
_msh_names = new QComboBox();
for (const auto& msh_name : msh_names)
+ {
_msh_names->addItem(QString::fromStdString(msh_name));
+ }
setWindowTitle("Select Mesh...");
_layout->addWidget( _txt_label );
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.cpp b/Applications/DataExplorer/DataView/StationTreeModel.cpp
index c7e17448783e53f0edd6683cd140aadb3b782b01..239a253f8b7d118b1900e14ce2410d5f23bb384a 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeModel.cpp
@@ -47,14 +47,20 @@ QModelIndex StationTreeModel::index( int row, int column,
const QModelIndex &parent /*= QModelIndex()*/ ) const
{
if (!hasIndex(row, column, parent))
+ {
return QModelIndex();
+ }
ModelTreeItem* parentItem;
if (!parent.isValid())
+ {
parentItem = (ModelTreeItem*)(_rootItem);
+ }
else
+ {
parentItem = static_cast<ModelTreeItem*>(parent.internalPointer());
+ }
auto* childItem = (ModelTreeItem*)(parentItem->child(row));
if (childItem)
@@ -63,7 +69,9 @@ QModelIndex StationTreeModel::index( int row, int column,
// assign ModelIndex to BaseItem so it can communicate with the model
BaseItem* item = childItem->getItem();
if (item != nullptr)
+ {
item->setModelIndex(newIndex);
+ }
return newIndex;
}
@@ -94,8 +102,12 @@ vtkPolyDataAlgorithm* StationTreeModel::vtkSource(const std::string &name) const
{
std::size_t nLists = _lists.size();
for (std::size_t i = 0; i < nLists; i++)
+ {
if (name == _lists[i]->data(0).toString().toStdString())
+ {
return dynamic_cast<BaseItem*>(_lists[i]->getItem())->vtkSource();
+ }
+ }
return nullptr;
}
@@ -110,7 +122,9 @@ void StationTreeModel::setNameForItem(const std::string& stn_vec_name,
if (stn_list == _lists.end() ||
id >= static_cast<std::size_t>((*stn_list)->childCount()))
+ {
return;
+ }
TreeItem *const item = (*stn_list)->child(id);
item->setData(0, QString::fromStdString(item_name));
}
@@ -166,8 +180,12 @@ void StationTreeModel::removeStationList(QModelIndex index)
// also delete the lists entry in the list directory of the model
for (std::size_t i = 0; i < _lists.size(); i++)
+ {
if (item == _lists[i])
+ {
_lists.erase(_lists.begin() + i);
+ }
+ }
removeRows(0, item->childCount(), index);
removeRows(item->row(), 1, parent(index));
@@ -180,6 +198,10 @@ void StationTreeModel::removeStationList(QModelIndex index)
void StationTreeModel::removeStationList(const std::string &name)
{
for (auto& list : _lists)
+ {
if (name == list->data(0).toString().toStdString())
+ {
removeStationList(createIndex(list->row(), 0, list));
+ }
+ }
}
diff --git a/Applications/DataExplorer/DataView/StationTreeView.cpp b/Applications/DataExplorer/DataView/StationTreeView.cpp
index 43a5ddd093b9e0b8ae6012cb2bd6861ed95cbb85..b88e102b2dd03abc007afe228c5e2e0b1d6934a9 100644
--- a/Applications/DataExplorer/DataView/StationTreeView.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeView.cpp
@@ -56,7 +56,10 @@ void StationTreeView::selectionChanged( const QItemSelection &selected,
if (list_item->getItem())
{
if (list_item)
- emit geoItemSelected(list_item->getItem()->vtkSource(), tree_item->row());
+ {
+ emit geoItemSelected(list_item->getItem()->vtkSource(),
+ tree_item->row());
+ }
emit enableRemoveButton(false);
emit enableSaveButton(false);
}
@@ -89,8 +92,11 @@ void StationTreeView::contextMenuEvent( QContextMenuEvent* event )
QModelIndex index = this->selectionModel()->currentIndex();
auto* item = static_cast<ModelTreeItem*>(index.internalPointer());
- if (!item) // Otherwise sometimes it crashes when (unmotivated ;-) ) clicking in a treeview
+ if (!item)
+ { // Otherwise sometimes it crashes when (unmotivated ;-) ) clicking in a
+ // treeview
return;
+ }
// The current index refers to a parent item (e.g. a listname)
if (item->childCount() > 0)
@@ -167,7 +173,9 @@ void StationTreeView::writeToFile()
{
QModelIndex index (this->selectionModel()->currentIndex());
if (!index.isValid())
+ {
OGSError::box("No station list selected.");
+ }
else
{
TreeItem* item = static_cast<StationTreeModel*>(model())->getItem(index);
@@ -220,7 +228,9 @@ void StationTreeView::removeStationList()
{
QModelIndex index (this->selectionModel()->currentIndex());
if (!index.isValid())
+ {
OGSError::box("No station list selected.");
+ }
else
{
TreeItem* item = static_cast<StationTreeModel*>(model())->getItem(index);
@@ -249,8 +259,10 @@ void StationTreeView::writeStratigraphiesAsImages(QString listName)
std::size_t nLists = lists.size();
for (std::size_t i = 0; i < nLists; i++)
{
- if ( listName.compare( lists[i]->data(0).toString() ) != 0 )
+ if (listName.compare(lists[i]->data(0).toString()) != 0)
+ {
continue;
+ }
std::vector<GeoLib::Point*> const& stations =
*dynamic_cast<BaseItem*>(lists[i]->getItem())->getStations();
diff --git a/Applications/DataExplorer/DataView/StratView/StratBar.cpp b/Applications/DataExplorer/DataView/StratView/StratBar.cpp
index 1ec9e964bc84f7592e573257aa9be2ff7d838aa2..8a141cfea35c8f2703465cbd8959f0f9705dce88 100644
--- a/Applications/DataExplorer/DataView/StratView/StratBar.cpp
+++ b/Applications/DataExplorer/DataView/StratView/StratBar.cpp
@@ -21,7 +21,9 @@ StratBar::StratBar(GeoLib::StationBorehole* station,
QGraphicsItem(parent), _station(station)
{
if (stratColors)
+ {
_stratColors = *stratColors;
+ }
}
QRectF StratBar::boundingRect() const
@@ -69,7 +71,9 @@ double StratBar::totalLogHeight() const
std::vector<GeoLib::Point*> profile = _station->getProfile();
for (std::size_t i = 1; i < profile.size(); i++)
- height += ( log((*(profile[i - 1]))[2] - (*(profile[i]))[2] + 1) * 100 );
+ {
+ height += (log((*(profile[i - 1]))[2] - (*(profile[i]))[2] + 1) * 100);
+ }
return height;
}
diff --git a/Applications/DataExplorer/DataView/StratView/StratScene.cpp b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
index 356bdac3124aefe8bfc85a0ea4777bf3bcf42479..2786a979d08eb2ba2689a2bc2d3060dd25f99bb6 100644
--- a/Applications/DataExplorer/DataView/StratView/StratScene.cpp
+++ b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
@@ -59,8 +59,10 @@ StratScene::StratScene(GeoLib::StationBorehole* station,
addDepthLabels(station->getProfile(), stratBarOffset + stratBarBounds.width());
if (!station->getSoilNames().empty())
- addSoilNameLabels(station->getSoilNames(), station->getProfile(), stratBarOffset +
- (stratBarBounds.width() / 2));
+ {
+ addSoilNameLabels(station->getSoilNames(), station->getProfile(),
+ stratBarOffset + (stratBarBounds.width() / 2));
+ }
}
StratScene::~StratScene() = default;
diff --git a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
index 4403f562bda63747f9d4ca666d4cd02ff1cf0e66..b23eb71ee07323eb52adccc2bd877c2fa9254b01 100644
--- a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
+++ b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
@@ -33,9 +33,13 @@ void MeshFromRasterDialog::on_elevationButton_toggled(bool isChecked)
if (isChecked)
{
if (this->prismButton->isChecked())
+ {
this->triButton->setChecked(true);
+ }
if (this->hexButton->isChecked())
+ {
this->quadButton->setChecked(true);
+ }
}
this->prismButton->setEnabled(!isChecked);
@@ -52,9 +56,18 @@ void MeshFromRasterDialog::accept()
_mesh_name = this->mshNameEdit->text().toStdString();
_intensity_selection = MeshLib::UseIntensityAs::ELEVATION;
- if (this->materialButton->isChecked()) _intensity_selection = MeshLib::UseIntensityAs::MATERIALS;
- else if (this->otherButton->isChecked()) _intensity_selection = MeshLib::UseIntensityAs::DATAVECTOR;
- else if (this->ignoreButton->isChecked()) _intensity_selection = MeshLib::UseIntensityAs::NONE;
+ if (this->materialButton->isChecked())
+ {
+ _intensity_selection = MeshLib::UseIntensityAs::MATERIALS;
+ }
+ else if (this->otherButton->isChecked())
+ {
+ _intensity_selection = MeshLib::UseIntensityAs::DATAVECTOR;
+ }
+ else if (this->ignoreButton->isChecked())
+ {
+ _intensity_selection = MeshLib::UseIntensityAs::NONE;
+ }
if (_intensity_selection == MeshLib::UseIntensityAs::DATAVECTOR)
{
@@ -67,10 +80,18 @@ void MeshFromRasterDialog::accept()
_array_name = this->arrayNameEdit->text().toStdString();
}
_element_selection = MeshLib::MeshElemType::TRIANGLE;
- if (this->quadButton->isChecked()) _element_selection = MeshLib::MeshElemType::QUAD;
+ if (this->quadButton->isChecked())
+ {
+ _element_selection = MeshLib::MeshElemType::QUAD;
+ }
else if (this->prismButton->isChecked())
+ {
_element_selection = MeshLib::MeshElemType::PRISM;
- else if (this->hexButton->isChecked()) _element_selection = MeshLib::MeshElemType::HEXAHEDRON;
+ }
+ else if (this->hexButton->isChecked())
+ {
+ _element_selection = MeshLib::MeshElemType::HEXAHEDRON;
+ }
this->done(QDialog::Accepted);
}
diff --git a/Applications/DataExplorer/VtkVis/VisPrefsDialog.cpp b/Applications/DataExplorer/VtkVis/VisPrefsDialog.cpp
index f6ca36f48a4c833bcff774c6b7cd0a017064efa8..f7649a048b7b2a22e12af4a8cb998724aaf2403a 100644
--- a/Applications/DataExplorer/VtkVis/VisPrefsDialog.cpp
+++ b/Applications/DataExplorer/VtkVis/VisPrefsDialog.cpp
@@ -30,9 +30,13 @@ VisPrefsDialog::VisPrefsDialog(VtkVisPipeline &pipeline,
{
setupUi(this);
if (_vtkVisPipeline.getLight(_above))
+ {
lightAboveBox->toggle();
+ }
if (_vtkVisPipeline.getLight(_below))
+ {
lightBelowBox->toggle();
+ }
bgColorButton->setColor(_vtkVisPipeline.getBGColor());
@@ -53,17 +57,25 @@ void VisPrefsDialog::on_bgColorButton_colorPicked( QColor color )
void VisPrefsDialog::on_lightAboveBox_clicked()
{
if (lightAboveBox->isChecked())
+ {
_vtkVisPipeline.addLight(_above);
+ }
else
+ {
_vtkVisPipeline.removeLight(_above);
+ }
}
void VisPrefsDialog::on_lightBelowBox_clicked()
{
if (lightBelowBox->isChecked())
+ {
_vtkVisPipeline.addLight(_below);
+ }
else
+ {
_vtkVisPipeline.removeLight(_below);
+ }
}
void VisPrefsDialog::on_superelevationPushButton_pressed()
diff --git a/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp b/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
index 50633e2bd2f88f99062f52aeb82aadd72205fdcf..809d0f7f5b71d3a91416a88ca38028ce3804f47b 100644
--- a/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
+++ b/Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
@@ -109,8 +109,10 @@ VtkPickCallback* VisualizationWidget::vtkPickCallback() const
void VisualizationWidget::updateView()
{
- if(vtkWidget->GetRenderWindow()->IsDrawable())
+ if (vtkWidget->GetRenderWindow()->IsDrawable())
+ {
vtkWidget->GetRenderWindow()->Render();
+ }
}
void VisualizationWidget::showAll(int x, int y, int z)
@@ -122,19 +124,27 @@ void VisualizationWidget::showAll(int x, int y, int z)
double dist = sqrt(vtkMath::Distance2BetweenPoints(p, fp));
cam->SetPosition(fp[0]+(x*dist), fp[1]+(y*dist), fp[2]+(z*dist));
- if (x!=0 || y!=0)
+ if (x != 0 || y != 0)
+ {
cam->SetViewUp(0.0, 0.0, 1.0);
+ }
else
+ {
cam->SetViewUp(0.0, 1.0, 0.0);
+ }
this->updateView();
}
void VisualizationWidget::updateViewOnLoad()
{
if (_isShowAllOnLoad)
+ {
this->showAll(0, 0, 1);
+ }
else
+ {
updateView();
+ }
}
void VisualizationWidget::on_zoomToolButton_toggled( bool checked )
diff --git a/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp b/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
index 706ea45412d04f496b6f7c824d1ce34f6f3dae4a..a75a45b2746e630654fd2bcd2be5f0a462d00c54 100644
--- a/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
@@ -49,12 +49,14 @@ VtkAddFilterDialog::VtkAddFilterDialog( VtkVisPipeline &pipeline,
// Check for suitable filters (see vtkDataSet inheritance diagram)
int inputType = filter.inputDataObjectType;
if ((inputType == parentDataObjectType) ||
- (inputType == VTK_POINT_SET && parentDataObjectType != VTK_IMAGE_DATA) ||
+ (inputType == VTK_POINT_SET &&
+ parentDataObjectType != VTK_IMAGE_DATA) ||
(inputType == VTK_IMAGE_DATA &&
- (parentDataObjectType == VTK_STRUCTURED_POINTS || parentDataObjectType ==
- VTK_UNIFORM_GRID)))
-
+ (parentDataObjectType == VTK_STRUCTURED_POINTS ||
+ parentDataObjectType == VTK_UNIFORM_GRID)))
+ {
new QListWidgetItem(filter.readableName, filterListWidget);
+ }
}
// On double clicking an item the dialog gets accepted
@@ -81,24 +83,34 @@ void VtkAddFilterDialog::on_buttonBox_accepted()
VtkCompositeFilter* filter;
if (dynamic_cast<VtkVisImageItem*>(parentItem))
+ {
filter = VtkFilterFactory::CreateCompositeFilter(filterName, parentItem->algorithm());
+ }
else
- filter = VtkFilterFactory::CreateCompositeFilter(filterName,
- parentItem->transformFilter());
+ {
+ filter = VtkFilterFactory::CreateCompositeFilter(
+ filterName, parentItem->transformFilter());
+ }
VtkVisPipelineItem* item;
if (filter)
{
if (filter->GetOutputDataObjectType() == VTK_IMAGE_DATA)
+ {
item = new VtkVisImageItem(filter, parentItem, itemData);
+ }
else
+ {
item = new VtkVisPointSetItem(filter, parentItem, itemData);
+ }
}
else
{
vtkAlgorithm* algorithm = VtkFilterFactory::CreateSimpleFilter(filterName);
if (algorithm)
+ {
item = new VtkVisPointSetItem(algorithm, parentItem, itemData);
+ }
else
{
ERR("VtkFilterFactory cannot create %s.", filterName.toStdString().c_str());
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
index 1ec68081c0ba8b1da098e5fa536aa7d8e462662b..1b4428d3e2b951c6b7a41c4d73e0d3d33946048d 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
@@ -39,10 +39,15 @@ VtkAlgorithmProperties::VtkAlgorithmProperties(QObject* parent /*= nullptr*/)
VtkAlgorithmProperties::~VtkAlgorithmProperties()
{
_property->Delete();
- if (_texture != nullptr) _texture->Delete();
+ if (_texture != nullptr)
+ {
+ _texture->Delete();
+ }
for (auto& row : _lut)
+ {
row.second->Delete();
+ }
delete _algorithmUserProperties;
delete _algorithmUserVectorProperties;
}
@@ -51,7 +56,9 @@ vtkLookupTable* VtkAlgorithmProperties::GetLookupTable(const QString& array_name
{
auto it = _lut.find(array_name);
if (it != _lut.end())
+ {
return it->second;
+ }
return nullptr;
}
@@ -100,7 +107,9 @@ void VtkAlgorithmProperties::SetScalarVisibility(bool on)
QVariant VtkAlgorithmProperties::GetUserProperty(QString name) const
{
if (this->_algorithmUserProperties->contains(name))
+ {
return this->_algorithmUserProperties->value(name);
+ }
ERR("Not a valid property: %s", name.toStdString().c_str());
return QVariant();
@@ -109,7 +118,9 @@ QVariant VtkAlgorithmProperties::GetUserProperty(QString name) const
QList<QVariant> VtkAlgorithmProperties::GetUserVectorProperty(QString name) const
{
if (this->_algorithmUserVectorProperties->contains(name))
+ {
return this->_algorithmUserVectorProperties->value(name);
+ }
ERR("Not a valid property: %s", name.toStdString().c_str());
return QList<QVariant>();
@@ -118,8 +129,12 @@ QList<QVariant> VtkAlgorithmProperties::GetUserVectorProperty(QString name) cons
void VtkAlgorithmProperties::SetActiveAttribute(QString name)
{
if (name.contains("Solid Color") || name.contains("P-TextureCoordinates"))
+ {
SetScalarVisibility(false);
+ }
else
+ {
SetScalarVisibility(true);
+ }
_activeAttributeName = name;
}
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
index b8fcd3cc4cbc0fe934879e140b95f71b163991b6..1a649437b41392982f234a2959e6bcbaecaab92e 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
@@ -55,5 +55,7 @@ void VtkAlgorithmPropertyLineEdit::setNewValue()
{
QVariant value(this->text());
if (value.convert(_type))
+ {
_algProps->SetUserProperty(_name, value);
+ }
}
diff --git a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
index 04f735d1fb8b723d66b3308dce2ba69c00f8547c..91a1eb139d919fa232079b9712ea2afdb60e25ab 100644
--- a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
@@ -63,7 +63,9 @@ int VtkAppendArrayFilter::RequestData( vtkInformation*,
WARN("VtkAppendArrayFilter::RequestData(): Number of cells exceeds selection array length. Surplus cells won't be examined.");
for (std::size_t i = 0; i < arrayLength; i++)
+ {
colors->SetValue(i, _array[i]);
+ }
vtkInformation* outInfo = outputVector->GetInformationObject(0);
vtkUnstructuredGrid* output =
diff --git a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
index 1b9b445a9efc9f436264cc8c7e3a070d428282d1..d7b7202bf0d448b8c0733b863bd2ec501bb3449d 100644
--- a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
@@ -29,8 +29,10 @@ VtkColorLookupTable::VtkColorLookupTable() = default;
VtkColorLookupTable::~VtkColorLookupTable()
{
- for (auto it = _dict.begin(); it != _dict.end(); ++it)
- delete it->second;
+ for (auto& it : _dict)
+ {
+ delete it.second;
+ }
}
unsigned char VtkColorLookupTable::linInterpolation(unsigned char a, unsigned char b,
@@ -72,6 +74,7 @@ void VtkColorLookupTable::Build()
this->SetTableValueRGBA(nextIndex, it->second);
if (nextIndex - lastValue.first > 0)
+ {
for (std::size_t i = lastValue.first + 1; i < nextIndex; i++)
{
unsigned char int_rgba[4];
@@ -80,34 +83,51 @@ void VtkColorLookupTable::Build()
(static_cast<double>(nextIndex - lastValue.first));
if (_type == DataHolderLib::LUTType::LINEAR)
+ {
for (std::size_t j = 0; j < 4; j++)
+ {
int_rgba[j] = linInterpolation(
(lastValue.second)[j], (it->second)[j], pos);
+ }
+ }
else if (_type == DataHolderLib::LUTType::EXPONENTIAL)
+ {
for (std::size_t j = 0; j < 4; j++)
+ {
int_rgba[j] =
expInterpolation((lastValue.second)[j],
(it->second)[j], 0.2, pos);
- else // no interpolation
+ }
+ }
+ else
+ { // no interpolation
for (std::size_t j = 0; j < 4; j++)
+ {
int_rgba[j] = (lastValue.second)[j];
+ }
+ }
this->SetTableValueRGBA(i, int_rgba);
}
+ }
lastValue.first = nextIndex;
lastValue.second = it->second;
}
}
else
+ {
vtkLookupTable::Build();
+ }
}
void VtkColorLookupTable::setLookupTable(DataHolderLib::ColorLookupTable const& lut)
{
std::size_t const n_colors (lut.size());
- for (std::size_t i=0; i<n_colors; ++i)
+ for (std::size_t i = 0; i < n_colors; ++i)
+ {
setColor(std::get<0>(lut[i]), std::get<1>(lut[i]));
+ }
setInterpolationType(lut.getInterpolationType());
auto const range (lut.getTableRange());
SetTableRange(range.first, range.second);
@@ -137,8 +157,10 @@ void VtkColorLookupTable::SetTableValueRGBA(vtkIdType idx, unsigned char rgba[4]
{
double value[4];
- for (unsigned i=0; i<4; ++i)
- value[i] = rgba[i]/255.0;
+ for (unsigned i = 0; i < 4; ++i)
+ {
+ value[i] = rgba[i] / 255.0;
+ }
vtkLookupTable::SetTableValue(idx, value);
}
@@ -147,15 +169,19 @@ void VtkColorLookupTable::GetTableValue(vtkIdType idx, unsigned char rgba[4])
double value[4];
vtkLookupTable::GetTableValue(idx, value);
- for (unsigned i=0; i<4; ++i)
- rgba[i] = static_cast<unsigned char>(value[i]*255.0);
+ for (unsigned i = 0; i < 4; ++i)
+ {
+ rgba[i] = static_cast<unsigned char>(value[i] * 255.0);
+ }
}
void VtkColorLookupTable::setColor(double pos, DataHolderLib::Color const& color)
{
auto* dict_rgba = new unsigned char[4];
for (std::size_t i = 0; i < 4; i++)
+ {
dict_rgba[i] = color[i];
+ }
_dict.insert( std::pair<double, unsigned char*>(pos, dict_rgba) );
}
@@ -172,5 +198,7 @@ void VtkColorLookupTable::getColor(vtkIdType indx, unsigned char rgba[4]) const
unsigned char* _rgba;
_rgba = this->Table->GetPointer(indx * 4);
for (std::size_t i = 0; i < 4; i++)
+ {
rgba[i] = _rgba[i];
+ }
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
index 1b42142317bb9cf9d346d7d46495b27bdbc27c40..60289ec20fcfbd8980b1788434663c23bc553f9c 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
@@ -42,7 +42,9 @@ void VtkCompositeColorByHeightFilter::init()
heightFilter->SetInputConnection(surfaceFilter->GetOutputPort());
}
else
+ {
heightFilter->SetInputConnection(_inputAlgorithm->GetOutputPort());
+ }
DataHolderLib::Color a{{0, 0, 255, 255}}; // blue
DataHolderLib::Color b{{0, 255, 0, 255}}; // green
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
index e6df481b562edd5ad37b6607a0c5c17e8c710ea4..67b272c5bdaab019c4e9f53a11de3382ec989129 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
@@ -91,9 +91,14 @@ void VtkCompositeColormapToImageFilter::SetUserProperty( QString name, QVariant
auto* map = static_cast<vtkImageMapToColors*>(_outputAlgorithm);
if (name.compare("PassAlphaToOutput") == 0)
+ {
map->SetPassAlphaToOutput(value.toBool());
+ }
else if (name.compare("NumberOfColors") == 0)
- static_cast<vtkLookupTable*>(map->GetLookupTable())->SetNumberOfTableValues(value.toInt());
+ {
+ static_cast<vtkLookupTable*>(map->GetLookupTable())
+ ->SetNumberOfTableValues(value.toInt());
+ }
}
void VtkCompositeColormapToImageFilter::SetUserVectorProperty( QString name, QList<QVariant> values )
@@ -102,9 +107,13 @@ void VtkCompositeColormapToImageFilter::SetUserVectorProperty( QString name, QLi
auto* map = static_cast<vtkImageMapToColors*>(_outputAlgorithm);
if (name.compare("TableRange") == 0)
+ {
static_cast<vtkLookupTable*>(map->GetLookupTable())->SetTableRange(
values[0].toInt(), values[1].toInt());
+ }
else if (name.compare("HueRange") == 0)
- static_cast<vtkLookupTable*>(map->GetLookupTable())->SetHueRange(values[0].toDouble(),
- values[1].toDouble());
+ {
+ static_cast<vtkLookupTable*>(map->GetLookupTable())
+ ->SetHueRange(values[0].toDouble(), values[1].toDouble());
+ }
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
index 5aed4b887413395650d035ace53e4eb2b971bff3..f67da9347d659cfe3c5724eb65b749f83791c9c2 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
@@ -47,8 +47,10 @@ void VtkCompositeContourFilter::init()
if(dataSet)
{
vtkPointData* pointData = dataSet->GetPointData();
- if(pointData)
+ if (pointData)
+ {
pointData->GetScalars()->GetRange(range);
+ }
}
else
{
@@ -82,7 +84,10 @@ void VtkCompositeContourFilter::SetUserProperty( QString name, QVariant value )
// Use the same name as in init()
if (name.compare("Number of Contours") == 0)
- static_cast<vtkContourFilter*>(_outputAlgorithm)->SetNumberOfContours(value.toInt());
+ {
+ static_cast<vtkContourFilter*>(_outputAlgorithm)
+ ->SetNumberOfContours(value.toInt());
+ }
}
void VtkCompositeContourFilter::SetUserVectorProperty( QString name, QList<QVariant> values )
@@ -91,8 +96,12 @@ void VtkCompositeContourFilter::SetUserVectorProperty( QString name, QList<QVari
// Use the same name as in init()
if (name.compare("Range") == 0)
- static_cast<vtkContourFilter*>(_outputAlgorithm)->GenerateValues(
- VtkAlgorithmProperties::GetUserProperty("Number of Contours").toInt(),
+ {
+ static_cast<vtkContourFilter*>(_outputAlgorithm)
+ ->GenerateValues(
+ VtkAlgorithmProperties::GetUserProperty("Number of Contours")
+ .toInt(),
values[0].toDouble(),
values[1].toDouble());
+ }
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
index 406f0ef3a54f2cdda08657966fa03f4ac94776ba..22455ce148de3969a980ff477f8ebb871358fbe0 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
@@ -51,10 +51,15 @@ void VtkCompositeElementSelectionFilter::init()
}
vtkSmartPointer<vtkIdFilter> idFilter = vtkSmartPointer<vtkIdFilter>::New();
- if (_selection.empty()) // if the array is empty it is assumed that an existing array should be used
- idFilter->SetInputConnection(_inputAlgorithm->GetOutputPort());
- else
- idFilter->SetInputConnection(selFilter->GetOutputPort());
+ if (_selection.empty())
+ { // if the array is empty it is assumed that an existing array should be
+ // used
+ idFilter->SetInputConnection(_inputAlgorithm->GetOutputPort());
+ }
+ else
+ {
+ idFilter->SetInputConnection(selFilter->GetOutputPort());
+ }
idFilter->PointIdsOn();
idFilter->CellIdsOn();
idFilter->FieldDataOn();
@@ -86,8 +91,10 @@ void VtkCompositeElementSelectionFilter::SetUserVectorProperty( QString name, QL
VtkAlgorithmProperties::SetUserVectorProperty(name, values);
if (name.compare("Threshold Between") == 0)
- static_cast<vtkThreshold*>(_outputAlgorithm)->ThresholdBetween(
- values[0].toDouble(), values[1].toDouble());
+ {
+ static_cast<vtkThreshold*>(_outputAlgorithm)
+ ->ThresholdBetween(values[0].toDouble(), values[1].toDouble());
+ }
}
VtkColorLookupTable* VtkCompositeElementSelectionFilter::GetLookupTable()
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
index 6fa9bb7cdd8cd0da0e35598818ee1cb31983f66d..d76b33a3a798c269b89a0cbbc63bc4b441623a7f 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
@@ -40,9 +40,13 @@ VtkCompositeGeoObjectFilter::VtkCompositeGeoObjectFilter( vtkAlgorithm* inputAlg
vtkAlgorithm* parentAlg = ao->GetProducer();
if (dynamic_cast<VtkPolylinesSource*>(parentAlg) != nullptr)
+ {
_type = GeoLib::GEOTYPE::POLYLINE;
+ }
else if (dynamic_cast<VtkSurfacesSource*>(parentAlg) != nullptr)
+ {
_type = GeoLib::GEOTYPE::SURFACE;
+ }
else if (dynamic_cast<VtkStationSource*>(parentAlg) != nullptr)
{
/* TODO
@@ -83,7 +87,9 @@ void VtkCompositeGeoObjectFilter::init()
_outputAlgorithm = composite->GetOutputAlgorithm();
}
else
+ {
_outputAlgorithm = surface;
+ }
}
void VtkCompositeGeoObjectFilter::SetIndex(std::size_t idx)
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.cpp
index 65ad010c2dc81edb99ded57cb67f8716a9de9985..18abbc4b6e78b02d4df700b16fb4f751b808a105 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.cpp
@@ -90,16 +90,24 @@ void VtkCompositeImageToCylindersFilter::SetUserProperty( QString name, QVariant
if (name.compare("NumberOfColors") == 0)
{
vtkLookupTable* lut = this->GetLookupTable("P-Colors");
- if(lut)
+ if (lut)
+ {
lut->SetNumberOfTableValues(value.toInt());
+ }
}
else if (name.compare("NumberOfSides") == 0)
+ {
static_cast<vtkTubeFilter*>(_outputAlgorithm)->SetNumberOfSides(value.toInt());
+ }
else if (name.compare("Capping") == 0)
+ {
static_cast<vtkTubeFilter*>(_outputAlgorithm)->SetCapping(value.toBool());
+ }
else if (name.compare("RadiusFactor") == 0)
- static_cast<vtkTubeFilter*>(_outputAlgorithm)->SetRadius(
- _lineFilter->GetImageSpacing() * value.toDouble());
+ {
+ static_cast<vtkTubeFilter*>(_outputAlgorithm)
+ ->SetRadius(_lineFilter->GetImageSpacing() * value.toDouble());
+ }
}
void VtkCompositeImageToCylindersFilter::SetUserVectorProperty( QString name,
@@ -112,14 +120,18 @@ void VtkCompositeImageToCylindersFilter::SetUserVectorProperty( QString name,
if (name.compare("TableRange") == 0)
{
vtkLookupTable* lut = this->GetLookupTable("P-Colors");
- if(lut)
+ if (lut)
+ {
lut->SetTableRange(values[0].toDouble(), values[1].toDouble());
+ }
}
else if (name.compare("HueRange") == 0)
{
vtkLookupTable* lut = this->GetLookupTable("P-Colors");
- if(lut)
+ if (lut)
+ {
lut->SetHueRange(values[0].toDouble(), values[1].toDouble());
+ }
}
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeImageToPointCloudFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeImageToPointCloudFilter.cpp
index 84ee5514bac4a6cd344e1f6900fabe7c3cfad1f3..42b7de834ce26d5e090b127b82ddd26d1a51816e 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeImageToPointCloudFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeImageToPointCloudFilter.cpp
@@ -59,17 +59,21 @@ void VtkCompositeImageToPointCloudFilter::SetUserProperty(QString name, QVariant
}
if (name == "Logarithmic interpolation")
{
- if (value.toBool() == true)
+ if (value.toBool())
{
double const gamma =
VtkAlgorithmProperties::GetUserProperty("Gamma value").toDouble();
if (gamma > 0)
+ {
static_cast<VtkImageDataToPointCloudFilter*>(_outputAlgorithm)
->useLogarithmicInterpolation(gamma);
+ }
}
else
+ {
static_cast<VtkImageDataToPointCloudFilter*>(_outputAlgorithm)
->useLinearInterpolation();
+ }
}
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeImageToSurfacePointsFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeImageToSurfacePointsFilter.cpp
index ed8d6a2d19e645ea5d168963c967b1b45eeb49ef..a871e65b824aeefce5aef37052576e3232ddfb56 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeImageToSurfacePointsFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeImageToSurfacePointsFilter.cpp
@@ -45,8 +45,10 @@ void VtkCompositeImageToSurfacePointsFilter::SetUserProperty(QString name, QVari
{
VtkAlgorithmProperties::SetUserProperty(name, value);
if ((name == "Points per pixel") && (value.toInt() > 0))
+ {
static_cast<VtkImageDataToSurfacePointsFilter*>(_outputAlgorithm)
->SetPointsPerPixel(static_cast<vtkIdType>(value.toInt()));
+ }
}
void VtkCompositeImageToSurfacePointsFilter::SetUserVectorProperty(
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
index 9926c827c01ec8a3d1c3f8dbcd0583e70e7497aa..1c06bebf7f81cfbcce359f5a22a4b7a5ba7e9727 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
@@ -63,9 +63,16 @@ void VtkCompositeLineToTubeFilter::SetUserProperty( QString name, QVariant value
VtkAlgorithmProperties::SetUserProperty(name, value);
if (name.compare("Radius") == 0)
+ {
static_cast<vtkTubeFilter*>(_outputAlgorithm)->SetRadius(value.toDouble());
+ }
else if (name.compare("NumberOfSides") == 0)
+ {
static_cast<vtkTubeFilter*>(_outputAlgorithm)->SetNumberOfSides(value.toInt());
+ }
else if (name.compare("Capping") == 0)
- static_cast<vtkTubeFilter*>(_outputAlgorithm)->SetCapping(value.toBool());
+ {
+ static_cast<vtkTubeFilter*>(_outputAlgorithm)
+ ->SetCapping(value.toBool());
+ }
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
index 4eac9d00e03f07e56024f162b84bcd6ba2ff57b5..248a42ef3b4b17e0e96cd713bbf864b7e7e07656 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
@@ -34,7 +34,9 @@ VtkCompositeNodeSelectionFilter::VtkCompositeNodeSelectionFilter( vtkAlgorithm*
VtkCompositeNodeSelectionFilter::~VtkCompositeNodeSelectionFilter()
{
for (auto& item : _selection)
+ {
delete item;
+ }
}
void VtkCompositeNodeSelectionFilter::init()
@@ -57,7 +59,9 @@ void VtkCompositeNodeSelectionFilter::init()
_outputAlgorithm = glyphFilter;
}
else
+ {
_outputAlgorithm = nullptr;
+ }
}
void VtkCompositeNodeSelectionFilter::setSelectionArray(const std::vector<unsigned> &point_indeces)
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.cpp
index 15cc16e4e45e128b066f25482b2f082862507c76..0c91917f6ce3137c532d9214d5e17d54d3c6d64e 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.cpp
@@ -77,19 +77,35 @@ void VtkCompositePointToGlyphFilter::SetUserProperty( QString name, QVariant val
VtkAlgorithmProperties::SetUserProperty(name, value);
if (name.compare("Radius") == 0)
+ {
_glyphSource->SetRadius(value.toDouble());
+ }
else if (name.compare("PhiResolution") == 0)
+ {
_glyphSource->SetPhiResolution(value.toInt());
+ }
else if (name.compare("ThetaResolution") == 0)
+ {
_glyphSource->SetThetaResolution(value.toInt());
+ }
else if (name.compare("ScaleMode") == 0)
+ {
static_cast<vtkGlyph3D*>(_outputAlgorithm)->SetScaleMode(value.toInt());
+ }
else if (name.compare("ScaleFactor") == 0)
+ {
static_cast<vtkGlyph3D*>(_outputAlgorithm)->SetScaleFactor(value.toDouble());
+ }
else if (name.compare("ColorMode") == 0)
+ {
static_cast<vtkGlyph3D*>(_outputAlgorithm)->SetColorMode(value.toInt());
+ }
else if (name.compare("VectorMode") == 0)
+ {
static_cast<vtkGlyph3D*>(_outputAlgorithm)->SetVectorMode(value.toInt());
+ }
else if (name.compare("Orient") == 0)
+ {
static_cast<vtkGlyph3D*>(_outputAlgorithm)->SetOrient(value.toBool());
+ }
}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
index 5815a39ac21a7fed5a01754a311f31362ac1608d..07df92c09aec19f48fa9be0c88fe704df77dac78 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
@@ -59,7 +59,9 @@ void VtkCompositeTextureOnSurfaceFilter::init()
surface->SetInputConnection(surfaceFilter->GetOutputPort());
}
else
+ {
surface->SetInputConnection(_inputAlgorithm->GetOutputPort());
+ }
QWidget* parent = nullptr;
QSettings settings;
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
index adc3fdd09a9c3c2df037cbd6269941c7e63880d7..098cf9a53c83a33a85316adb51170dc7b4e58613 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
@@ -47,13 +47,18 @@ void VtkCompositeThresholdFilter::init()
dataSet->GetAttributes(vtkDataObject::AttributeTypes::POINT);
vtkDataSetAttributes* cellAttributes =
dataSet->GetAttributes(vtkDataObject::AttributeTypes::CELL);
- if(pointAttributes->GetNumberOfArrays() > 0)
+ if (pointAttributes->GetNumberOfArrays() > 0)
+ {
threshold->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS,
pointAttributes->GetArray(0)->GetName());
- else if(cellAttributes->GetNumberOfArrays() > 0)
+ }
+ else if (cellAttributes->GetNumberOfArrays() > 0)
+ {
threshold->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_CELLS,
cellAttributes->GetArray(0)->GetName());
- else {
+ }
+ else
+ {
WARN("Threshold filter could not find an array on its input object!")
return;
}
@@ -92,10 +97,15 @@ void VtkCompositeThresholdFilter::SetUserProperty( QString name, QVariant value
// Use the same name as in init()
if (name.compare("Selected Component") == 0)
+ {
// Set the property on the algorithm
static_cast<vtkThreshold*>(_outputAlgorithm)->SetSelectedComponent(value.toInt());
+ }
else if (name.compare("Evaluate all points") == 0)
- static_cast<vtkThreshold*>(_outputAlgorithm)->SetAllScalars(value.toBool());
+ {
+ static_cast<vtkThreshold*>(_outputAlgorithm)
+ ->SetAllScalars(value.toBool());
+ }
}
void VtkCompositeThresholdFilter::SetUserVectorProperty( QString name, QList<QVariant> values )
@@ -104,7 +114,9 @@ void VtkCompositeThresholdFilter::SetUserVectorProperty( QString name, QList<QVa
// Use the same name as in init()
if (name.compare("Range") == 0)
+ {
// Set the vector property on the algorithm
- static_cast<vtkThreshold*>(_outputAlgorithm)->ThresholdBetween(
- values[0].toDouble(), values[1].toDouble());
+ static_cast<vtkThreshold*>(_outputAlgorithm)
+ ->ThresholdBetween(values[0].toDouble(), values[1].toDouble());
+ }
}
diff --git a/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.cpp b/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.cpp
index eb4f769344c1a617a75f91b74e85487d13030abc..c5dc346ec0237cee112a94d5e8f343186ab6cabc 100644
--- a/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.cpp
@@ -30,15 +30,22 @@ VtkConsoleOutputWindow::~VtkConsoleOutputWindow() = default;
//
void VtkConsoleOutputWindow::DisplayText(const char* someText)
{
- if(!someText)
+ if (!someText)
+ {
return;
+ }
// Disable warnings
std::string someTextString(someText);
- if((someTextString.find(
- "This is very expensive for vtkMappedDataArray subclasses, since the scalar array must be generated for each call.") != std::string::npos) ||
- (someTextString.find("Invalid framebuffer operation") != std::string::npos))
+ if ((someTextString.find(
+ "This is very expensive for vtkMappedDataArray subclasses, since "
+ "the scalar array must be generated for each call.") !=
+ std::string::npos) ||
+ (someTextString.find("Invalid framebuffer operation") !=
+ std::string::npos))
+ {
return;
+ }
#ifdef WIN32
OutputDebugString(someTextString.c_str());
diff --git a/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp b/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp
index 395f04cf498e74d43be99245e6481da5930f209d..1f366fa63937baf32278b909f2a2803fb6f314a0 100644
--- a/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp
@@ -102,7 +102,9 @@ void VtkCustomInteractorStyle::OnKeyUp()
void VtkCustomInteractorStyle::highlightActor( vtkProp3D* actor )
{
if (_highlightActor)
+ {
HighlightProp((vtkProp*)actor);
+ }
}
void VtkCustomInteractorStyle::removeHighlightActor()
@@ -115,7 +117,9 @@ void VtkCustomInteractorStyle::setHighlightActor(bool on)
{
_highlightActor = on;
if (!on)
+ {
HighlightProp((vtkProp*)nullptr);
+ }
}
void VtkCustomInteractorStyle::pickableDataObject(vtkDataObject* object)
@@ -133,7 +137,9 @@ void VtkCustomInteractorStyle::pickableDataObject(vtkDataObject* object)
void VtkCustomInteractorStyle::OnLeftButtonDown()
{
if (!_data)
+ {
return vtkInteractorStyleTrackballCamera::OnLeftButtonDown();
+ }
if (_alternateMouseActions)
{
@@ -188,9 +194,13 @@ void VtkCustomInteractorStyle::OnLeftButtonDown()
auto* source =
dynamic_cast<vtkUnstructuredGridAlgorithm*>(data_set);
if (source)
+ {
emit elementPicked(source, static_cast<unsigned>(picker->GetCellId()));
+ }
else
+ {
emit clearElementView();
+ }
_selectedMapper->SetInputData(selected);
this->Interactor->GetRenderWindow()->GetRenderers()->GetFirstRenderer()->
@@ -198,19 +208,27 @@ void VtkCustomInteractorStyle::OnLeftButtonDown()
//_highlightActor = true;
}
else
- this->Interactor->GetRenderWindow()->GetRenderers()->GetFirstRenderer()->
- RemoveActor(_selectedActor);
+ {
+ this->Interactor->GetRenderWindow()
+ ->GetRenderers()
+ ->GetFirstRenderer()
+ ->RemoveActor(_selectedActor);
+ }
emit requestViewUpdate();
}
else
+ {
// Forward events
vtkInteractorStyleTrackballCamera::OnLeftButtonDown();
+ }
}
void VtkCustomInteractorStyle::OnRightButtonDown()
{
if (!_data)
+ {
return vtkInteractorStyleTrackballCamera::OnRightButtonDown();
+ }
if (_alternateMouseActions)
{
@@ -238,6 +256,8 @@ void VtkCustomInteractorStyle::OnRightButtonDown()
}
}
else
+ {
// Forward events
vtkInteractorStyleTrackballCamera::OnRightButtonDown();
+ }
}
diff --git a/Applications/DataExplorer/VtkVis/VtkFilterFactory.cpp b/Applications/DataExplorer/VtkVis/VtkFilterFactory.cpp
index f2cf4093c4cf4960c6b168d87aae5549fc0e9268..40ba01614e2566094f23b847a6f2c7914be9c529 100644
--- a/Applications/DataExplorer/VtkVis/VtkFilterFactory.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkFilterFactory.cpp
@@ -124,31 +124,57 @@ VtkCompositeFilter* VtkFilterFactory::CreateCompositeFilter( QString type,
vtkAlgorithm* inputAlgorithm )
{
if (type.compare(QString("VtkCompositeImageToCylindersFilter")) == 0)
+ {
return new VtkCompositeImageToCylindersFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositePointToGlyphFilter")) == 0)
+ {
return new VtkCompositePointToGlyphFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeLineToTubeFilter")) == 0)
+ {
return new VtkCompositeLineToTubeFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeColormapToImageFilter")) == 0)
+ {
return new VtkCompositeColormapToImageFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeTextureOnSurfaceFilter")) == 0)
+ {
return new VtkCompositeTextureOnSurfaceFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeThresholdFilter")) == 0)
+ {
return new VtkCompositeThresholdFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeColorByHeightFilter")) == 0)
+ {
return new VtkCompositeColorByHeightFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeElementSelectionFilter")) == 0)
+ {
return new VtkCompositeElementSelectionFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeNodeSelectionFilter")) == 0)
+ {
return new VtkCompositeNodeSelectionFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeContourFilter")) == 0)
+ {
return new VtkCompositeContourFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeGeoObjectFilter")) == 0)
+ {
return new VtkCompositeGeoObjectFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeImageToPointCloudFilter")) == 0)
+ {
return new VtkCompositeImageToPointCloudFilter(inputAlgorithm);
+ }
if (type.compare(QString("VtkCompositeImageToSurfacePointsFilter")) == 0)
+ {
return new VtkCompositeImageToSurfacePointsFilter(inputAlgorithm);
+ }
return nullptr;
}
@@ -156,9 +182,13 @@ VtkCompositeFilter* VtkFilterFactory::CreateCompositeFilter( QString type,
vtkAlgorithm* VtkFilterFactory::CreateSimpleFilter( QString type )
{
if (type.compare(QString("VtkImageDataToLinePolyDataFilter")) == 0)
+ {
return VtkImageDataToLinePolyDataFilter::New();
+ }
if (type.compare(QString("vtkDataSetSurfaceFilter")) == 0)
+ {
return vtkDataSetSurfaceFilter::New();
+ }
return nullptr;
}
diff --git a/Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp b/Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp
index cc547b461e686042b8eb19b6c67c15a6c9da8bc0..6990a706f753646cc4663912eb1ccd0c76b3ddef 100644
--- a/Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp
@@ -51,15 +51,20 @@ void vtkSimpleImageFilterExampleExecute(vtkImageData* input,
// HACK LB Multiply by number of scalar components due to RGBA values ?????
int size = dims[0] * dims[1] * dims[2] * input->GetNumberOfScalarComponents();
- for(int i = 0; i < size; i++)
+ for (int i = 0; i < size; i++)
+ {
outPtr[i] = inPtr[i];
+ }
}
VtkGeoImageSource::VtkGeoImageSource() = default;
VtkGeoImageSource::~VtkGeoImageSource()
{
- if(_imageSource) _imageSource->Delete();
+ if (_imageSource)
+ {
+ _imageSource->Delete();
+ }
}
void VtkGeoImageSource::PrintSelf(ostream& os, vtkIndent indent)
@@ -71,7 +76,9 @@ bool VtkGeoImageSource::readImage(const QString &filename)
{
vtkImageAlgorithm* img (VtkRaster::loadImage(filename.toStdString(), _x0, _y0, _spacing));
if (img == nullptr)
+ {
return false;
+ }
this->setImage(img, filename, _x0, _y0, _spacing);
return true;
}
diff --git a/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
index 6f0b179e5a81a0b51aedd0da19bef0c7a744b7e2..5a5516388e5b1a9cde2f103e71db77a70758d1b3 100644
--- a/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
@@ -102,7 +102,9 @@ int VtkImageDataToLinePolyDataFilter::RequestData(vtkInformation*,
// Skip translucent pixels
float opacity = ((float*)inScalarPtr)[ptId * numScalarComponents + 1];
if (opacity < 0.00000001f)
+ {
continue;
+ }
// Compute length of the new line (scalar * LengthScaleFactor)
double const length =
@@ -111,7 +113,9 @@ int VtkImageDataToLinePolyDataFilter::RequestData(vtkInformation*,
// Skip this line if length is zero
if (length < 0.00000001f)
+ {
continue;
+ }
// Get the old point location
double p[3];
@@ -119,8 +123,10 @@ int VtkImageDataToLinePolyDataFilter::RequestData(vtkInformation*,
// Compute the new point location
double newPt[3];
- for(std::size_t i = 0; i < 3; ++i)
+ for (std::size_t i = 0; i < 3; ++i)
+ {
newPt[i] = p[i] + dir[i] * length;
+ }
// Copy the old point
newPts->SetPoint(ptId * 2, p);
diff --git a/Applications/DataExplorer/VtkVis/VtkImageDataToPointCloudFilter.cpp b/Applications/DataExplorer/VtkVis/VtkImageDataToPointCloudFilter.cpp
index b5db9e2d2be67345acc46ff0af6a49219ebf43bc..9ced528d8d369bf2483e0dd099c044c8dbba5052 100644
--- a/Applications/DataExplorer/VtkVis/VtkImageDataToPointCloudFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkImageDataToPointCloudFilter.cpp
@@ -110,7 +110,9 @@ int VtkImageDataToPointCloudFilter::RequestData(
for (std::size_t i = 0; i < static_cast<std::size_t>(n_points); ++i)
{
if (density[i] == 0)
+ {
continue;
+ }
double p[3];
input->GetPoint(i, p);
diff --git a/Applications/DataExplorer/VtkVis/VtkImageDataToSurfacePointsFilter.cpp b/Applications/DataExplorer/VtkVis/VtkImageDataToSurfacePointsFilter.cpp
index e9171c690dfda45fc63f7497914ac83736b7e35c..356a51e9dd5539f46c4883b254dae206330f7c3e 100644
--- a/Applications/DataExplorer/VtkVis/VtkImageDataToSurfacePointsFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkImageDataToSurfacePointsFilter.cpp
@@ -87,9 +87,13 @@ int VtkImageDataToSurfacePointsFilter::RequestData(
{
if ((n_comp == 2 || n_comp == 4) &&
(((float*)pixvals)[(i + 1) * n_comp - 1] < 0.00000001f))
+ {
pixels.push_back(-9999);
+ }
else
+ {
pixels.push_back(((float*)pixvals)[i * n_comp]);
+ }
}
GeoLib::Raster const* const raster(new GeoLib::Raster(
{static_cast<std::size_t>(dimensions[0]),
@@ -110,7 +114,9 @@ int VtkImageDataToSurfacePointsFilter::RequestData(
if (n_comp == 2 || n_comp == 4)
{
if (((float*)pixvals)[(i + 1) * n_comp - 1] < 0.00000001f)
+ {
continue;
+ }
}
double p[3];
diff --git a/Applications/DataExplorer/VtkVis/VtkPickCallback.cpp b/Applications/DataExplorer/VtkVis/VtkPickCallback.cpp
index f8c77c6d613d6b9eedaa21e2bedabf4e6aaaabbd..202085209ccc057dfecbdc9ca44968400c3fe52e 100644
--- a/Applications/DataExplorer/VtkVis/VtkPickCallback.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPickCallback.cpp
@@ -37,7 +37,9 @@ void VtkPickCallback::Execute( vtkObject* caller, unsigned long vtkNotUsed(
{
vtkActor* actor = picker->GetActor();
if (actor)
- emit actorPicked (actor);
+ {
+ emit actorPicked(actor);
+ }
double* pos = picker->GetPickPosition();
INFO("Picked cell id is: %d", picker->GetCellId());
diff --git a/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
index bdec78b3a6207c376bb550e81592c07d35370a28..13fbe2d711d158906b471d4fcfdcecf6d14a23e3 100644
--- a/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
@@ -46,7 +46,9 @@ void VtkPointsSource::PrintSelf( ostream& os, vtkIndent indent )
this->Superclass::PrintSelf(os,indent);
if (_points->empty())
+ {
return;
+ }
os << indent << "== VtkPointsSource ==" << "\n";
@@ -68,7 +70,9 @@ int VtkPointsSource::RequestData( vtkInformation* request,
(void)inputVector;
if (!_points)
+ {
return 0;
+ }
int numPoints = _points->size();
if (numPoints == 0)
{
@@ -90,8 +94,11 @@ int VtkPointsSource::RequestData( vtkInformation* request,
pointIDs->SetNumberOfValues(numPoints);
pointIDs->SetName("PointIDs");
- if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) > 0)
+ if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) >
+ 0)
+ {
return 1;
+ }
// Generate points and vertices
unsigned i = 0;
diff --git a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
index 39e31b83a9990662d3cdd4e68635359300d9b216..f42f49f4d99abbe0e04a7b8983b4e43b038e6e95 100644
--- a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
@@ -52,7 +52,9 @@ void VtkPolylinesSource::PrintSelf( ostream& os, vtkIndent indent )
this->Superclass::PrintSelf(os,indent);
if (_polylines->empty())
+ {
return;
+ }
for (auto polyline : *_polylines)
{
@@ -76,7 +78,9 @@ int VtkPolylinesSource::RequestData( vtkInformation* request,
(void)inputVector;
if (!_polylines)
+ {
return 0;
+ }
if (_polylines->empty())
{
ERR("VtkPolylineSource::RequestData(): Size of polyline vector is 0");
@@ -93,8 +97,11 @@ int VtkPolylinesSource::RequestData( vtkInformation* request,
//newPoints->Allocate(numPoints);
//newLines->Allocate(newLines->EstimateSize(numLines, 2));
- if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) > 0)
+ if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) >
+ 0)
+ {
return 1;
+ }
vtkSmartPointer<vtkIntArray> plyIDs = vtkSmartPointer<vtkIntArray>::New();
plyIDs->SetNumberOfComponents(1);
@@ -120,10 +127,14 @@ int VtkPolylinesSource::RequestData( vtkInformation* request,
newLines->InsertNextCell(numPoints);
plyIDs->InsertNextValue(j);
for (int i = 0; i < numVerts; i++)
- newLines->InsertCellPoint(i + lastMaxIndex);
+ {
+ newLines->InsertCellPoint(i + lastMaxIndex);
+ }
- if(isClosed)
+ if (isClosed)
+ {
newLines->InsertCellPoint(lastMaxIndex);
+ }
lastMaxIndex += numVerts;
}
diff --git a/Applications/DataExplorer/VtkVis/VtkRaster.cpp b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
index 13ec84a79e9c8eb31982d20b42879cce4798faff..918a0fb7cb5a20067a4e1cfd470fea27f2310a69 100644
--- a/Applications/DataExplorer/VtkVis/VtkRaster.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
@@ -47,11 +47,19 @@ vtkImageAlgorithm* VtkRaster::loadImage(const std::string &fileName,
std::unique_ptr<GeoLib::Raster> raster(nullptr);
if (fileInfo.suffix().toLower() == "asc")
+ {
raster.reset(FileIO::AsciiRasterInterface::getRasterFromASCFile(fileName));
+ }
else if (fileInfo.suffix().toLower() == "grd")
- raster.reset(FileIO::AsciiRasterInterface::getRasterFromSurferFile(fileName));
+ {
+ raster.reset(
+ FileIO::AsciiRasterInterface::getRasterFromSurferFile(fileName));
+ }
if (raster)
- return VtkRaster::loadImageFromArray(raster->begin(), raster->getHeader());
+ {
+ return VtkRaster::loadImageFromArray(raster->begin(),
+ raster->getHeader());
+ }
if ((fileInfo.suffix().toLower() == "tif") ||
(fileInfo.suffix().toLower() == "tiff"))
{
@@ -83,7 +91,9 @@ vtkImageImport* VtkRaster::loadImageFromArray(double const*const data_array, Geo
data[j*2+1] = 0;
}
else
- data[j*2+1] = max_val;
+ {
+ data[j * 2 + 1] = max_val;
+ }
}
vtkImageImport* image = vtkImageImport::New();
@@ -156,6 +166,7 @@ vtkImageAlgorithm* VtkRaster::loadImageFromTIFF(const std::string& fileName,
auto* pixVal =
(uint32*)_TIFFmalloc(imgWidth * imgHeight * sizeof(uint32));
if ((imgWidth > 0) && (imgHeight > 0))
+ {
if (!TIFFReadRGBAImage(tiff, imgWidth, imgHeight, pixVal, 0))
{
ERR("VtkRaster::loadImageFromTIFF(): reading GeoTIFF file.");
@@ -164,6 +175,7 @@ vtkImageAlgorithm* VtkRaster::loadImageFromTIFF(const std::string& fileName,
XTIFFClose(tiff);
return nullptr;
}
+ }
// check for colormap
uint16 photometric;
@@ -210,11 +222,17 @@ vtkImageAlgorithm* VtkRaster::loadImageFromTIFF(const std::string& fileName,
float max_val(0);
unsigned nPixels = 4*imgWidth*imgHeight;
for (unsigned j = 0; j < nPixels; ++j)
- if (data[j]>max_val)
+ {
+ if (data[j] > max_val)
+ {
max_val = data[j];
+ }
+ }
- for (unsigned j = 0; j < nPixels; j+=4)
- data[j+3] = max_val;
+ for (unsigned j = 0; j < nPixels; j += 4)
+ {
+ data[j + 3] = max_val;
+ }
}
vtkImageImport* image = vtkImageImport::New();
@@ -251,15 +269,23 @@ vtkImageReader2* VtkRaster::loadImageFromFile(const std::string &fileName)
vtkImageReader2* image(nullptr);
if (fi.suffix().toLower() == "png")
+ {
image = vtkPNGReader::New();
+ }
else if ((fi.suffix().toLower() == "tif") ||
(fi.suffix().toLower() == "tiff"))
+ {
image = vtkTIFFReader::New();
+ }
else if ((fi.suffix().toLower() == "jpg") ||
(fi.suffix().toLower() == "jpeg"))
+ {
image = vtkJPEGReader::New();
+ }
else if (fi.suffix().toLower() == "bmp")
+ {
image = vtkBMPReader::New();
+ }
else
{
ERR("VtkRaster::readImageFromFile(): File format not supported, please "
@@ -288,7 +314,9 @@ std::string VtkRaster::findWorldFile(std::string const& filename)
for (auto& ext : supported_extensions)
{
if (BaseLib::IsFileExisting(no_ext + ext))
+ {
return no_ext + ext;
+ }
}
// no world file found
@@ -316,14 +344,20 @@ bool VtkRaster::readWorldFile(std::string const& filename,
std::string line("");
// x-scaling
if (!std::getline(in, line))
+ {
return false;
+ }
double const delta_x = BaseLib::str2number<double>(line);
// 2x rotation (ignored)
if (!(std::getline(in, line) && std::getline(in, line)))
+ {
return false;
+ }
// negative y-scaling
if (!std::getline(in, line))
+ {
return false;
+ }
double const delta_y = BaseLib::str2number<double>(line);
if (delta_x != -delta_y)
WARN("Anisotropic pixel size detected (%f vs %f). An isotropic "
@@ -331,11 +365,15 @@ bool VtkRaster::readWorldFile(std::string const& filename,
delta_x, delta_y, delta_x)
// x-translation
if (!std::getline(in, line))
+ {
return false;
+ }
double const x0 = BaseLib::str2number<double>(line);
// y-translation
if (!std::getline(in, line))
+ {
return false;
+ }
double const y0 = BaseLib::str2number<double>(line);
int extent[3];
diff --git a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
index d7a2279203907ef0b4fec1f451027624d57529b4..66e05d315ab9c2bc76db2643c34324f804241da1 100644
--- a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp
@@ -49,7 +49,9 @@ void VtkStationSource::PrintSelf( ostream& os, vtkIndent indent )
this->Superclass::PrintSelf(os,indent);
if (_stations->empty())
+ {
return;
+ }
os << indent << "== VtkStationSource ==" << "\n";
@@ -72,19 +74,25 @@ int VtkStationSource::RequestData( vtkInformation* request,
(void)inputVector;
if (!_stations)
+ {
return 0;
+ }
std::size_t nStations = _stations->size();
if (nStations == 0)
+ {
return 0;
+ }
bool useStationValues(false);
double sValue=static_cast<GeoLib::Station*>((*_stations)[0])->getStationValue();
for (std::size_t i = 1; i < nStations; i++)
+ {
if (static_cast<GeoLib::Station*>((*_stations)[i])->getStationValue() != sValue)
{
useStationValues = true;
break;
}
+ }
bool isBorehole = static_cast<GeoLib::Station*>((*_stations)[0])->type() ==
GeoLib::Station::StationType::BOREHOLE;
@@ -100,10 +108,15 @@ int VtkStationSource::RequestData( vtkInformation* request,
vtkSmartPointer<vtkCellArray> newLines;
if (isBorehole)
+ {
newLines = vtkSmartPointer<vtkCellArray>::New();
+ }
- if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) > 0)
+ if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) >
+ 0)
+ {
return 1;
+ }
vtkSmartPointer<vtkIntArray> station_ids = vtkSmartPointer<vtkIntArray>::New();
station_ids->SetNumberOfComponents(1);
@@ -127,11 +140,15 @@ int VtkStationSource::RequestData( vtkInformation* request,
vtkIdType sid = newStations->InsertNextPoint(coords);
station_ids->InsertNextValue(site_count);
if (useStationValues)
+ {
station_values->InsertNextValue(
static_cast<GeoLib::Station*>(station)->getStationValue());
+ }
if (!isBorehole)
+ {
newVerts->InsertNextCell(1, &sid);
+ }
else
{
std::vector<GeoLib::Point*> profile =
@@ -153,9 +170,11 @@ int VtkStationSource::RequestData( vtkInformation* request,
++lastMaxIndex); // end of boreholelayer
strat_ids->InsertNextValue(this->GetIndexByName(soilNames[i]));
if (useStationValues)
+ {
station_values->InsertNextValue(
static_cast<GeoLib::Station*>(station)
->getStationValue());
+ }
}
lastMaxIndex++;
}
@@ -178,7 +197,9 @@ int VtkStationSource::RequestData( vtkInformation* request,
output->GetCellData()->SetActiveAttribute("Stratigraphies", vtkDataSetAttributes::SCALARS);
}
if (useStationValues)
+ {
output->GetPointData()->AddArray(station_values);
+ }
output->Squeeze();
@@ -201,12 +222,16 @@ void VtkStationSource::SetUserProperty( QString name, QVariant value )
std::size_t VtkStationSource::GetIndexByName( std::string const& name )
{
vtkIdType max_key(0);
- for (auto it = _id_map.begin(); it != _id_map.end(); ++it)
+ for (auto& it : _id_map)
{
- if (name == it->first)
- return it->second;
- if (it->second > max_key)
- max_key = it->second;
+ if (name == it.first)
+ {
+ return it.second;
+ }
+ if (it.second > max_key)
+ {
+ max_key = it.second;
+ }
}
vtkIdType new_index = (_id_map.empty()) ? 0 : (max_key+1);
diff --git a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
index aef2a108b942a99b9c28f5443b13d1e7af595d3d..ad5e0c938822e98ff63967cbb4e93ecba1f72bc6 100644
--- a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
@@ -49,7 +49,9 @@ void VtkSurfacesSource::PrintSelf( ostream& os, vtkIndent indent )
this->Superclass::PrintSelf(os,indent);
if (_surfaces->empty())
+ {
return;
+ }
os << indent << "== VtkSurfacesSource ==" << "\n";
}
@@ -63,7 +65,9 @@ int VtkSurfacesSource::RequestData( vtkInformation* request,
const int nSurfaces = _surfaces->size();
if (nSurfaces == 0)
+ {
return 0;
+ }
const std::vector<GeoLib::Point*>* surfacePoints = (*_surfaces)[0]->getPointVec();
std::size_t nPoints = surfacePoints->size();
@@ -71,8 +75,11 @@ int VtkSurfacesSource::RequestData( vtkInformation* request,
vtkSmartPointer<vtkInformation> outInfo = outputVector->GetInformationObject(0);
vtkSmartPointer<vtkPolyData> output =
vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()));
- if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) > 0)
+ if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) >
+ 0)
+ {
return 1;
+ }
vtkSmartPointer<vtkPoints> newPoints = vtkSmartPointer<vtkPoints>::New();
newPoints->SetNumberOfPoints(nPoints);
@@ -102,7 +109,9 @@ int VtkSurfacesSource::RequestData( vtkInformation* request,
const GeoLib::Triangle* triangle = (*surface)[i];
for (std::size_t j = 0; j < 3; ++j)
+ {
new_tri->GetPointIds()->SetId(j, ((*triangle)[j]));
+ }
newPolygons->InsertNextCell(new_tri);
sfcIDs->InsertNextValue(count);
new_tri->Delete();
diff --git a/Applications/DataExplorer/VtkVis/VtkVisHelper.cpp b/Applications/DataExplorer/VtkVis/VtkVisHelper.cpp
index b128881d5c0a5b84a0c3bfe0258be5059281e826..ee247009731c605b51f93a0b2f17b33779c1f0c7 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisHelper.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisHelper.cpp
@@ -31,6 +31,7 @@ vtkImageData* VtkVisHelper::QImageToVtkImageData(QImage &img)
data->SetNumberOfTuples( imgWidth * imgHeight );
for (std::size_t j = 0; j < imgHeight; j++)
+ {
for (std::size_t i = 0; i < imgWidth; i++)
{
QRgb pix = img.pixel(i,j);
@@ -40,6 +41,7 @@ vtkImageData* VtkVisHelper::QImageToVtkImageData(QImage &img)
};
data->SetTuple(j * imgWidth + i, color);
}
+ }
vtkImageData* imgData = vtkImageData::New();
imgData->SetExtent(0, imgWidth - 1, 0, imgHeight - 1, 0, 0);
diff --git a/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
index 592497d42ffd6a4cda2316d4823872f1ced2ffb5..b1d5dd73a932e8ba0eb83a55d0398fa1fb49c668 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
@@ -96,7 +96,9 @@ void VtkVisImageItem::Initialize(vtkRenderer* renderer)
// Set pre-set properties
auto* vtkProps = dynamic_cast<VtkAlgorithmProperties*>(_algorithm);
if (vtkProps)
+ {
setVtkProperties(vtkProps);
+ }
auto* parentItem = dynamic_cast<VtkVisPipelineItem*>(this->parentItem());
while (parentItem)
@@ -113,8 +115,10 @@ void VtkVisImageItem::Initialize(vtkRenderer* renderer)
parentItem = nullptr;
}
else
+ {
parentItem =
dynamic_cast<VtkVisPipelineItem*>(parentItem->parentItem());
+ }
}
// Set active scalar to the desired one from VtkAlgorithmProperties
@@ -122,15 +126,21 @@ void VtkVisImageItem::Initialize(vtkRenderer* renderer)
if (vtkProps)
{
if (vtkProps->GetActiveAttribute().length() > 0)
+ {
this->SetActiveAttribute(vtkProps->GetActiveAttribute());
+ }
else
{
auto* visParentItem =
dynamic_cast<VtkVisPipelineItem*>(this->parentItem());
if (visParentItem)
+ {
this->SetActiveAttribute(visParentItem->GetActiveAttribute());
+ }
if (vtkProps->GetTexture() != nullptr)
+ {
this->SetActiveAttribute("Solid Color");
+ }
}
}
}
@@ -151,7 +161,9 @@ int VtkVisImageItem::callVTKWriter(vtkAlgorithm* algorithm, const std::string &f
vtkSmartPointer<vtkXMLImageDataWriter>::New();
iWriter->SetInputData(algID->GetOutputDataObject(0));
if (BaseLib::getFileExtension(filename) != "vti")
+ {
file_name_cpy.append(".vti");
+ }
iWriter->SetFileName(file_name_cpy.c_str());
return iWriter->Write();
}
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
index 738e5b30c7afd0d470b59556802f60cf5674d82c..c7f4101b1046fd489e59d8a9da8995fd5ba75aaa 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
@@ -75,7 +75,9 @@ VtkVisPipeline::VtkVisPipeline( vtkRenderer* renderer, QObject* parent /*= 0*/ )
QSettings settings;
QVariant backgroundColorVariant = settings.value("VtkBackgroundColor");
if (backgroundColorVariant != QVariant())
+ {
this->setBGColor(backgroundColorVariant.value<QColor>());
+ }
_resetCameraOnAddOrRemove = settings.value("resetViewOnLoad", true).toBool();
}
@@ -94,8 +96,11 @@ void VtkVisPipeline::addLight(const GeoLib::Point &pos)
for (auto& light : _lights)
{
light->GetPosition(lightPos);
- if (pos[0] == lightPos[0] && pos[1] == lightPos[1] && pos[2] == lightPos[2])
+ if (pos[0] == lightPos[0] && pos[1] == lightPos[1] &&
+ pos[2] == lightPos[2])
+ {
return;
+ }
}
vtkLight* l = vtkLight::New();
l->SetPosition(pos[0], pos[1], pos[2]);
@@ -109,8 +114,11 @@ vtkLight* VtkVisPipeline::getLight(const GeoLib::Point &pos) const
for (auto light : _lights)
{
light->GetPosition(lightPos);
- if (pos[0] == lightPos[0] && pos[1] == lightPos[1] && pos[2] == lightPos[2])
+ if (pos[0] == lightPos[0] && pos[1] == lightPos[1] &&
+ pos[2] == lightPos[2])
+ {
return light;
+ }
}
return nullptr;
}
@@ -157,7 +165,9 @@ Qt::ItemFlags VtkVisPipeline::flags( const QModelIndex &index ) const
Qt::ItemFlags defaultFlags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
if (!index.isValid())
+ {
return Qt::ItemIsEnabled;
+ }
//if (index.column() == 1)
// defaultFlags |= Qt::ItemIsEditable;
@@ -177,15 +187,25 @@ void VtkVisPipeline::loadFromFile(QString filename)
{
vtkSmartPointer<vtkXMLDataReader> reader;
if (filename.endsWith("vti"))
+ {
reader = vtkSmartPointer<vtkXMLImageDataReader>::New();
+ }
else if (filename.endsWith("vtr"))
+ {
reader = vtkSmartPointer<vtkXMLRectilinearGridReader>::New();
+ }
else if (filename.endsWith("vts"))
+ {
reader = vtkSmartPointer<vtkXMLStructuredGridReader>::New();
+ }
else if (filename.endsWith("vtp"))
+ {
reader = vtkSmartPointer<vtkXMLPolyDataReader>::New();
+ }
else if (filename.endsWith("vtu"))
+ {
reader = vtkSmartPointer<vtkXMLUnstructuredGridReader>::New();
+ }
else if (filename.endsWith("vtk"))
{
vtkGenericDataObjectReader* oldStyleReader =
@@ -205,7 +225,9 @@ void VtkVisPipeline::loadFromFile(QString filename)
return;
}
else
+ {
return;
+ }
reader->SetFileName(filename.toStdString().c_str());
// TODO: insert ReadAllScalarsOn()-equivalent for xml-file-reader here, otherwise arrays are not available in GUI!
@@ -286,21 +308,28 @@ QModelIndex VtkVisPipeline::addPipelineItem(VtkVisPipelineItem* item, const QMod
if (!parent.isValid()) // Set global superelevation on source objects
{
QSettings settings;
- if (dynamic_cast<vtkImageAlgorithm*>(item->algorithm()) ==
- nullptr) // if not an image
- item->setScale(1.0, 1.0, settings.value("globalSuperelevation", 1.0).toDouble());
+ if (dynamic_cast<vtkImageAlgorithm*>(item->algorithm()) == nullptr)
+ { // if not an image
+ item->setScale(
+ 1.0, 1.0,
+ settings.value("globalSuperelevation", 1.0).toDouble());
+ }
}
int parentChildCount = parentItem->childCount();
QModelIndex newIndex = index(parentChildCount - 1, 0, parent);
if (_resetCameraOnAddOrRemove || _rootItem->childCount() == 1)
+ {
_renderer->ResetCamera(_renderer->ComputeVisiblePropBounds());
+ }
_actorMap.insert(item->actor(), newIndex);
// Do not interpolate images
if (dynamic_cast<vtkImageAlgorithm*>(item->algorithm()))
+ {
static_cast<vtkImageActor*>(item->actor())->InterpolateOff();
+ }
endResetModel();
emit vtkVisPipelineChanged();
@@ -321,28 +350,44 @@ QModelIndex VtkVisPipeline::addPipelineItem( vtkAlgorithm* source, QModelIndex p
auto* props = dynamic_cast<VtkAlgorithmProperties*>(source);
auto* meshSource = dynamic_cast<MeshLib::VtkMappedMeshSource*>(source);
if (old_reader)
+ {
itemName = old_reader->GetFileName();
+ }
else if (new_reader)
+ {
itemName = new_reader->GetFileName();
+ }
else if (image_reader)
+ {
itemName = image_reader->GetFileName();
+ }
else if (props)
+ {
itemName = props->GetName().toStdString();
+ }
else if (meshSource)
+ {
itemName = meshSource->GetMesh()->getName();
+ }
}
if (itemName.length() == 0)
+ {
itemName = source->GetClassName();
+ }
QList<QVariant> itemData;
itemData << QString::fromStdString(itemName) << true;
VtkVisPipelineItem* item(nullptr);
if (dynamic_cast<vtkImageAlgorithm*>(source))
+ {
item = new VtkVisImageItem(source, getItem(parent), itemData);
+ }
else
+ {
item = new VtkVisPointSetItem(source, getItem(parent), itemData);
+ }
return this->addPipelineItem(item, parent);
}
@@ -393,7 +438,9 @@ void VtkVisPipeline::removeSourceItem(MeshModel* model, const QModelIndex &idx)
void VtkVisPipeline::removePipelineItem( QModelIndex index )
{
if (!index.isValid())
+ {
return;
+ }
QMap<vtkProp3D*, QModelIndex>::iterator it = _actorMap.begin();
while (it != _actorMap.end())
@@ -411,7 +458,9 @@ void VtkVisPipeline::removePipelineItem( QModelIndex index )
removeRows(index.row(), 1, index.parent());
if (_resetCameraOnAddOrRemove)
+ {
_renderer->ResetCamera(_renderer->ComputeVisiblePropBounds());
+ }
emit vtkVisPipelineChanged();
}
@@ -438,7 +487,9 @@ void VtkVisPipeline::showMeshElementQuality(
MeshLib::MeshQualityType t, std::vector<double> const& quality)
{
if (!source || quality.empty())
+ {
return;
+ }
int const nSources = this->_rootItem->childCount();
for (int i = 0; i < nSources; i++)
@@ -446,7 +497,9 @@ void VtkVisPipeline::showMeshElementQuality(
auto* parentItem =
static_cast<VtkVisPipelineItem*>(_rootItem->child(i));
if (parentItem->algorithm() != source)
+ {
continue;
+ }
QList<QVariant> itemData;
itemData << "MeshQuality: " +
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
index 003a46b61ad49ff8fa610c87e2003a0a15df307a..7d3b8c8b9805016894df45c7fc9d8e8fe57b28a0 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
@@ -55,8 +55,10 @@ VtkVisPipelineItem::VtkVisPipelineItem(
{
auto* visParentItem = dynamic_cast<VtkVisPipelineItem*>(parentItem);
if (parentItem->parentItem())
+ {
_algorithm->SetInputConnection(
visParentItem->algorithm()->GetOutputPort());
+ }
}
VtkVisPipelineItem::VtkVisPipelineItem(
@@ -82,7 +84,9 @@ VtkVisPipelineItem* VtkVisPipelineItem::child( int row ) const
{
TreeItem* treeItem = TreeItem::child(row);
if (treeItem)
+ {
return dynamic_cast<VtkVisPipelineItem*>(treeItem);
+ }
return nullptr;
}
@@ -90,7 +94,9 @@ VtkVisPipelineItem* VtkVisPipelineItem::child( int row ) const
QVariant VtkVisPipelineItem::data( int column ) const
{
if (column == 1)
+ {
return isVisible();
+ }
return TreeItem::data(column);
}
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp
index 777a44577fb3edf606fe1fdacf7546969fe4ec92..2b3258aafe4c88098debf09503be6e4c27ae2e7f 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp
@@ -180,7 +180,9 @@ void VtkVisPipelineView::showImageToMeshConversionDialog()
{
MeshFromRasterDialog dlg;
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
vtkSmartPointer<vtkAlgorithm> algorithm =
static_cast<VtkVisPipelineItem*>(static_cast<VtkVisPipeline*>(this->model())->
@@ -200,7 +202,9 @@ void VtkVisPipelineView::showImageToMeshConversionDialog()
emit meshAdded(mesh);
}
else
+ {
OGSError::box("Error creating mesh.");
+ }
}
void VtkVisPipelineView::convertVTKToOGSMesh()
@@ -212,13 +216,17 @@ void VtkVisPipelineView::convertVTKToOGSMesh()
vtkUnstructuredGrid* grid(nullptr);
vtkUnstructuredGridAlgorithm* ugAlg = vtkUnstructuredGridAlgorithm::SafeDownCast(algorithm);
if (ugAlg)
+ {
grid = ugAlg->GetOutput();
+ }
else
{
// for old filetypes
vtkGenericDataObjectReader* dataReader = vtkGenericDataObjectReader::SafeDownCast(algorithm);
if (dataReader)
+ {
grid = vtkUnstructuredGrid::SafeDownCast(dataReader->GetOutput());
+ }
else
{
// for new filetypes
@@ -237,7 +245,9 @@ void VtkVisPipelineView::selectionChanged( const QItemSelection &selected,
QTreeView::selectionChanged(selected, deselected);
if (selected.empty())
+ {
return;
+ }
QModelIndex index = *selected.indexes().begin();
if (index.isValid())
@@ -246,8 +256,10 @@ void VtkVisPipelineView::selectionChanged( const QItemSelection &selected,
emit actorSelected(item->actor());
emit itemSelected(item);
if (item->transformFilter())
+ {
emit dataObjectSelected(vtkDataObject::SafeDownCast(
item->transformFilter()->GetOutputDataObject(0)));
+ }
}
else
{
@@ -265,7 +277,9 @@ void VtkVisPipelineView::selectItem(vtkProp3D* actor)
void VtkVisPipelineView::selectItem(const QModelIndex &index)
{
if (!index.isValid())
+ {
return;
+ }
QItemSelectionModel* selectionModel = this->selectionModel();
selectionModel->clearSelection();
@@ -299,10 +313,12 @@ void VtkVisPipelineView::addColorTable()
}
}
else
+ {
QMessageBox::warning(nullptr,
"Color lookup table could not be applied.",
"Color lookup tables can only be applied to "
"VtkVisPointSetItem.");
+ }
QDir dir = QDir(filename);
settings.setValue("lastOpenedLutFileDirectory", dir.absolutePath());
}
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
index 538e88df6c73eba99c1e4187d0974448b3cd482d..cf124a12c491ddd58977f0d8e4ade3b273999058 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
@@ -67,14 +67,18 @@ VtkVisPointSetItem::VtkVisPointSetItem(
// special case if parent is image but child is not (e.g.
// Image2BarChartFilter)
if (dynamic_cast<vtkImageAlgorithm*>(visParentItem->algorithm()))
+ {
_algorithm->SetInputConnection(
visParentItem->algorithm()->GetOutputPort());
+ }
else
{
auto* pointSetItem = dynamic_cast<VtkVisPointSetItem*>(parentItem);
if (pointSetItem)
+ {
_algorithm->SetInputConnection(
pointSetItem->transformFilter()->GetOutputPort());
+ }
}
}
}
@@ -135,8 +139,10 @@ void VtkVisPointSetItem::Initialize(vtkRenderer* renderer)
{
VtkAlgorithmProperties* parentProps = nullptr;
if (dynamic_cast<VtkVisPointSetItem*>(parentItem))
+ {
parentProps = dynamic_cast<VtkVisPointSetItem*>(parentItem)
->getVtkProperties();
+ }
if (parentProps)
{
vtkProps =
@@ -149,13 +155,17 @@ void VtkVisPointSetItem::Initialize(vtkRenderer* renderer)
parentItem = nullptr;
}
else
+ {
parentItem = dynamic_cast<VtkVisPipelineItem*>(
parentItem->parentItem());
+ }
}
// Has no parents
if (!vtkProps)
- vtkProps = new VtkAlgorithmProperties(); // TODO memory leak?
+ {
+ vtkProps = new VtkAlgorithmProperties(); // TODO memory leak?
+ }
}
}
_vtkProps = vtkProps;
@@ -165,9 +175,13 @@ void VtkVisPointSetItem::Initialize(vtkRenderer* renderer)
// Get first scalar and set it to active
QStringList arrayNames = this->getScalarArrayNames();
if (arrayNames.length() > 0)
+ {
vtkProps->SetActiveAttribute(arrayNames[0]);
+ }
else
+ {
vtkProps->SetActiveAttribute("Solid Color");
+ }
}
this->setVtkProperties(vtkProps);
this->SetActiveAttribute(vtkProps->GetActiveAttribute());
@@ -192,7 +206,9 @@ void VtkVisPointSetItem::Initialize(vtkRenderer* renderer)
// Show edges on meshes
if (dynamic_cast<MeshLib::VtkMappedMeshSource*>(this->_algorithm))
+ {
_vtkProps->GetProperties()->SetEdgeVisibility(1);
+ }
}
void VtkVisPointSetItem::SetScalarVisibility( bool on )
@@ -221,7 +237,9 @@ void VtkVisPointSetItem::setVtkProperties(VtkAlgorithmProperties* vtkProps)
}
if (!vtkProps->GetScalarVisibility())
+ {
vtkProps->SetScalarVisibility(false);
+ }
}
}
@@ -235,7 +253,9 @@ int VtkVisPointSetItem::callVTKWriter(vtkAlgorithm* algorithm, const std::string
vtkSmartPointer<vtkXMLPolyDataWriter>::New();
pdWriter->SetInputData(algPD->GetOutputDataObject(0));
if (BaseLib::getFileExtension(filename) != "vtp")
+ {
file_name_cpy.append(".vtp");
+ }
pdWriter->SetFileName(file_name_cpy.c_str());
return pdWriter->Write();
}
@@ -247,7 +267,9 @@ int VtkVisPointSetItem::callVTKWriter(vtkAlgorithm* algorithm, const std::string
vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
ugWriter->SetInputData(algUG->GetOutputDataObject(0));
if (BaseLib::getFileExtension(filename) != "vtu")
+ {
file_name_cpy.append(".vtu");
+ }
ugWriter->SetFileName(file_name_cpy.c_str());
return ugWriter->Write();
}
@@ -260,9 +282,13 @@ void VtkVisPointSetItem::SetActiveAttribute( const QString& name )
{
// Get type by identifier
if (name.contains(QRegExp("^P-")))
+ {
_onPointData = true;
+ }
else if (name.contains(QRegExp("^C-")))
+ {
_onPointData = false;
+ }
else if (name.contains("Solid Color"))
{
_vtkProps->SetActiveAttribute("Solid Color");
@@ -270,14 +296,18 @@ void VtkVisPointSetItem::SetActiveAttribute( const QString& name )
return;
}
else
+ {
return;
+ }
// Remove type identifier
_activeArrayName = QString(name).remove(0, 2).toStdString();
vtkDataSet* dataSet = vtkDataSet::SafeDownCast(this->_algorithm->GetOutputDataObject(0));
if (!dataSet)
+ {
return;
+ }
double range[2];
GetRangeForActiveAttribute(range);
@@ -331,7 +361,9 @@ bool VtkVisPointSetItem::activeAttributeExists(vtkDataSetAttributes* data, std::
{
std::string arrayName = data->GetArrayName(i);
if (arrayName == name)
+ {
arrayFound = true;
+ }
}
if (arrayFound)
{
@@ -389,8 +421,10 @@ void VtkVisPointSetItem::GetRangeForActiveAttribute(double range[2]) const
if (_onPointData)
{
vtkPointData* pointData = dataSet->GetPointData();
- if(pointData)
+ if (pointData)
+ {
pointData->GetArray(_activeArrayName.c_str())->GetRange(range);
+ }
}
else
{
diff --git a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
index ea045e85212625c266b1dcca7dad2f662e23a635..1fdcd3dc1f3c8f4d2067aec18fef4c4f16bb9026 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
@@ -105,6 +105,7 @@ void VtkVisTabWidget::setActiveItem( VtkVisPipelineItem* item )
// Set to last active attribute
QString activeAttribute = _item->GetActiveAttribute();
if (activeAttribute.length() > 0)
+ {
for (int i = 0; i < this->activeScalarComboBox->count(); i++)
{
QString itemText = this->activeScalarComboBox->itemText(i);
@@ -114,6 +115,7 @@ void VtkVisTabWidget::setActiveItem( VtkVisPipelineItem* item )
break;
}
}
+ }
}
else // if image
{
@@ -202,9 +204,11 @@ void VtkVisTabWidget::on_scaleZ_textChanged(const QString &text)
dynamic_cast<VtkCompositeColorByHeightFilter*>(
childItem->compositeFilter());
if (colorFilter)
+ {
VtkColorByHeightFilter::SafeDownCast(
colorFilter->GetOutputAlgorithm())
->SetTableRangeScaling(scale);
+ }
}
}
@@ -233,7 +237,9 @@ void VtkVisTabWidget::buildProportiesDialog(VtkVisPipelineItem* item)
auto* layout =
static_cast<QFormLayout*>(this->scrollAreaWidgetContents->layout());
while (layout->count())
+ {
delete layout->takeAt(0)->widget();
+ }
QMap<QString, QVariant>* propMap = nullptr;
QMap<QString, QList<QVariant>>* propVecMap = nullptr;
@@ -346,17 +352,25 @@ void VtkVisTabWidget::buildScalarArrayComboBox(VtkVisPipelineItem* item)
QString active_array_name = item->GetActiveAttribute();
QList<QString>::iterator it = dataSetAttributesList.begin();
if (active_array_name.length() == 0)
+ {
item->SetActiveAttribute(*it);
+ }
else
{
int idx(0);
- for (it=dataSetAttributesList.begin(); it!=dataSetAttributesList.end(); ++it)
+ for (it = dataSetAttributesList.begin();
+ it != dataSetAttributesList.end(); ++it)
+ {
if (active_array_name.compare((*it).right((*it).length()-2))==0)
{
this->activeScalarComboBox->setCurrentIndex(idx);
break;
}
- else idx++;
+ else
+ {
+ idx++;
+ }
+ }
}
}
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index 5c59c66a604d777ef03a06735dc160ad01706b84..8e00eb6c81a292c657d97a3d24287a0c01e66b4e 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -297,7 +297,9 @@ MainWindow::MainWindow(QWidget* parent /* = 0*/)
QDesktopWidget* desktopWidget = QApplication::desktop();
const unsigned int screenCount = desktopWidget->screenCount();
for (std::size_t i = 0; i < screenCount; ++i)
+ {
_screenGeometries.push_back(desktopWidget->availableGeometry((int)i));
+ }
// Setup import files menu
QMenu* import_files_menu = createImportFilesMenu(); //owned by MainWindow
@@ -360,41 +362,61 @@ void MainWindow::closeEvent(QCloseEvent* event)
void MainWindow::showGeoDockWidget(bool show)
{
if (show)
+ {
geoDock->show();
+ }
else
+ {
geoDock->hide();
+ }
}
void MainWindow::showStationDockWidget(bool show)
{
if (show)
+ {
stationDock->show();
+ }
else
+ {
stationDock->hide();
+ }
}
void MainWindow::showMshDockWidget(bool show)
{
if (show)
+ {
mshDock->show();
+ }
else
+ {
mshDock->hide();
+ }
}
void MainWindow::showConditionDockWidget(bool show)
{
if (show)
+ {
modellingDock->show();
+ }
else
+ {
modellingDock->hide();
+ }
}
void MainWindow::showVisDockWidget(bool show)
{
if (show)
+ {
vtkVisDock->show();
+ }
else
+ {
vtkVisDock->hide();
+ }
}
void MainWindow::open(int file_type)
@@ -418,7 +440,9 @@ void MainWindow::openRecentFile()
{
auto* action = qobject_cast<QAction*>(sender());
if (action)
+ {
loadFile(ImportFileType::OGS, action->data().toString());
+ }
}
void MainWindow::save()
@@ -462,7 +486,9 @@ void MainWindow::save()
bool const success = gmsh_io.writeToFile(fileName.toStdString());
if (!success)
+ {
OGSError::box(" No geometry available\n to write to geo-file");
+ }
}
}
@@ -496,7 +522,9 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
unique_name, errors, gmsh_path))
{
for (auto& error : errors)
+ {
OGSError::box(QString::fromStdString(error));
+ }
}
}
else if (fi.suffix().toLower() == "prj")
@@ -508,7 +536,11 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
_processModel->updateModel();
}
else
- OGSError::box("Failed to load project file.\n Please see console for details.");
+ {
+ OGSError::box(
+ "Failed to load project file.\n Please see console for "
+ "details.");
+ }
}
else if (fi.suffix().toLower() == "gml")
{
@@ -516,9 +548,11 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
try
{
if (!xml.readFile(fileName))
+ {
OGSError::box(
"Failed to load geometry.\n Please see console for "
"details.");
+ }
}
catch (std::runtime_error const& err)
{
@@ -531,8 +565,11 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
{
GeoLib::IO::XmlStnInterface xml(_project.getGEOObjects());
if (!xml.readFile(fileName))
- OGSError::box("Failed to load station data.\n Please see console for details.");
-
+ {
+ OGSError::box(
+ "Failed to load station data.\n Please see console for "
+ "details.");
+ }
}
// OpenGeoSys mesh files
else if (fi.suffix().toLower() == "msh" || fi.suffix().toLower() == "vtu")
@@ -548,9 +585,13 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
myTimer1.start();
#endif
if (mesh)
+ {
_meshModel->addMesh(std::move(mesh));
+ }
else
+ {
OGSError::box("Failed to load mesh file.");
+ }
#ifndef NDEBUG
INFO("Mesh model setup time: %d ms.", myTimer1.elapsed());
#endif
@@ -567,9 +608,13 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
std::unique_ptr<MeshLib::Mesh> mesh(
feflowMeshIO.readFEFLOWFile(fileName.toStdString()));
if (mesh)
+ {
_meshModel->addMesh(std::move(mesh));
+ }
else
+ {
OGSError::box("Failed to load a FEFLOW mesh.");
+ }
FileIO::FEFLOWGeoInterface feflowGeoIO;
feflowGeoIO.readFEFLOWFile(fileName.toStdString(), _project.getGEOObjects());
}
@@ -583,19 +628,28 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
auto boreholes = std::make_unique<std::vector<GeoLib::Point*>>();
std::string name = fi.baseName().toStdString();
- if (GMSInterface::readBoreholesFromGMS(boreholes.get(), fileName.toStdString()))
+ if (GMSInterface::readBoreholesFromGMS(boreholes.get(),
+ fileName.toStdString()))
+ {
_project.getGEOObjects().addStationVec(std::move(boreholes), name);
+ }
else
+ {
OGSError::box("Error reading GMS file.");
+ }
}
else if (fi.suffix().toLower() == "3dm") // GMS mesh files
{
std::string name = fileName.toStdString();
std::unique_ptr<MeshLib::Mesh> mesh(GMSInterface::readGMS3DMMesh(name));
if (mesh)
+ {
_meshModel->addMesh(std::move(mesh));
+ }
else
+ {
OGSError::box("Failed to load a GMS mesh.");
+ }
}
settings.setValue("lastOpenedFileDirectory", dir.absolutePath());
}
@@ -606,9 +660,13 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
{
std::unique_ptr<MeshLib::Mesh> mesh(FileIO::GMSH::readGMSHMesh(msh_name));
if (mesh)
+ {
_meshModel->addMesh(std::move(mesh));
+ }
else
+ {
OGSError::box("Failed to load a GMSH mesh.");
+ }
}
settings.setValue("lastOpenedFileDirectory", dir.absolutePath());
}
@@ -622,7 +680,9 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
for (auto& mesh : meshes)
{
if (mesh != nullptr)
+ {
_meshModel->addMesh(std::move(mesh));
+ }
}
}
else
@@ -653,7 +713,9 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
{
VtkGeoImageSource* geoImage = VtkGeoImageSource::New();
if (geoImage->readImage(fileName))
+ {
_vtkVisPipeline->addPipelineItem(geoImage);
+ }
else
{
geoImage->Delete();
@@ -699,9 +761,13 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
std::unique_ptr<MeshLib::Mesh> mesh(tetgen.readTetGenMesh(
fileName.toStdString(), element_fname.toStdString()));
if (mesh)
+ {
_meshModel->addMesh(std::move(mesh));
+ }
else
+ {
OGSError::box("Failed to load a TetGen mesh.");
+ }
}
}
}
@@ -873,7 +939,9 @@ void MainWindow::mapGeometry(const std::string &geo_name)
{
GeoOnMeshMappingDialog dlg(this->_project.getMeshObjects());
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
int choice (dlg.getDataSetChoice());
@@ -886,7 +954,10 @@ void MainWindow::mapGeometry(const std::string &geo_name)
"Select file for mapping",
settings.value("lastOpenedFileDirectory").toString(),
file_type[choice]);
- if (file_name.isEmpty()) return;
+ if (file_name.isEmpty())
+ {
+ return;
+ }
QDir dir = QDir(file_name);
settings.setValue("lastOpenedFileDirectory", dir.absolutePath());
}
@@ -900,13 +971,19 @@ void MainWindow::mapGeometry(const std::string &geo_name)
std::unique_ptr<GeoLib::Raster> raster (
FileIO::AsciiRasterInterface::getRasterFromASCFile(file_name.toStdString()));
if (raster)
+ {
geo_mapper.mapOnDEM(std::move(raster));
+ }
else
+ {
OGSError::box("Error reading raster file.");
+ }
_geo_model->updateGeometry(geo_name);
}
else
+ {
OGSError::box("The selected file is no supported raster file.");
+ }
return;
}
@@ -914,15 +991,19 @@ void MainWindow::mapGeometry(const std::string &geo_name)
if (choice == 0) // load mesh from file
{
if (fi.suffix().toLower() == "vtu" || fi.suffix().toLower() == "msh")
+ {
mesh = MeshLib::IO::readMeshFromFile(file_name.toStdString());
+ }
else
{
OGSError::box("The selected file is no supported mesh file.");
return;
}
}
- else // use mesh from ProjectData
- mesh = _project.getMeshObjects()[choice-2].get();
+ else
+ { // use mesh from ProjectData
+ mesh = _project.getMeshObjects()[choice - 2].get();
+ }
std::string new_geo_name = dlg.getNewGeoName();
@@ -941,7 +1022,9 @@ void MainWindow::mapGeometry(const std::string &geo_name)
_geo_model->updateGeometry(new_geo_name);
}
if (choice == 0)
+ {
delete mesh;
+ }
}
void MainWindow::convertMeshToGeometry(const MeshLib::Mesh* mesh)
@@ -967,11 +1050,15 @@ void MainWindow::callGMSH(std::vector<std::string> & selectedGeometries,
QString dir_str = this->getLastUsedDir();
if (!delete_geo_file)
+ {
fileName = QFileDialog::getSaveFileName(this, "Save GMSH-file as",
LastSavedFileDirectory::getDir() + "tmp_gmsh.geo",
"GMSH geometry files (*.geo)");
+ }
else
+ {
fileName = "tmp_gmsh.geo";
+ }
if (!fileName.isEmpty())
{
@@ -1003,7 +1090,9 @@ void MainWindow::callGMSH(std::vector<std::string> & selectedGeometries,
"\"" + gmsh_path + "\" -2 -algo meshadapt " + fname;
std::size_t pos(fname.rfind("."));
if (pos != std::string::npos)
+ {
fname = fname.substr(0, pos);
+ }
gmsh_command += " -o " + fname + ".msh";
auto const return_value = std::system(gmsh_command.c_str());
if (return_value != 0)
@@ -1027,7 +1116,12 @@ void MainWindow::callGMSH(std::vector<std::string> & selectedGeometries,
}
}
else
- OGSError::box("Error executing command gmsh - no command processor available", "Error");
+ {
+ OGSError::box(
+ "Error executing command gmsh - no command processor "
+ "available",
+ "Error");
+ }
if (delete_geo_file) // delete file
{
@@ -1077,7 +1171,9 @@ void MainWindow::showDiagramPrefsDialog(QModelIndex &index)
prefs->show();
}
if (stn->type() == GeoLib::Station::StationType::BOREHOLE)
+ {
OGSError::box("No time series data available for borehole.");
+ }
}
void MainWindow::showDiagramPrefsDialog()
@@ -1101,7 +1197,9 @@ void MainWindow::showGeoNameDialog(const std::string &geometry_name, const GeoLi
std::string old_name = _project.getGEOObjects().getElementNameByID(geometry_name, object_type, id);
SetNameDialog dlg(GeoLib::convertGeoTypeToString(object_type), id, old_name);
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
_geo_model->addNameForElement(geometry_name, object_type, id, dlg.getNewName());
static_cast<GeoTreeModel*>(this->geoTabWidget->treeView->model())->setNameForItem(geometry_name, object_type,
@@ -1114,7 +1212,9 @@ void MainWindow::showStationNameDialog(const std::string& stn_vec_name, std::siz
auto* const stn = static_cast<GeoLib::Station*>((*stations)[id]);
SetNameDialog dlg("Station", id, stn->getName());
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
stn->setName(dlg.getNewName());
static_cast<StationTreeModel*>(this->stationTabWidget->treeView->model())->setNameForItem(stn_vec_name, id, stn->getName());
@@ -1147,7 +1247,9 @@ void MainWindow::convertPointsToStations(std::string const& geo_name)
std::string stn_name = geo_name + " Stations";
int ret = _project.getGEOObjects().geoPointsToStations(geo_name, stn_name);
if (ret == 1)
+ {
OGSError::box("No points found to convert.");
+ }
}
void MainWindow::showLineEditDialog(const std::string &geoName)
@@ -1175,26 +1277,37 @@ void MainWindow::showMergeGeometriesDialog()
{
MergeGeometriesDialog dlg(_project.getGEOObjects());
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
std::string name (dlg.getGeometryName());
- if (_project.getGEOObjects().mergeGeometries(dlg.getSelectedGeometries(), name) < 0)
+ if (_project.getGEOObjects().mergeGeometries(dlg.getSelectedGeometries(),
+ name) < 0)
+ {
OGSError::box("Points are missing for\n at least one geometry.");
+ }
}
void MainWindow::showMeshQualitySelectionDialog(MeshLib::VtkMappedMeshSource* mshSource)
{
if (mshSource == nullptr)
+ {
return;
+ }
MeshQualitySelectionDialog dlg;
if (dlg.exec() != QDialog::Accepted)
+ {
return;
+ }
MeshLib::MeshQualityType const type (dlg.getSelectedMetric());
MeshLib::ElementQualityInterface quality_interface(*mshSource->GetMesh(), type);
_vtkVisPipeline->showMeshElementQuality(mshSource, type, quality_interface.getQualityVector());
if (dlg.getHistogram())
+ {
quality_interface.writeHistogram(dlg.getHistogramPath());
+ }
}
void MainWindow::showVisalizationPrefsDialog()
@@ -1327,7 +1440,9 @@ void MainWindow::createPresentationMenu()
connect(action, SIGNAL(triggered()), this,
SLOT(startPresentationMode()));
if (count == currentScreen)
+ {
action->setEnabled(false);
+ }
menu->addAction(action);
++count;
}
@@ -1385,7 +1500,9 @@ QString MainWindow::getLastUsedDir()
QString fileName("");
QStringList files = settings.value("recentFileList").toStringList();
if (!files.empty())
+ {
return QFileInfo(files[0]).absolutePath();
+ }
return QDir::homePath();
}
diff --git a/Applications/FileIO/CsvInterface.cpp b/Applications/FileIO/CsvInterface.cpp
index f5850fb3103ac612c6d4b8b80c2151e6c6fc0b2b..a1895402259cbdf946b82f35cbd32f27e6f69fe2 100644
--- a/Applications/FileIO/CsvInterface.cpp
+++ b/Applications/FileIO/CsvInterface.cpp
@@ -35,11 +35,15 @@ std::vector<std::string> CsvInterface::getColumnNames(std::string const& fname,
}
std::string line;
if (!getline(in, line))
+ {
return {};
+ }
std::list<std::string> fields;
if (delim != '\n')
+ {
fields = BaseLib::splitString(line, delim);
+ }
if (fields.size() < 2)
{
diff --git a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
index f12ef7f1683f0f9792543bd8a6531f114a5476fc..b4da974a9ab10f73033d262c26f4216c34e32b47 100644
--- a/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
+++ b/Applications/FileIO/FEFLOW/FEFLOWGeoInterface.cpp
@@ -59,7 +59,9 @@ void FEFLOWGeoInterface::readFEFLOWFile(const std::string& filename,
// problem class, time mode, problem orientation, dimension, ...
unsigned dummy = 0;
for (int i = 0; i < 3; i++)
+ {
line_stream >> dummy;
+ }
line_stream >> dimension;
line_stream.clear();
}
@@ -72,8 +74,10 @@ void FEFLOWGeoInterface::readFEFLOWFile(const std::string& filename,
double vec[3] = {};
line_stream >> vec[0] >> vec[1] >> vec[2];
if (vec[0] == 0.0 && vec[1] == -1.0 && vec[2] == 0.0)
+ {
// x-z plane
isXZplane = true;
+ }
line_stream.clear();
}
//....................................................................
@@ -89,12 +93,16 @@ void FEFLOWGeoInterface::readFEFLOWFile(const std::string& filename,
std::string project_name(
BaseLib::extractBaseNameWithoutExtension(filename));
if (points)
+ {
geoObjects.addPointVec(
std::unique_ptr<std::vector<GeoLib::Point*>>(points), project_name);
+ }
if (lines)
+ {
geoObjects.addPolylineVec(
std::unique_ptr<std::vector<GeoLib::Polyline*>>(lines),
project_name);
+ }
if (isXZplane && points)
{
@@ -114,7 +122,9 @@ void FEFLOWGeoInterface::readPoints(QDomElement& nodesEle,
QDomElement xmlEle =
nodesEle.firstChildElement(QString::fromStdString(tag));
if (xmlEle.isNull())
+ {
return;
+ }
QString str_pt_list1 = xmlEle.text();
std::istringstream ss(str_pt_list1.toStdString());
std::string line_str;
@@ -123,13 +133,17 @@ void FEFLOWGeoInterface::readPoints(QDomElement& nodesEle,
std::getline(ss, line_str);
boost::trim_right(line_str);
if (line_str.empty())
+ {
continue;
+ }
std::istringstream line_ss(line_str);
std::size_t pt_id = 0;
std::array<double, 3> pt_xyz;
line_ss >> pt_id;
for (int i = 0; i < dim; i++)
+ {
line_ss >> pt_xyz[i];
+ }
points[pt_id - 1] = new GeoLib::Point(pt_xyz, pt_id);
}
}
@@ -148,7 +162,9 @@ void FEFLOWGeoInterface::readSuperMesh(std::ifstream& in,
BaseLib::trim(line_string);
oss << line_string << "\n";
if (line_string.find("</supermesh>") != std::string::npos)
+ {
break;
+ }
}
const QString strXML(oss.str().c_str());
@@ -166,7 +182,9 @@ void FEFLOWGeoInterface::readSuperMesh(std::ifstream& in,
points = new std::vector<GeoLib::Point*>();
QDomElement nodesEle = docElem.firstChildElement("nodes");
if (nodesEle.isNull())
+ {
return;
+ }
{
const QString str = nodesEle.attribute("count");
@@ -182,7 +200,9 @@ void FEFLOWGeoInterface::readSuperMesh(std::ifstream& in,
lines = new std::vector<GeoLib::Polyline*>();
QDomElement polygonsEle = docElem.firstChildElement("polygons");
if (polygonsEle.isNull())
+ {
return;
+ }
{
QDomNode child = polygonsEle.firstChild();
@@ -195,7 +215,9 @@ void FEFLOWGeoInterface::readSuperMesh(std::ifstream& in,
}
QDomElement xmlEle = child.firstChildElement("nodes");
if (xmlEle.isNull())
+ {
continue;
+ }
const QString str = xmlEle.attribute("count");
const std::size_t n_points = str.toLong();
QString str_ptId_list = xmlEle.text().simplified();
diff --git a/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
index bf2d608b0ab4ad3e53b06416cac5b4818421ef2a..39c25333316dd0457823ebf56b0c065b69cbb323 100644
--- a/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
+++ b/Applications/FileIO/FEFLOW/FEFLOWMeshInterface.cpp
@@ -100,21 +100,33 @@ MeshLib::Mesh* FEFLOWMeshInterface::readFEFLOWFile(const std::string& filename)
MeshLib::MeshElemType eleType = MeshLib::MeshElemType::INVALID;
if (fem_dim.n_nodes_of_element == 2)
+ {
eleType = MeshLib::MeshElemType::LINE;
+ }
else if (fem_dim.n_nodes_of_element == 3)
+ {
eleType = MeshLib::MeshElemType::TRIANGLE;
+ }
else if (fem_dim.n_nodes_of_element == 4 &&
fem_class.dimension == 2)
+ {
eleType = MeshLib::MeshElemType::QUAD;
+ }
else if (fem_dim.n_nodes_of_element == 4 &&
fem_class.dimension == 3)
+ {
eleType = MeshLib::MeshElemType::TETRAHEDRON;
+ }
else if (fem_dim.n_nodes_of_element == 6 &&
fem_class.dimension == 3)
+ {
eleType = MeshLib::MeshElemType::PRISM;
+ }
else if (fem_dim.n_nodes_of_element == 8 &&
fem_class.dimension == 3)
+ {
eleType = MeshLib::MeshElemType::HEXAHEDRON;
+ }
if (eleType == MeshLib::MeshElemType::INVALID)
{
@@ -143,7 +155,8 @@ MeshLib::Mesh* FEFLOWMeshInterface::readFEFLOWFile(const std::string& filename)
assert(!vec_nodes.empty());
vec_elements.reserve(fem_dim.n_elements);
- if (fem_dim.n_nodes_of_element == 0) // mixed element case
+ if (fem_dim.n_nodes_of_element == 0)
+ { // mixed element case
if (!std::getline(in, line_string))
{
ERR("FEFLOWInterface::readFEFLOWFile(): read element "
@@ -153,6 +166,7 @@ MeshLib::Mesh* FEFLOWMeshInterface::readFEFLOWFile(const std::string& filename)
vec_nodes.clear();
return nullptr;
}
+ }
for (std::size_t i = 0; i < fem_dim.n_elements; i++)
{
@@ -175,7 +189,9 @@ MeshLib::Mesh* FEFLOWMeshInterface::readFEFLOWFile(const std::string& filename)
else if (line_string == "ELEV_I")
{
if (fem_class.dimension == 2)
+ {
continue;
+ }
readElevation(in, fem_class, fem_dim, vec_nodes);
}
//....................................................................
@@ -187,8 +203,10 @@ MeshLib::Mesh* FEFLOWMeshInterface::readFEFLOWFile(const std::string& filename)
double vec[3] = {};
line_stream >> vec[0] >> vec[1] >> vec[2];
if (vec[0] == 0.0 && vec[1] == -1.0 && vec[2] == 0.0)
+ {
// x-z plane
isXZplane = true;
+ }
line_stream.clear();
}
//....................................................................
@@ -259,8 +277,10 @@ void FEFLOWMeshInterface::readNodeCoordinates(
if (!std::getline(in, line_string))
{
ERR("Could not read the node '%u'.", k);
- for (auto * n : vec_nodes)
+ for (auto* n : vec_nodes)
+ {
delete n;
+ }
return;
}
std::stringstream line_stream;
@@ -272,14 +292,18 @@ void FEFLOWMeshInterface::readNodeCoordinates(
{
ERR("Could not parse coordinate %u of node '%u'.", i, k);
for (auto* n : vec_nodes)
+ {
delete n;
+ }
return;
}
if (!(line_stream >> dummy_char) && i < 2) // read comma
{
ERR("Could not parse node '%u'.", k);
for (auto* n : vec_nodes)
+ {
delete n;
+ }
return;
}
}
@@ -313,16 +337,22 @@ void FEFLOWMeshInterface::readNodeCoordinates(
for (unsigned j = 0; j < 12; j++)
{
if (i * 12 + j >= no_nodes_per_layer)
+ {
break;
+ }
line_stream >> x >> dummy_char;
for (std::size_t l = 0; l < n_layers; l++)
{
const std::size_t n = i * 12 + l * no_nodes_per_layer + j;
MeshLib::Node* m_nod = vec_nodes[n];
if (k == 0)
+ {
(*m_nod)[0] = x;
+ }
else
+ {
(*m_nod)[1] = x;
+ }
}
}
line_stream.clear();
@@ -343,7 +373,9 @@ std::vector<std::size_t> FEFLOWMeshInterface::getIndexList(
for (auto str : splitted_str)
{
if (str.empty())
+ {
continue;
+ }
if (str[0] == '#')
{
is_range = true;
@@ -353,7 +385,9 @@ std::vector<std::size_t> FEFLOWMeshInterface::getIndexList(
const std::size_t start = vec_node_IDs.back();
const auto end = BaseLib::str2number<std::size_t>(str);
for (std::size_t i = start + 1; i < end + 1; i++)
+ {
vec_node_IDs.push_back(i);
+ }
is_range = false;
}
else
@@ -390,15 +424,25 @@ void FEFLOWMeshInterface::readElevation(std::ifstream& in,
// check mode
auto columns = BaseLib::splitString(line_string, ' ');
if (!in || std::isalpha(line_string[0]))
+ {
mode = 0;
+ }
else if (line_string.empty())
+ {
continue;
+ }
else if (line_string[0] == '\t')
+ {
mode = 3;
+ }
else if (columns.size() == 1)
+ {
mode = 1;
- else // columns.size()>1
+ }
+ else
+ { // columns.size()>1
mode = 2;
+ }
// process stocked data
if (mode != 3 && !str_nodeList.empty())
@@ -442,7 +486,9 @@ void FEFLOWMeshInterface::readElevation(std::ifstream& in,
// move stream position to previous line
if (std::isalpha(line_string[0]))
+ {
in.seekg(pos_prev_line);
+ }
}
MeshLib::Element* FEFLOWMeshInterface::readElement(
@@ -476,14 +522,18 @@ MeshLib::Element* FEFLOWMeshInterface::readElement(
unsigned idx[8];
for (std::size_t i = 0; i < n_nodes_of_element; ++i)
+ {
ss >> idx[i];
+ }
auto** ele_nodes = new MeshLib::Node*[n_nodes_of_element];
switch (elem_type)
{
default:
for (std::size_t k(0); k < n_nodes_of_element; ++k)
+ {
ele_nodes[k] = nodes[idx[k] - 1];
+ }
break;
case MeshLib::MeshElemType::HEXAHEDRON:
case MeshLib::MeshElemType::PRISM:
@@ -517,14 +567,18 @@ MeshLib::Element* FEFLOWMeshInterface::readElement(
unsigned idx[8];
for (std::size_t i = 0; i < fem_dim.n_nodes_of_element; ++i)
+ {
ss >> idx[i];
+ }
auto** ele_nodes = new MeshLib::Node*[fem_dim.n_nodes_of_element];
switch (elem_type)
{
default:
for (unsigned k(0); k < fem_dim.n_nodes_of_element; ++k)
+ {
ele_nodes[k] = nodes[idx[k] - 1];
+ }
break;
case MeshLib::MeshElemType::HEXAHEDRON:
case MeshLib::MeshElemType::PRISM:
@@ -583,15 +637,25 @@ void FEFLOWMeshInterface::readELEMENTALSETS(
unsigned mode = 0;
if (!in)
+ {
mode = 0; // reached the end of the file
+ }
else if (line_string.empty())
+ {
continue; // skip and see what comes next
+ }
else if (std::isalpha(line_string[0]))
+ {
mode = 0; // reached the next section
+ }
else if (line_string[0] == ' ')
+ {
mode = 1; // start of the element set definition
+ }
else if (line_string[0] == '\t')
+ {
mode = 2; // continue the definition
+ }
else
{
ERR("Failed during parsing of an ELEMENTALSETS section in a FEFLOW "
@@ -639,7 +703,9 @@ void FEFLOWMeshInterface::readELEMENTALSETS(
}
// move stream position to previous line
if (std::isalpha(line_string[0]))
+ {
in.seekg(pos_prev_line);
+ }
}
void FEFLOWMeshInterface::setMaterialIDs(
@@ -657,8 +723,10 @@ void FEFLOWMeshInterface::setMaterialIDs(
{
auto& eids = vec_elementsets[matid];
for (auto eid : eids)
+ {
material_ids[eid - 1] =
matid; // Element IDs given by FEFLOW starts from one!
+ }
}
}
else if (lines && !lines->empty())
@@ -672,7 +740,9 @@ void FEFLOWMeshInterface::setMaterialIDs(
{
GeoLib::Polyline* poly = (*lines)[j];
if (!poly->isClosed())
+ {
continue;
+ }
GeoLib::Polygon polygon(*poly, true);
if (polygon.isPntInPolygon(gpt[0], gpt[1], gpt[2]))
@@ -693,11 +763,13 @@ void FEFLOWMeshInterface::setMaterialIDs(
MeshLib::Element* e = vec_elements[i];
std::size_t e_min_nodeID = std::numeric_limits<std::size_t>::max();
for (std::size_t j = 0; j < e->getNumberOfBaseNodes(); j++)
+ {
e_min_nodeID = std::min(e_min_nodeID, e->getNodeIndex(j));
+ }
std::size_t layer_id = e_min_nodeID / no_nodes_per_layer;
material_ids[i] = layer_id;
}
}
}
-} // FileIO
+} // namespace FileIO
diff --git a/Applications/FileIO/GocadIO/CoordinateSystem.cpp b/Applications/FileIO/GocadIO/CoordinateSystem.cpp
index 6b199144052cd5ef9e2aa8553df6e2b63d0d0d08..c8fb5ae876e4f8ca7ec3305a123db70a244aece0 100644
--- a/Applications/FileIO/GocadIO/CoordinateSystem.cpp
+++ b/Applications/FileIO/GocadIO/CoordinateSystem.cpp
@@ -96,7 +96,9 @@ bool CoordinateSystem::parse(std::istream& in)
datum = parseName(line);
}
else if (*it == "END_ORIGINAL_COORDINATE_SYSTEM")
+ {
return true;
+ }
else
WARN("CoordinateSystem::parse() - Unknown keyword found: %s", line.c_str());
}
diff --git a/Applications/FileIO/GocadIO/GocadTSurfaceReader.cpp b/Applications/FileIO/GocadIO/GocadTSurfaceReader.cpp
index 3c8ba146ee2b9407ea31d6fbdd20e11d0c78bdf8..53c376d8333c6aac469e1884075c0376c553708a 100644
--- a/Applications/FileIO/GocadIO/GocadTSurfaceReader.cpp
+++ b/Applications/FileIO/GocadIO/GocadTSurfaceReader.cpp
@@ -62,7 +62,9 @@ MeshLib::Mesh* GocadTSurfaceReader::readMesh(std::ifstream& in,
std::string& mesh_name)
{
if (!parseHeader(in, mesh_name))
+ {
return nullptr;
+ }
MeshLib::Properties mesh_prop;
mesh_prop.createNewPropertyVector<int>(mat_id_name,
@@ -72,8 +74,10 @@ MeshLib::Mesh* GocadTSurfaceReader::readMesh(std::ifstream& in,
{
std::vector<std::string> str = BaseLib::splitString(line);
if (line.empty() || isCommentLine(line))
+ {
continue;
- else if (str[0] == "GOCAD_ORIGINAL_COORDINATE_SYSTEM")
+ }
+ if (str[0] == "GOCAD_ORIGINAL_COORDINATE_SYSTEM")
{
Gocad::CoordinateSystem coordinate_system;
if (!coordinate_system.parse(in))
@@ -135,11 +139,15 @@ bool GocadTSurfaceReader::TSurfaceFound(std::ifstream& in) const
while (std::getline(in, line))
{
if (line.empty() || isCommentLine(line))
+ {
continue;
- else if (line.substr(0, 11) == "GOCAD TSurf")
+ }
+ if (line.substr(0, 11) == "GOCAD TSurf")
+ {
return true;
// No idea why this is allowed in a *.ts file.
// It should be a whole different file type.
+ }
else if (line.substr(0, 13) == "GOCAD Model3d")
{
if (!skipModel3d(in))
@@ -173,7 +181,9 @@ bool GocadTSurfaceReader::parseHeader(std::ifstream& in, std::string& mesh_name)
BaseLib::trim(mesh_name, ' ');
}
else if (line.substr(0, 1) == "}")
+ {
return true;
+ }
// ignore all other header parameters
}
ERR("%s", eof_error.c_str());
@@ -186,7 +196,9 @@ bool GocadTSurfaceReader::parsePropertyClass(std::ifstream& in) const
while (std::getline(in, line))
{
if (line.substr(0, 1) == "}")
+ {
return true;
+ }
}
ERR("%s", eof_error.c_str());
return false;
@@ -203,7 +215,9 @@ std::string propertyCheck(std::string const& strng)
for (std::string key : property_keywords)
{
if (str[0] == key)
+ {
return key;
+ }
}
return std::string("");
}
@@ -266,9 +280,13 @@ bool GocadTSurfaceReader::parseSurface(
MeshLib::Properties& mesh_prop)
{
if (!parseNodes(in, nodes, node_id_map, mesh_prop))
+ {
return false;
+ }
if (!parseElements(in, nodes, elems, node_id_map, mesh_prop))
+ {
return false;
+ }
std::string line("");
while (std::getline(in, line))
@@ -279,7 +297,7 @@ bool GocadTSurfaceReader::parseSurface(
parseSurface(in, nodes, elems, node_id_map, mesh_prop);
return true;
}
- else if (str[0] == "BSTONE")
+ if (str[0] == "BSTONE")
{
// borderstone definition - currently ignored
}
@@ -334,7 +352,9 @@ bool GocadTSurfaceReader::parseNodes(
}
if (line.empty() || isCommentLine(line))
+ {
continue;
+ }
if (!(line.substr(0, 4) == "VRTX" || line.substr(0, 5) == "PVRTX" ||
line.substr(0, 4) == "ATOM"))
{
@@ -355,7 +375,9 @@ bool GocadTSurfaceReader::parseNodes(
for (std::string const& name : array_names)
{
if (name == mat_id_name)
+ {
continue;
+ }
sstr >> value;
mesh_prop.getPropertyVector<double>(name)->push_back(value);
}
@@ -387,14 +409,18 @@ bool GocadTSurfaceReader::parseElements(
*mesh_prop.getPropertyVector<int>(mat_id_name);
int current_mat_id(0);
if (!mat_ids.empty())
+ {
current_mat_id = (*std::max_element(mat_ids.begin(), mat_ids.end()))++;
+ }
std::streampos pos = in.tellg();
std::size_t id(0);
std::string line("");
while (std::getline(in, line))
{
if (line.empty() || isCommentLine(line))
+ {
continue;
+ }
if (line.substr(0, 4) == "TRGL")
{
std::stringstream sstr(line);
@@ -431,7 +457,9 @@ bool GocadTSurfaceReader::skipModel3d(std::ifstream& in) const
while (std::getline(in, line))
{
if (line == "END")
+ {
return true;
+ }
}
ERR("%s", eof_error.c_str());
return false;
@@ -441,9 +469,13 @@ void GocadTSurfaceReader::clearData(std::vector<MeshLib::Node*>& nodes,
std::vector<MeshLib::Element*>& elems)
{
for (MeshLib::Element* e : elems)
+ {
delete e;
+ }
for (MeshLib::Node* n : nodes)
+ {
delete n;
+ }
}
} // end namespace Gocad
diff --git a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp
index b814c431d8bae5cbb427ff69f785852246f3b036..eb70d64945b8703fe199d519853955a49c8b6329 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp
+++ b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp
@@ -33,8 +33,10 @@ XMLInterface(), XMLQtInterface("OpenGeoSysNUM.xsd")
int XmlNumInterface::readFile(QString const& fileName)
{
- if(XMLQtInterface::readFile(fileName) == 0)
+ if (XMLQtInterface::readFile(fileName) == 0)
+ {
return 0;
+ }
QDomDocument doc("OGS-NUM-DOM");
doc.setContent(_fileData);
@@ -55,11 +57,17 @@ int XmlNumInterface::readFile(QString const& fileName)
INFO("Non-linear solver type: %s.", solver_type.c_str());
}
else if (num_node.nodeName().compare("LinearSolver") == 0)
+ {
readLinearSolverConfiguration(num_node);
+ }
else if (num_node.nodeName().compare("IterationScheme") == 0)
+ {
readIterationScheme(num_node);
+ }
else if (num_node.nodeName().compare("Convergence") == 0)
+ {
readConvergenceCriteria(num_node);
+ }
num_node = num_node.nextSiblingElement();
}
@@ -76,9 +84,14 @@ void XmlNumInterface::readLinearSolverConfiguration(QDomElement const& lin_root)
while (!linear_solver_node.isNull())
{
if (linear_solver_node.nodeName().compare("Type") == 0)
- lin_solver_type = linear_solver_node.toElement().text().toStdString();
+ {
+ lin_solver_type =
+ linear_solver_node.toElement().text().toStdString();
+ }
if (linear_solver_node.nodeName().compare("Preconditioner") == 0)
+ {
precond_type = linear_solver_node.toElement().text().toStdString();
+ }
linear_solver_node = linear_solver_node.nextSiblingElement();
}
INFO("Using %s-library with solver %s and %s preconditioner.", library.c_str(), lin_solver_type.c_str(), precond_type.c_str());
@@ -93,9 +106,13 @@ void XmlNumInterface::readIterationScheme(QDomElement const& iteration_root)
while (!iteration_node.isNull())
{
if (iteration_node.nodeName().compare("MaxIterations") == 0)
+ {
max_iterations = iteration_node.toElement().text().toInt();
+ }
if (iteration_node.nodeName().compare("FixedStepSize") == 0)
+ {
fixed_step_size = iteration_node.toElement().text().toInt();
+ }
iteration_node = iteration_node.nextSiblingElement();
}
@@ -111,9 +128,13 @@ void XmlNumInterface::readConvergenceCriteria(QDomElement const& convergence_roo
while (!conv_node.isNull())
{
if (conv_node.nodeName().compare("Method") == 0)
+ {
error_method = conv_node.toElement().text().toStdString();
+ }
if (conv_node.nodeName().compare("ErrorThreshold") == 0)
+ {
error_threshold = conv_node.toElement().text().toDouble();
+ }
conv_node = conv_node.nextSiblingElement();
}
diff --git a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
index 3fb85c8d167bf086c71451a72c9a0c360eee21d6..99e7a5980c558eacfb7b3253cbe00da1c50a2090 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
+++ b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
@@ -46,7 +46,9 @@ XmlPrjInterface::XmlPrjInterface(DataHolderLib::Project& project)
int XmlPrjInterface::readFile(const QString& fileName)
{
if (XMLQtInterface::readFile(fileName) == 0)
+ {
return 0;
+ }
QFileInfo fi(fileName);
QString path =
@@ -80,7 +82,9 @@ int XmlPrjInterface::readFile(const QString& fileName)
QString const node_name(node.nodeName());
QString const file_name(node.toElement().text().trimmed());
if (file_name.isEmpty())
+ {
continue;
+ }
if (node_name == "geometry")
{
@@ -140,13 +144,19 @@ int XmlPrjInterface::readFile(const QString& fileName)
}
else if (node_name == "parameters")
+ {
param_root = node;
+ }
else if (node_name == "process_variables")
+ {
pvar_root = node;
+ }
}
if (param_root != QDomNode() && pvar_root != QDomNode())
+ {
readConditions(pvar_root, param_root);
+ }
else
INFO("Skipping process variables");
@@ -168,7 +178,9 @@ QDomNode XmlPrjInterface::findParam(QDomNode const& param_root,
// node.toElement().text().toStdString() << std::endl;
if (node.nodeName() == "name" &&
node.toElement().text() == param_name)
+ {
return node;
+ }
}
param = param.nextSibling();
}
@@ -188,15 +200,25 @@ void XmlPrjInterface::readConditions(QDomNode const& pvar_root,
QDomNode const node = nodeList.at(i);
QString const node_name = node.nodeName();
if (node_name == "name")
+ {
process_var.name = node.toElement().text().toStdString();
+ }
else if (node_name == "components")
+ {
process_var.components = node.toElement().text().toInt();
+ }
else if (node_name == "order")
+ {
process_var.order = node.toElement().text().toInt();
+ }
else if (node_name == "boundary_conditions")
+ {
readBoundaryConditions(node, param_root, process_var);
+ }
else if (node_name == "source_terms")
+ {
readSourceTerms(node, param_root, process_var);
+ }
}
pvar = pvar.nextSibling();
}
@@ -215,7 +237,9 @@ void XmlPrjInterface::readBoundaryConditions(
pvar));
if (cond->getType() !=
DataHolderLib::BoundaryCondition::ConditionType::NONE)
+ {
_project.addBoundaryCondition(std::move(cond));
+ }
bc = bc.nextSibling();
}
@@ -232,7 +256,9 @@ void XmlPrjInterface::readSourceTerms(
std::unique_ptr<DataHolderLib::SourceTerm> cond(
parseCondition<DataHolderLib::SourceTerm>(st, param_root, pvar));
if (cond->getType() != DataHolderLib::SourceTerm::ConditionType::NONE)
+ {
_project.addSourceTerm(std::move(cond));
+ }
st = st.nextSibling();
}
}
@@ -255,12 +281,18 @@ T* XmlPrjInterface::parseCondition(
QString const content = nodeList.at(i).toElement().text().trimmed();
if (node_name == "geometrical_set" &&
base_obj_type != DataHolderLib::BaseObjType::MESH)
+ {
base_obj_name = content.toStdString();
+ }
else if (node_name == "geometry" &&
base_obj_type != DataHolderLib::BaseObjType::MESH)
+ {
obj_name = content.toStdString();
+ }
else if (node_name == "type")
+ {
type = T::convertStringToType(content.toStdString());
+ }
else if (node_name == "mesh")
{
base_obj_type = DataHolderLib::BaseObjType::MESH;
@@ -268,12 +300,16 @@ T* XmlPrjInterface::parseCondition(
obj_name.clear();
}
else if (node_name == "field_name")
+ {
param_name = content.toStdString();
+ }
else if (node_name == "parameter")
{
QDomNode val = findParam(param_root, content);
if (val == QDomNode())
+ {
continue;
+ }
param_name = content.toStdString();
param_node = nodeList.at(i);
}
@@ -283,9 +319,13 @@ T* XmlPrjInterface::parseCondition(
{
T* cond = new T(pvar, param_name, type);
if (base_obj_type == DataHolderLib::BaseObjType::MESH)
+ {
cond->setMesh(base_obj_name);
+ }
else
+ {
cond->setGeoObject(base_obj_name, obj_name);
+ }
return cond;
}
@@ -419,14 +459,18 @@ XmlPrjInterface::getPrimaryVariableVec() const
{
DataHolderLib::ProcessVariable const& pvar(bc->getProcessVar());
if (!PVarExists(pvar.name, p_vars))
+ {
p_vars.push_back(pvar);
+ }
}
for (auto& st : source_terms)
{
DataHolderLib::ProcessVariable const& pvar(st->getProcessVar());
if (!PVarExists(pvar.name, p_vars))
+ {
p_vars.push_back(pvar);
+ }
}
return p_vars;
}
@@ -478,7 +522,9 @@ void XmlPrjInterface::writeBoundaryConditions(QDomDocument& doc,
for (auto& bc : boundary_conditions)
{
if (bc->getProcessVarName() != name)
+ {
continue;
+ }
QDomElement bc_tag = doc.createElement("boundary_condition");
bc_list_tag.appendChild(bc_tag);
writeCondition<DataHolderLib::BoundaryCondition>(doc, bc_tag, *bc);
@@ -494,7 +540,9 @@ void XmlPrjInterface::writeSourceTerms(QDomDocument& doc,
for (auto& st : source_terms)
{
if (st->getProcessVarName() != name)
+ {
continue;
+ }
QDomElement st_tag = doc.createElement("source_term");
st_list_tag.appendChild(st_tag);
writeCondition<DataHolderLib::SourceTerm>(doc, st_tag, *st);
diff --git a/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp
index 983d19dbc7aae338172b59853cefc3a91850ab5e..b2df041d65749bed4e8caa8c2f2d4d614c0a3756 100644
--- a/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp
+++ b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp
@@ -50,18 +50,24 @@ void convertPoints (DBFHandle dbf_handle,
double y(DBFReadDoubleAttribute(dbf_handle, k, y_id));
double z(0.0);
if (z_id != std::numeric_limits<std::size_t>::max())
+ {
z = DBFReadDoubleAttribute(dbf_handle, k, z_id);
+ }
name.clear();
if (!name_component_ids.empty()) {
for (std::size_t j(0); j < name_component_ids.size(); j++)
+ {
if (name_component_ids[j] != std::numeric_limits<std::size_t>::max()) {
name += DBFReadStringAttribute(dbf_handle, k, name_component_ids[j]);
name += " ";
}
+ }
}
else
+ {
name = std::to_string(k);
+ }
if (station) {
GeoLib::Station* pnt(GeoLib::Station::createStation(name, x, y, z));
@@ -74,9 +80,13 @@ void convertPoints (DBFHandle dbf_handle,
GeoLib::GEOObjects geo_objs;
if (station)
+ {
geo_objs.addStationVec(std::move(points), points_group_name);
+ }
else
+ {
geo_objs.addPointVec(std::move(points), points_group_name);
+ }
if (station) {
GeoLib::IO::XmlStnInterface xml (geo_objs);
@@ -101,12 +111,18 @@ void printFieldInformationTable(DBFHandle const& dbf_handle, std::size_t n_field
for (std::size_t field_idx(0); field_idx < n_fields; field_idx++) {
DBFGetFieldInfo(dbf_handle, field_idx, field_name, &width, &n_decimals);
if (field_idx < 10)
+ {
out << " " << field_idx << " |";
+ }
else
+ {
out << " " << field_idx << " |";
+ }
std::string field_name_str(field_name);
- for (int k(0); k < (14 - (int) field_name_str.size()); k++)
+ for (int k(0); k < (14 - (int)field_name_str.size()); k++)
+ {
out << " ";
+ }
out << field_name_str << " |";
char native_field_type(DBFGetNativeFieldType(dbf_handle, field_idx));
@@ -190,7 +206,9 @@ int main (int argc, char* argv[])
std::cin >> z_id;
if (z_id > n_fields)
+ {
z_id = std::numeric_limits<std::size_t>::max();
+ }
std::size_t n_name_components;
INFO("Please give the number of fields that should be added to name: ");
@@ -206,19 +224,27 @@ int main (int argc, char* argv[])
}
}
for (std::size_t j(0); j < n_name_components; j++)
+ {
if (name_component_ids[j] > n_fields)
+ {
name_component_ids[j] = std::numeric_limits<std::size_t>::max();
+ }
+ }
std::size_t station (0);
INFO("Should I read the information as GeoLib::Station (0) or as GeoLib::Point (1)? Please give the number: ");
std::cin >> station;
- std::string fname_base (fname);
+ std::string fname_base(fname);
if (station == 0)
+ {
fname += ".stn";
+ }
else
+ {
fname += ".gml";
+ }
INFO("Writing to %s.", fname.c_str());
convertPoints(dbf_handle,
diff --git a/Applications/Utils/GeoTools/MoveGeometry.cpp b/Applications/Utils/GeoTools/MoveGeometry.cpp
index d6e87b8033fdcb5fd2b04b8c5ee81e41f9d72aea..fe74c076c33dd5f5413c08f0f929a638d9dadaa6 100644
--- a/Applications/Utils/GeoTools/MoveGeometry.cpp
+++ b/Applications/Utils/GeoTools/MoveGeometry.cpp
@@ -71,20 +71,30 @@ int main(int argc, char *argv[])
MathLib::Vector3 displacement(0.0, 0.0, 0.0);
if (x_arg.isSet())
+ {
displacement[0] = x_arg.getValue();
+ }
if (y_arg.isSet())
+ {
displacement[1] = y_arg.getValue();
+ }
if (z_arg.isSet())
+ {
displacement[2] = z_arg.getValue();
+ }
std::vector<std::string> geo_names;
geo_objects.getGeometryNames(geo_names);
std::vector<GeoLib::Point*> const* point_vec = geo_objects.getPointVec(geo_names[0]);
std::size_t const n_points = point_vec->size();
- for (std::size_t i=0; i<n_points; ++i)
- for (std::size_t c=0; c<3; ++c)
+ for (std::size_t i = 0; i < n_points; ++i)
+ {
+ for (std::size_t c = 0; c < 3; ++c)
+ {
(*(*point_vec)[i])[c] += displacement[c];
+ }
+ }
xml.setNameForExport(geo_names[0]);
xml.writeToFile(geo_output_arg.getValue());
diff --git a/Applications/Utils/GeoTools/TriangulatePolyline.cpp b/Applications/Utils/GeoTools/TriangulatePolyline.cpp
index bce66b0834550e7ab51bbc222a7fe79f92502157..493439e730189cc614c8b3a9dd6fc009bb893880 100644
--- a/Applications/Utils/GeoTools/TriangulatePolyline.cpp
+++ b/Applications/Utils/GeoTools/TriangulatePolyline.cpp
@@ -106,7 +106,9 @@ int main(int argc, char *argv[])
{
std::string input ("");
while (input != "y" && input != "Y" && input != "n" && input != "N")
+ {
input = output_question();
+ }
if (input == "y" || input == "Y")
{
@@ -114,7 +116,9 @@ int main(int argc, char *argv[])
INFO ("Polyline closed.");
}
else
+ {
return EXIT_FAILURE;
+ }
}
INFO ("Creating a surface by triangulation of the polyline ...");
diff --git a/Applications/Utils/OGSFileConverter/FileListDialog.cpp b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
index e2756d5075b4aa28787db72f84220fc1206fb0bd..136f279e6d42d690d818309e823dd94fa252ca69 100644
--- a/Applications/Utils/OGSFileConverter/FileListDialog.cpp
+++ b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
@@ -28,7 +28,9 @@ FileListDialog::FileListDialog(FileType input, FileType output, QWidget* parent)
setupUi(this);
if (_input_file_type == FileType::VTU && _output_file_type == FileType::MSH)
+ {
displayWarningLabel();
+ }
this->listView->setModel(&_allFiles);
}
@@ -48,7 +50,9 @@ void FileListDialog::on_addButton_pressed()
QStringList const file_names = dlg.selectedFiles();
if (file_names.empty())
+ {
return;
+ }
QStringList list = _allFiles.stringList();
list.append(file_names);
@@ -62,7 +66,9 @@ void FileListDialog::on_removeButton_pressed()
{
QModelIndexList selected = this->listView->selectionModel()->selectedIndexes();
for (auto& item : selected)
+ {
this->_allFiles.removeRow(item.row());
+ }
}
void FileListDialog::on_browseButton_pressed()
@@ -83,9 +89,13 @@ void FileListDialog::accept()
_output_dir = this->outputDirEdit->text();
if (!this->outputDirEdit->text().isEmpty() && QDir(_output_dir).exists())
+ {
this->done(QDialog::Accepted);
+ }
else
+ {
OGSError::box("Output directory not found.");
+ }
}
void FileListDialog::reject()
@@ -95,13 +105,22 @@ void FileListDialog::reject()
const QString FileListDialog::getFileTypeString(FileType file_type) const
{
- if (file_type==FileType::GML) return "OpenGeoSys geometry files (*.gml)";
+ if (file_type == FileType::GML)
+ {
+ return "OpenGeoSys geometry files (*.gml)";
+ }
if (file_type == FileType::VTU)
+ {
return "OpenGeoSys mesh files (*.vtu)";
+ }
if (file_type == FileType::GLI)
+ {
return "GeoSys geometry files (*.gli)";
+ }
if (file_type == FileType::MSH)
+ {
return "GeoSys mesh files (*.msh)";
+ }
return "All files (*.*)";
}
diff --git a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
index bd99951551267b7ae34afbce0ab19589c6b4fee8..b195b57011eb6c18c6925d4b6aadc3cacf05ce87 100644
--- a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
+++ b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
@@ -41,7 +41,9 @@ OGSFileConverter::~OGSFileConverter() = default;
void OGSFileConverter::convertGML2GLI(const QStringList &input, const QString &output) const
{
if (input.empty())
+ {
return;
+ }
GeoLib::GEOObjects geo_objects;
GeoLib::IO::XmlGmlInterface xml(geo_objects);
@@ -52,7 +54,9 @@ void OGSFileConverter::convertGML2GLI(const QStringList &input, const QString &o
const std::string output_str = QString(output + "/" + fi.completeBaseName() + ".gli").toStdString();
if (fileExists(output_str))
+ {
continue;
+ }
try
{
@@ -82,7 +86,9 @@ void OGSFileConverter::convertGML2GLI(const QStringList &input, const QString &o
void OGSFileConverter::convertGLI2GML(const QStringList &input, const QString &output) const
{
if (input.empty())
+ {
return;
+ }
GeoLib::GEOObjects geo_objects;
GeoLib::IO::XmlGmlInterface xml(geo_objects);
@@ -93,7 +99,9 @@ void OGSFileConverter::convertGLI2GML(const QStringList &input, const QString &o
const std::string output_str = QString(output + "/" + fi.completeBaseName() + ".gml").toStdString();
if (fileExists(output_str))
+ {
continue;
+ }
std::string unique_name;
std::vector<std::string> errors;
@@ -113,8 +121,12 @@ void OGSFileConverter::convertGLI2GML(const QStringList &input, const QString &o
geo_objects.removePointVec(geo_name);
}
else
+ {
for (auto& error : errors)
+ {
OGSError::box(QString::fromStdString(error));
+ }
+ }
}
OGSError::box("File conversion finished");
}
@@ -122,7 +134,9 @@ void OGSFileConverter::convertGLI2GML(const QStringList &input, const QString &o
void OGSFileConverter::convertVTU2MSH(const QStringList &input, const QString &output) const
{
if (input.empty())
+ {
return;
+ }
for (const auto& input_string : input)
{
@@ -130,7 +144,9 @@ void OGSFileConverter::convertVTU2MSH(const QStringList &input, const QString &o
const std::string output_str = QString(output + "/" + fi.completeBaseName() + ".msh").toStdString();
if (fileExists(output_str))
+ {
continue;
+ }
MeshLib::Mesh const* const mesh(MeshLib::IO::VtuInterface::readVTUFile(
input_string.toStdString().c_str()));
@@ -150,7 +166,9 @@ void OGSFileConverter::convertVTU2MSH(const QStringList &input, const QString &o
void OGSFileConverter::convertMSH2VTU(const QStringList &input, const QString &output) const
{
if (input.empty())
+ {
return;
+ }
for (const auto& input_string : input)
{
@@ -158,7 +176,9 @@ void OGSFileConverter::convertMSH2VTU(const QStringList &input, const QString &o
const std::string output_str = QString(output + "/" + fi.completeBaseName() + ".vtu").toStdString();
if (fileExists(output_str))
+ {
continue;
+ }
MeshLib::IO::Legacy::MeshIO meshIO;
MeshLib::Mesh const* const mesh(
@@ -179,28 +199,36 @@ void OGSFileConverter::on_gml2gliButton_pressed() const
{
FileListDialog dlg(FileType::GML, FileType::GLI);
if (dlg.exec())
+ {
convertGML2GLI(dlg.getInputFileList(), dlg.getOutputDir());
+ }
}
void OGSFileConverter::on_gli2gmlButton_pressed() const
{
FileListDialog dlg(FileType::GLI, FileType::GML);
if (dlg.exec())
+ {
convertGLI2GML(dlg.getInputFileList(), dlg.getOutputDir());
+ }
}
void OGSFileConverter::on_vtu2mshButton_pressed() const
{
FileListDialog dlg(FileType::VTU, FileType::MSH);
if (dlg.exec())
+ {
convertVTU2MSH(dlg.getInputFileList(), dlg.getOutputDir());
+ }
}
void OGSFileConverter::on_msh2vtuButton_pressed() const
{
FileListDialog dlg(FileType::MSH, FileType::VTU);
if (dlg.exec())
+ {
convertMSH2VTU(dlg.getInputFileList(), dlg.getOutputDir());
+ }
}
void OGSFileConverter::on_closeDialogButton_pressed()
diff --git a/BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp b/BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp
index 5d0433a787b5326c60a5653e1cce7779aefd7039..3cf0e5c0689b33005cc0df1a085eaa126fb2bf1e 100644
--- a/BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp
+++ b/BaseLib/IO/XmlIO/Qt/XMLQtInterface.cpp
@@ -48,7 +48,9 @@ int XMLQtInterface::readFile(const QString &fileName)
file.close();
if (!checkHash())
+ {
return 0;
+ }
return 1;
}
@@ -65,8 +67,10 @@ int XMLQtInterface::isValid() const
if ( schema.isValid() )
{
QXmlSchemaValidator validator( schema );
- if ( validator.validate( _fileData ) )
+ if (validator.validate(_fileData))
+ {
return 1;
+ }
INFO(
"XMLQtInterface::isValid(): XML file %s is invalid (in reference "
@@ -78,8 +82,10 @@ int XMLQtInterface::isValid() const
// The following validator (without constructor arguments) automatically
// searches for the xsd given in the xml file.
QXmlSchemaValidator validator;
- if ( validator.validate( _fileData ) )
+ if (validator.validate(_fileData))
+ {
return 1;
+ }
INFO(
"XMLQtInterface::isValid(): XML file %s is invalid (in reference "
@@ -118,13 +124,17 @@ bool XMLQtInterface::checkHash() const
{
QByteArray referenceHash = file.readAll();
file.close();
- if(referenceHash == fileHash)
+ if (referenceHash == fileHash)
+ {
return true;
+ }
INFO("Hashfile does not match data ... checking file ...");
}
if (!this->isValid())
+ {
return false;
+ }
QFile fileMD5(md5FileName);
if(fileMD5.open(QIODevice::WriteOnly))
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index 9902bb96533c2e47ddce878bef611223754cec01..88ac92151b684594ed7afe7aa7a90b3ef698a9a7 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -634,7 +634,9 @@ void GEOObjects::markUnusedPoints(std::string const& geo_name,
{
std::size_t const n_pnts(line->getNumberOfPoints());
for (std::size_t i = 0; i < n_pnts; ++i)
+ {
transfer_pnts[line->getPointID(i)] = false;
+ }
}
}
@@ -675,20 +677,28 @@ int GEOObjects::geoPointsToStations(std::string const& geo_name,
std::size_t const n_pnts(pnts.size());
std::vector<bool> transfer_pnts(n_pnts, true);
if (only_unused_pnts)
+ {
markUnusedPoints(geo_name, transfer_pnts);
+ }
auto stations = std::make_unique<std::vector<GeoLib::Point*>>();
for (std::size_t i = 0; i < n_pnts; ++i)
{
if (!transfer_pnts[i])
+ {
continue;
+ }
std::string name = pnt_obj->getItemNameByID(i);
if (name.empty())
+ {
name = "Station " + std::to_string(i);
+ }
stations->push_back(new GeoLib::Station(pnts[i], name));
}
if (!stations->empty())
+ {
addStationVec(std::move(stations), stn_name);
+ }
else
{
WARN("No points found to convert.");
diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
index a0d9bd27c979ecff1f9cd52ec5a31d5ad711e35d..c3e439974f464eedabf56830d166a37062c6534c 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
+++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
@@ -29,13 +29,17 @@ namespace
void deletePolylines(std::unique_ptr<std::vector<GeoLib::Polyline*>> polylines)
{
for (GeoLib::Polyline* line : *polylines)
+ {
delete line;
+ }
}
void deleteSurfaces(std::unique_ptr<std::vector<GeoLib::Surface*>> surfaces)
{
for (GeoLib::Surface* surface : *surfaces)
+ {
delete surface;
+ }
}
void deleteGeometry(std::unique_ptr<std::vector<GeoLib::Point*>> points,
std::unique_ptr<std::vector<GeoLib::Polyline*>>
@@ -44,11 +48,13 @@ void deleteGeometry(std::unique_ptr<std::vector<GeoLib::Point*>> points,
surfaces)
{
for (GeoLib::Point* point : *points)
+ {
delete point;
+ }
deletePolylines(std::move(polylines));
deleteSurfaces(std::move(surfaces));
}
-}
+} // namespace
namespace GeoLib
{
@@ -61,8 +67,10 @@ XMLInterface(), XMLQtInterface("OpenGeoSysGLI.xsd"), _geo_objs(geo_objs)
int XmlGmlInterface::readFile(const QString &fileName)
{
- if(XMLQtInterface::readFile(fileName) == 0)
+ if (XMLQtInterface::readFile(fileName) == 0)
+ {
return 0;
+ }
QDomDocument doc("OGS-GLI-DOM");
doc.setContent(_fileData);
@@ -90,6 +98,7 @@ int XmlGmlInterface::readFile(const QString &fileName)
const QDomNode type_node(geoTypes.at(i));
const QString nodeName = type_node.nodeName();
if (nodeName.compare("name") == 0)
+ {
if (type_node.toElement().text().isEmpty())
{
ERR("XmlGmlInterface::readFile(): <name>-tag is empty.")
@@ -98,7 +107,10 @@ int XmlGmlInterface::readFile(const QString &fileName)
return 0;
}
else
+ {
gliName = type_node.toElement().text().toStdString();
+ }
+ }
else if (nodeName.compare("points") == 0)
{
readPoints(type_node, points.get(), pnt_names.get());
@@ -158,12 +170,16 @@ int XmlGmlInterface::readFile(const QString &fileName)
}
if (!polylines->empty())
+ {
_geo_objs.addPolylineVec(std::move(polylines), gliName,
std::move(ply_names));
+ }
if (!surfaces->empty())
+ {
_geo_objs.addSurfaceVec(std::move(surfaces), gliName,
std::move(sfc_names));
+ }
return 1;
}
@@ -182,8 +198,10 @@ void XmlGmlInterface::readPoints(const QDomNode& pointsRoot,
point.attribute("z").toDouble(),
point.attribute("id").toInt());
if (point.hasAttribute("name"))
- pnt_names->insert( std::pair<std::string, std::size_t>(
- point.attribute("name").toStdString(), points->size()) );
+ {
+ pnt_names->insert(std::pair<std::string, std::size_t>(
+ point.attribute("name").toStdString(), points->size()));
+ }
points->push_back(p);
point = point.nextSiblingElement();
@@ -228,8 +246,10 @@ void XmlGmlInterface::readPolylines(
{
std::string polyline_name;
if (polyline.hasAttribute("name"))
+ {
polyline_name =
polyline.attribute("name").toStdString();
+ }
OGS_FATAL(
"Polyline `%s' contains the point id `%d' which is "
"not in the point list.",
@@ -262,8 +282,10 @@ void XmlGmlInterface::readSurfaces(
surfaces->push_back(new GeoLib::Surface(points));
if (surface.hasAttribute("name"))
- sfc_names->insert( std::pair<std::string, std::size_t>( surface.attribute("name").toStdString(),
- surfaces->size()-1) );
+ {
+ sfc_names->insert(std::pair<std::string, std::size_t>(
+ surface.attribute("name").toStdString(), surfaces->size() - 1));
+ }
auto accessOrError =
[this, &surface](auto pt_idx) {
@@ -272,8 +294,9 @@ void XmlGmlInterface::readSurfaces(
{
std::string surface_name;
if (surface.hasAttribute("name"))
- surface_name =
- surface.attribute("name").toStdString();
+ {
+ surface_name = surface.attribute("name").toStdString();
+ }
OGS_FATAL(
"Surface `%s' contains the point id `%d', which is "
"not in the point list.",
@@ -352,8 +375,10 @@ bool XmlGmlInterface::write()
std::string const& point_name(pnt_vec->getItemNameByID(i));
if (!point_name.empty())
+ {
pointTag.setAttribute("name",
QString::fromStdString(point_name));
+ }
pointsListTag.appendChild(pointTag);
}
@@ -436,9 +461,10 @@ bool XmlGmlInterface::write()
std::string sfc_name("");
if (sfc_vec->getNameOfElementByID(i, sfc_name))
- surfaceTag.setAttribute("name",
- QString::fromStdString(
- sfc_name));
+ {
+ surfaceTag.setAttribute(
+ "name", QString::fromStdString(sfc_name));
+ }
sfcListTag.appendChild(surfaceTag);
diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
index 22d2facf479691398f5e5b096af38eb10a2ee788..1556fd19abc192c9526c7b4fa570deecfb656a5a 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
+++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
@@ -40,8 +40,10 @@ XMLInterface(), XMLQtInterface("OpenGeoSysSTN.xsd"), _geo_objs(geo_objs)
int XmlStnInterface::readFile(const QString &fileName)
{
- if(XMLQtInterface::readFile(fileName) == 0)
+ if (XMLQtInterface::readFile(fileName) == 0)
+ {
return 0;
+ }
QDomDocument doc("OGS-STN-DOM");
doc.setContent(_fileData);
@@ -65,15 +67,24 @@ int XmlStnInterface::readFile(const QString &fileName)
const QDomNode station_node(stationList.at(j));
const QString station_type(station_node.nodeName());
if (station_type.compare("name") == 0)
+ {
stnName = station_node.toElement().text().toStdString();
+ }
else if (station_type.compare("stations") == 0)
+ {
readStations(station_node, stations.get(), fileName.toStdString());
+ }
else if (station_type.compare("boreholes") == 0)
- readStations(station_node, stations.get(), fileName.toStdString());
+ {
+ readStations(station_node, stations.get(),
+ fileName.toStdString());
+ }
}
if (!stations->empty())
+ {
_geo_objs.addStationVec(std::move(stations), stnName);
+ }
}
return 1;
@@ -102,18 +113,28 @@ void XmlStnInterface::readStations( const QDomNode &stationsRoot,
const QString feature_name (feature_node.nodeName());
const QString element_text (feature_node.toElement().text());
if (feature_name.compare("name") == 0)
+ {
stationName = element_text.toStdString();
+ }
if (feature_name.compare("sensordata") == 0)
+ {
sensor_data_file_name = element_text.toStdString();
/* add other station features here */
// check for general borehole features
+ }
else if (feature_name.compare("value") == 0)
+ {
stationValue = element_text.toDouble();
+ }
else if (feature_name.compare("bdepth") == 0)
+ {
boreholeDepth = element_text.toDouble();
+ }
else if (feature_name.compare("bdate") == 0)
- boreholeDate = element_text.toStdString();
+ {
+ boreholeDate = element_text.toStdString();
+ }
/* add other borehole features here */
}
@@ -127,8 +148,10 @@ void XmlStnInterface::readStations( const QDomNode &stationsRoot,
stationName);
s->setStationValue(stationValue);
if (!sensor_data_file_name.empty())
- s->addSensorDataFromCSV(BaseLib::copyPathToFileName(sensor_data_file_name,
- station_file_name));
+ {
+ s->addSensorDataFromCSV(BaseLib::copyPathToFileName(
+ sensor_data_file_name, station_file_name));
+ }
stations->push_back(s);
}
else if (station.nodeName().compare("borehole") == 0)
@@ -142,9 +165,13 @@ void XmlStnInterface::readStations( const QDomNode &stationsRoot,
boreholeDate);
s->setStationValue(stationValue);
/* add stratigraphy to the borehole */
- for(int j = 0; j < stationFeatures.count(); j++)
+ for (int j = 0; j < stationFeatures.count(); j++)
+ {
if (stationFeatures.at(j).nodeName().compare("strat") == 0)
+ {
this->readStratigraphy(stationFeatures.at(j), s);
+ }
+ }
stations->push_back(s);
}
@@ -169,9 +196,14 @@ void XmlStnInterface::readStratigraphy( const QDomNode &stratRoot,
std::string horizonName("[NN]");
QDomNodeList horizonFeatures = horizon.childNodes();
- for(int i = 0; i < horizonFeatures.count(); i++)
+ for (int i = 0; i < horizonFeatures.count(); i++)
+ {
if (horizonFeatures.at(i).nodeName().compare("name") == 0)
- horizonName = horizonFeatures.at(i).toElement().text().toStdString();
+ {
+ horizonName =
+ horizonFeatures.at(i).toElement().text().toStdString();
+ }
+ }
/* add other horizon features here */
double depth (horizon.attribute("z").toDouble());
@@ -231,12 +263,14 @@ bool XmlStnInterface::write()
double sValue = static_cast<GeoLib::Station*>((*stations)[0])->getStationValue();
std::size_t nStations(stations->size());
for (std::size_t i = 1; i < nStations; i++)
+ {
if ((static_cast<GeoLib::Station*>((*stations)[i])->getStationValue() - sValue) <
std::numeric_limits<double>::epsilon())
{
useStationValue = true;
break;
}
+ }
for (std::size_t i = 0; i < nStations; i++)
{
@@ -267,8 +301,11 @@ bool XmlStnInterface::write()
}
if (isBorehole)
- writeBoreholeData(doc, stationTag,
- static_cast<GeoLib::StationBorehole*>((*stations)[i]));
+ {
+ writeBoreholeData(
+ doc, stationTag,
+ static_cast<GeoLib::StationBorehole*>((*stations)[i]));
+ }
}
std::string xml = doc.toString().toStdString();
@@ -362,13 +399,19 @@ int XmlStnInterface::rapidReadFile(const std::string &fileName)
{
std::string b(list_item->name());
if (b == "stations")
+ {
this->rapidReadStations(list_item, stations.get(), fileName);
+ }
if (b == "boreholes")
+ {
this->rapidReadStations(list_item, stations.get(), fileName);
+ }
}
if (!stations->empty())
+ {
_geo_objs.addStationVec(std::move(stations), stnName);
+ }
}
doc.clear();
@@ -389,19 +432,27 @@ void XmlStnInterface::rapidReadStations(const rapidxml::xml_node<>* station_root
{
double zVal(0.0);
if (station_node->first_attribute("z"))
+ {
zVal = strtod(station_node->first_attribute("z")->value(),
nullptr);
+ }
std::string station_name(""), sensor_data_file_name(""), bdate_str("0000-00-00");
double station_value(0.0), borehole_depth(0.0);
if (station_node->first_node("name"))
+ {
station_name = station_node->first_node("name")->value();
+ }
if (station_node->first_node("sensordata"))
+ {
sensor_data_file_name =
- station_node->first_node("sensordata")->value();
+ station_node->first_node("sensordata")->value();
+ }
if (station_node->first_node("value"))
+ {
station_value =
strtod(station_node->first_node("value")->value(), nullptr);
+ }
/* add other station features here */
if (std::string(station_node->name()) == "station")
@@ -415,18 +466,23 @@ void XmlStnInterface::rapidReadStations(const rapidxml::xml_node<>* station_root
station_name);
s->setStationValue(station_value);
if (!sensor_data_file_name.empty())
+ {
s->addSensorDataFromCSV(BaseLib::copyPathToFileName(
- sensor_data_file_name,
- file_name));
+ sensor_data_file_name, file_name));
+ }
stations->push_back(s);
}
else if (std::string(station_node->name()) == "borehole")
{
if (station_node->first_node("bdepth"))
+ {
borehole_depth = strtod(
station_node->first_node("bdepth")->value(), nullptr);
+ }
if (station_node->first_node("bdate"))
+ {
bdate_str = station_node->first_node("bdate")->value();
+ }
/* add other borehole features here */
GeoLib::StationBorehole* s =
@@ -442,7 +498,10 @@ void XmlStnInterface::rapidReadStations(const rapidxml::xml_node<>* station_root
s->setStationValue(station_value);
if (station_node->first_node("strat"))
- this->rapidReadStratigraphy(station_node->first_node("strat"), s);
+ {
+ this->rapidReadStratigraphy(
+ station_node->first_node("strat"), s);
+ }
stations->push_back(s);
}
@@ -465,7 +524,9 @@ void XmlStnInterface::rapidReadStratigraphy( const rapidxml::xml_node<>* strat_r
{
std::string horizon_name("[NN]");
if (horizon_node->first_node("name"))
+ {
horizon_name = horizon_node->first_node("name")->value();
+ }
/* add other horizon features here */
double depth(
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index 214fef1d6af9abb6bdd5c34c5a6c2298e1e6aa91..086c3dba4b0539347d8d3954330adda70b72777c 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -133,7 +133,9 @@ const Element* Element::getNeighbor(unsigned i) const
#ifndef NDEBUG
if (i < getNumberOfNeighbors())
#endif
+ {
return _neighbors[i];
+ }
#ifndef NDEBUG
ERR("Error in MeshLib::Element::getNeighbor() - Index does not exist.");
return nullptr;
@@ -158,7 +160,9 @@ const Node* Element::getNode(unsigned i) const
#ifndef NDEBUG
if (i < getNumberOfNodes())
#endif
+ {
return _nodes[i];
+ }
#ifndef NDEBUG
ERR("Error in MeshLib::Element::getNode() - Index %d in %s", i, MeshElemType2String(getGeomType()).c_str());
return nullptr;
@@ -170,15 +174,19 @@ void Element::setNode(unsigned idx, Node* node)
#ifndef NDEBUG
if (idx < getNumberOfNodes())
#endif
+ {
_nodes[idx] = node;
+ }
}
std::size_t Element::getNodeIndex(unsigned i) const
{
#ifndef NDEBUG
- if (i<getNumberOfNodes())
+ if (i < getNumberOfNodes())
#endif
+ {
return _nodes[i]->getID();
+ }
#ifndef NDEBUG
ERR("Error in MeshLib::Element::getNodeIndex() - Index does not exist.");
return std::numeric_limits<std::size_t>::max();
@@ -216,7 +224,9 @@ std::ostream& operator<<(std::ostream& os, Element const& e)
<< static_cast<std::underlying_type<MeshElemType>::type>(e.getGeomType())
<< " with " << nnodes << " nodes: { ";
for (unsigned n = 0; n < nnodes; ++n)
+ {
os << nodes[n]->getID() << " @ " << nodes[n] << " ";
+ }
os << "}\n";
return os;
}
diff --git a/MeshLib/MeshSearch/MeshElementGrid.cpp b/MeshLib/MeshSearch/MeshElementGrid.cpp
index d575dc13ab9255176881a09e99b2c03b0fd62cb6..b7c9523d1afe9afca5b84b3c6e7c1d13aae5362b 100644
--- a/MeshLib/MeshSearch/MeshElementGrid.cpp
+++ b/MeshLib/MeshSearch/MeshElementGrid.cpp
@@ -242,13 +242,17 @@ void getGridGeometry(MeshElementGrid const& grid,
auto* ply_bottom(new GeoLib::Polyline(points));
for (std::size_t l(0); l < 4; ++l)
+ {
ply_bottom->addPoint(l);
+ }
ply_bottom->addPoint(0); // close to bottom surface
plys->push_back(ply_bottom);
auto* ply_top(new GeoLib::Polyline(points));
- for (std::size_t l(4); l<8; ++l)
+ for (std::size_t l(4); l < 8; ++l)
+ {
ply_top->addPoint(l);
+ }
ply_top->addPoint(4); // close to top surface
plys->push_back(ply_top);
@@ -278,7 +282,9 @@ void getGridGeometry(MeshElementGrid const& grid,
}
}
if (geometries.mergeGeometries(cell_names, geometry_name) == 2)
+ {
geometry_name = cell_names.front();
+ }
}
#endif // NDEBUG
diff --git a/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
index 6797cfb6fff1ee63d34623c4bf75f327c34e8625..6139d01f00b3c2bc3d4d9c357d38c74605f0e328 100644
--- a/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
@@ -28,7 +28,9 @@ public:
explicit FlushStdoutGuard(bool const flush) : _flush(flush)
{
if (!flush)
+ {
return;
+ }
LOGOG_COUT << std::flush;
}
@@ -37,7 +39,9 @@ public:
~FlushStdoutGuard()
{
if (!_flush)
+ {
return;
+ }
using namespace pybind11::literals;
pybind11::print("end"_a = "", "flush"_a = true);
@@ -144,16 +148,20 @@ void PythonBoundaryCondition::getEssentialBCValues(
}
if (!pair_flag_value.first)
+ {
continue;
+ }
MeshLib::Location l(_bc_data.bulk_mesh_id, MeshLib::MeshItemType::Node,
bulk_node_id);
const auto dof_idx = _bc_data.dof_table_bulk.getGlobalIndex(
l, _bc_data.global_component_id);
if (dof_idx == NumLib::MeshComponentMap::nop)
+ {
OGS_FATAL(
"Logic error. This error should already have occured while "
"gathering primary variables. Something nasty is going on!");
+ }
// For the DDC approach (e.g. with PETSc option), the negative
// index of g_idx means that the entry by that index is a ghost
@@ -209,10 +217,12 @@ std::unique_ptr<PythonBoundaryCondition> createPythonBoundaryCondition(
pybind11::module::import("__main__").attr("__dict__");
if (!scope.contains(bc_object))
+ {
OGS_FATAL(
"Function `%s' is not defined in the python script file, or there "
"was no python script file specified.",
bc_object.c_str());
+ }
auto* bc = scope[bc_object.c_str()]
.cast<PythonBoundaryConditionPythonSideInterface*>();
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index 238e76fef24b6371846024fe84914dd0eda2a3a6..13c6f63e9ffa091229a15b073a4ec6e3606d9e03 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -59,14 +59,18 @@ void ComponentTransportProcess::initializeConcreteProcess(
for (auto pv_iter = std::next(_process_variables[process_id].begin());
pv_iter != _process_variables[process_id].end();
++pv_iter)
+ {
transport_process_variables.push_back(*pv_iter);
+ }
}
else
{
for (auto pv_iter = std::next(_process_variables.begin());
pv_iter != _process_variables.end();
++pv_iter)
+ {
transport_process_variables.push_back((*pv_iter)[0]);
+ }
_xs_previous_timestep.resize(_process_variables.size());
}
@@ -162,8 +166,7 @@ Eigen::Vector3d ComponentTransportProcess::getFlux(std::size_t const element_id,
return _local_assemblers[element_id]->getFlux(p, t, local_x);
}
- else
- {
+
std::vector<std::vector<GlobalIndexType>>
indices_of_all_coupled_processes{
_coupled_solutions->coupled_xs.size(), r_c_indices.rows};
@@ -171,7 +174,6 @@ Eigen::Vector3d ComponentTransportProcess::getFlux(std::size_t const element_id,
*(this->_coupled_solutions), indices_of_all_coupled_processes);
return _local_assemblers[element_id]->getFlux(p, t, local_xs);
- }
}
void ComponentTransportProcess::
diff --git a/ProcessLib/SourceTerms/Python/CreatePythonSourceTerm.cpp b/ProcessLib/SourceTerms/Python/CreatePythonSourceTerm.cpp
index f0998bb45f9eb39738a19f9033de90d76f1b1fdc..299ec57a0fa6dbcf3602dc4d1681a8db564c1f9f 100644
--- a/ProcessLib/SourceTerms/Python/CreatePythonSourceTerm.cpp
+++ b/ProcessLib/SourceTerms/Python/CreatePythonSourceTerm.cpp
@@ -41,10 +41,12 @@ std::unique_ptr<SourceTerm> createPythonSourceTerm(
pybind11::module::import("__main__").attr("__dict__");
if (!scope.contains(source_term_object))
+ {
OGS_FATAL(
"Function `%s' is not defined in the python script file, or there "
"was no python script file specified.",
source_term_object.c_str());
+ }
auto* source_term = scope[source_term_object.c_str()]
.cast<ProcessLib::SourceTerms::Python::
diff --git a/ProcessLib/SourceTerms/Python/PythonSourceTerm.cpp b/ProcessLib/SourceTerms/Python/PythonSourceTerm.cpp
index 06401a8660b3742c65e8ed6b39f9c8897dfe9e76..b39cd3fe82d531cf1de5d4b3454679c5f5ebbc49 100644
--- a/ProcessLib/SourceTerms/Python/PythonSourceTerm.cpp
+++ b/ProcessLib/SourceTerms/Python/PythonSourceTerm.cpp
@@ -29,7 +29,9 @@ public:
explicit FlushStdoutGuard(bool const flush) : _flush(flush)
{
if (!flush)
+ {
return;
+ }
LOGOG_COUT << std::flush;
}
@@ -38,7 +40,9 @@ public:
~FlushStdoutGuard()
{
if (!_flush)
+ {
return;
+ }
using namespace pybind11::literals;
pybind11::print("end"_a = "", "flush"_a = true);
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
index 9f6cef0bb3c274cadb39e7122ba5e6788db1430b..5e6fb80989a049531dec93408eb4828d4243b68a 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
@@ -337,9 +337,11 @@ void ThermoHydroMechanicsProcess<DisplacementDim>::preTimestepConcreteProcess(
_process_data.t = t;
if (hasMechanicalProcess(process_id))
+ {
GlobalExecutor::executeMemberOnDereferenced(
&LocalAssemblerInterface::preTimestep, _local_assemblers,
*_local_to_global_index_map, x, t, dt);
+ }
}
template <int DisplacementDim>
diff --git a/Tests/FileIO_Qt/TestFEFLOWInterface.cpp b/Tests/FileIO_Qt/TestFEFLOWInterface.cpp
index ef99a6ac8310cbd1548c88f1732f1b3ad0663e2b..8aa639895680047ffd3770245ea1e183c38c71f0 100644
--- a/Tests/FileIO_Qt/TestFEFLOWInterface.cpp
+++ b/Tests/FileIO_Qt/TestFEFLOWInterface.cpp
@@ -53,9 +53,11 @@ TEST(FileIO, TestFEFLOWReadHexMesh)
EXPECT_EQ(12, mesh->getNumberOfNodes());
EXPECT_EQ(2, mesh->getNumberOfElements());
- for (std::size_t k(0); k<mesh->getNumberOfElements(); ++k)
+ for (std::size_t k(0); k < mesh->getNumberOfElements(); ++k)
+ {
EXPECT_EQ(MeshLib::MeshElemType::HEXAHEDRON,
mesh->getElement(k)->getGeomType());
+ }
}
TEST(FileIO, TestFEFLOWReadPrismMesh)
@@ -68,9 +70,11 @@ TEST(FileIO, TestFEFLOWReadPrismMesh)
EXPECT_EQ(12, mesh->getNumberOfNodes());
EXPECT_EQ(4, mesh->getNumberOfElements());
- for (std::size_t k(0); k<mesh->getNumberOfElements(); ++k)
+ for (std::size_t k(0); k < mesh->getNumberOfElements(); ++k)
+ {
EXPECT_EQ(MeshLib::MeshElemType::PRISM,
mesh->getElement(k)->getGeomType());
+ }
}
TEST(FileIO, TestFEFLOWReadHexPrismMesh)
@@ -83,9 +87,11 @@ TEST(FileIO, TestFEFLOWReadHexPrismMesh)
EXPECT_EQ(12, mesh->getNumberOfNodes());
EXPECT_EQ(3, mesh->getNumberOfElements());
- for (std::size_t k(0); k<2; ++k)
+ for (std::size_t k(0); k < 2; ++k)
+ {
EXPECT_EQ(MeshLib::MeshElemType::PRISM,
mesh->getElement(k)->getGeomType());
+ }
EXPECT_EQ(MeshLib::MeshElemType::HEXAHEDRON,
mesh->getElement(2)->getGeomType());
}
@@ -100,9 +106,11 @@ TEST(FileIO, TestFEFLOWReadTetMesh)
EXPECT_EQ(13, mesh->getNumberOfNodes());
EXPECT_EQ(22, mesh->getNumberOfElements());
- for (std::size_t k(0); k<mesh->getNumberOfElements(); ++k)
+ for (std::size_t k(0); k < mesh->getNumberOfElements(); ++k)
+ {
EXPECT_EQ(MeshLib::MeshElemType::TETRAHEDRON,
mesh->getElement(k)->getGeomType());
+ }
}
TEST(FileIO, TestFEFLOWReadPrismTetMesh)
@@ -115,10 +123,14 @@ TEST(FileIO, TestFEFLOWReadPrismTetMesh)
EXPECT_EQ(16, mesh->getNumberOfNodes());
EXPECT_EQ(20, mesh->getNumberOfElements());
- for (std::size_t k(0); k<4; ++k)
+ for (std::size_t k(0); k < 4; ++k)
+ {
EXPECT_EQ(MeshLib::MeshElemType::PRISM,
mesh->getElement(k)->getGeomType());
- for (std::size_t k(4); k<mesh->getNumberOfElements(); ++k)
+ }
+ for (std::size_t k(4); k < mesh->getNumberOfElements(); ++k)
+ {
EXPECT_EQ(MeshLib::MeshElemType::TETRAHEDRON,
mesh->getElement(k)->getGeomType());
+ }
}
diff --git a/Tests/MeshLib/ConvertToLinearMesh.cpp b/Tests/MeshLib/ConvertToLinearMesh.cpp
index 068bea3f6f0024b8e30cfab2b7cae4d6c5633fb2..b4dcddffbe9945a81bea0cd46aebfffe2c973461 100644
--- a/Tests/MeshLib/ConvertToLinearMesh.cpp
+++ b/Tests/MeshLib/ConvertToLinearMesh.cpp
@@ -88,7 +88,9 @@ boost::optional<std::string> equal(Element const& a, Element const& b)
while (first_b_node < nnodes)
{
if (*a_nodes[0] == *b_nodes[first_b_node])
+ {
break;
+ }
++first_b_node;
}
if (first_b_node == nnodes)
diff --git a/Tests/MeshLib/TestRasterToMesh.cpp b/Tests/MeshLib/TestRasterToMesh.cpp
index 9829ec2fda3c12618fd32c876f58474b809fc335..1c812d9c0aa96676fea83f1eac9a5eae8b7ff749 100644
--- a/Tests/MeshLib/TestRasterToMesh.cpp
+++ b/Tests/MeshLib/TestRasterToMesh.cpp
@@ -299,7 +299,9 @@ TEST_F(RasterToMeshTest, vtkImage)
std::vector<MeshLib::Node*> const& nodes = mesh->getNodes();
for (MeshLib::Node* n : nodes)
+ {
ASSERT_TRUE((*n)[2] == 0);
+ }
std::array<unsigned, 7> n_types =
MeshLib::MeshInformation::getNumberOfElementTypes(*mesh);