From 10ad43a6a11727c0ef8fea69cb3c76956e846426 Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Wed, 22 Aug 2012 17:57:57 +0200
Subject: [PATCH] merged changes
---
FileIO/ImportFileTypes.h | 4 ++--
Gui/mainwindow.cpp | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/FileIO/ImportFileTypes.h b/FileIO/ImportFileTypes.h
index 150f075b156..449092e3a08 100644
--- a/FileIO/ImportFileTypes.h
+++ b/FileIO/ImportFileTypes.h
@@ -48,7 +48,7 @@ public:
else if (t==ImportFileType::SHAPE) return "Shape";
else if (t==ImportFileType::TETGEN) return "TetGen node";
else if (t==ImportFileType::VTK) return "VTK";
- else "";
+ else return "";
}
static std::string getFileSuffixString(ImportFileType::type t)
@@ -73,7 +73,7 @@ public:
return "TetGen node files (*.node)";
else if (t==ImportFileType::VTK)
return "VTK files (*.vtk *.vti *.vtr *.vts *.vtp *.vtu)";
- else "All files (*.*)";
+ else return "All files (*.*)";
}
};
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index fb01bb3cae8..b5cf38e36b6 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -570,6 +570,10 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
_meshModels->addMesh(mesh);
}
}
+ else if (t == ImportFileType::GMSH)
+ {
+ // TODO6
+ }
else if (t == ImportFileType::NETCDF)
{
// NetCDF files
--
GitLab