From 84d25fa1474c4548d42053761fb5c796b6f36b68 Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Tue, 7 Oct 2014 12:34:04 +0200
Subject: [PATCH] moved file types enum to enum-class and added documentation
---
.../Utils/OGSFileConverter/FileListDialog.cpp | 8 ++++----
.../Utils/OGSFileConverter/FileListDialog.h | 16 +++++++---------
.../Utils/OGSFileConverter/OGSFileConverter.cpp | 8 ++++----
.../Utils/OGSFileConverter/OGSFileConverter.h | 1 +
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/Applications/Utils/OGSFileConverter/FileListDialog.cpp b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
index 2290afaff6b..6e98a71ec3e 100644
--- a/Applications/Utils/OGSFileConverter/FileListDialog.cpp
+++ b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
@@ -91,9 +91,9 @@ void FileListDialog::reject()
const QString FileListDialog::getFileTypeString(FileType file_type) const
{
- if (file_type==GML) return "OpenGeoSys geometry files (*.gml)";
- else if (file_type==VTU) return "OpenGeoSys mesh files (*.vtu)";
- else if (file_type==GLI) return "GeoSys geometry files (*.gli)";
- else if (file_type==MSH) return "GeoSys mesh files (*.msh)";
+ if (file_type==FileType::GML) return "OpenGeoSys geometry files (*.gml)";
+ else if (file_type==FileType::VTU) return "OpenGeoSys mesh files (*.vtu)";
+ else if (file_type==FileType::GLI) return "GeoSys geometry files (*.gli)";
+ else if (file_type==FileType::MSH) return "GeoSys mesh files (*.msh)";
else return "All files (*.*)";
}
diff --git a/Applications/Utils/OGSFileConverter/FileListDialog.h b/Applications/Utils/OGSFileConverter/FileListDialog.h
index c9853600e37..31570804c57 100644
--- a/Applications/Utils/OGSFileConverter/FileListDialog.h
+++ b/Applications/Utils/OGSFileConverter/FileListDialog.h
@@ -20,20 +20,18 @@
#include <QFileDialog>
#include <QStringListModel>
+enum class FileType {
+ GML, // xml-geometries
+ VTU, // xml-meshes
+ GLI, // ascii-geometries
+ MSH, // ascii-meshes
+};
+
class FileListDialog : public QDialog, private Ui_FileList
{
Q_OBJECT
public:
- enum FileType {
- GML, // xml-geometries
- VTU, // xml-meshes
- CND, // xml-fem-conditions
- GLI, // ascii-geometries
- MSH, // ascii-meshes
- BC // ascii-fem-conditions
- };
-
FileListDialog(FileType input, FileType output, QWidget* parent = NULL);
~FileListDialog(void);
diff --git a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
index f29b61648c4..5cc53bd35fa 100644
--- a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
+++ b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
@@ -169,28 +169,28 @@ void OGSFileConverter::convertMSH2VTU(const QStringList &input, const QString &o
void OGSFileConverter::on_gml2gliButton_pressed() const
{
- FileListDialog dlg(FileListDialog::GML, FileListDialog::GLI);
+ FileListDialog dlg(FileType::GML, FileType::GLI);
if (dlg.exec())
convertGML2GLI(dlg.getInputFileList(), dlg.getOutputDir());
}
void OGSFileConverter::on_gli2gmlButton_pressed() const
{
- FileListDialog dlg(FileListDialog::GLI, FileListDialog::GML);
+ FileListDialog dlg(FileType::GLI, FileType::GML);
if (dlg.exec())
convertGLI2GML(dlg.getInputFileList(), dlg.getOutputDir());
}
void OGSFileConverter::on_vtu2mshButton_pressed() const
{
- FileListDialog dlg(FileListDialog::VTU, FileListDialog::MSH);
+ FileListDialog dlg(FileType::VTU, FileType::MSH);
if (dlg.exec())
convertVTU2MSH(dlg.getInputFileList(), dlg.getOutputDir());
}
void OGSFileConverter::on_msh2vtuButton_pressed() const
{
- FileListDialog dlg(FileListDialog::MSH, FileListDialog::VTU);
+ FileListDialog dlg(FileType::MSH, FileType::VTU);
if (dlg.exec())
convertMSH2VTU(dlg.getInputFileList(), dlg.getOutputDir());
}
diff --git a/Applications/Utils/OGSFileConverter/OGSFileConverter.h b/Applications/Utils/OGSFileConverter/OGSFileConverter.h
index 14b49e8abc7..eea2f09e99b 100644
--- a/Applications/Utils/OGSFileConverter/OGSFileConverter.h
+++ b/Applications/Utils/OGSFileConverter/OGSFileConverter.h
@@ -30,6 +30,7 @@ private:
bool fileExists(const std::string &file_name) const;
private slots:
+ /// Converts all files in the input list and writes the new files to the output directory with the same file name + updated extension.
void convertGML2GLI(const QStringList &input, const QString &output) const;
void convertGLI2GML(const QStringList &input, const QString &output) const;
void convertVTU2MSH(const QStringList &input, const QString &output) const;
--
GitLab