Merge pull request #2586 from rinkk/GocadExpansion

Expansion of GoCAD interface
ufz · Aug 12, 2019 · 1eb6d3c · 1eb6d3c
2 parents 1cdc7af + 701de2c
commit 1eb6d3c
Show file tree

Hide file tree

Showing 7 changed files with 544 additions and 301 deletions.
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
@@ -39,7 +39,7 @@
 #include "Applications/FileIO/GMSInterface.h"
 #include "Applications/FileIO/Gmsh/GMSHInterface.h"
 #include "Applications/FileIO/Gmsh/GmshReader.h"
-#include "Applications/FileIO/GocadIO/GocadTSurfaceReader.h"
+#include "Applications/FileIO/GocadIO/GocadAsciiReader.h"
 #include "Applications/FileIO/Legacy/OGSIOVer4.h"
 #include "Applications/FileIO/PetrelInterface.h"
 #include "Applications/FileIO/TetGenInterface.h"
@@ -687,9 +687,8 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
     else if (t == ImportFileType::GOCAD_TSURF)
     {
         std::string file_name(fileName.toStdString());
-        FileIO::Gocad::GocadTSurfaceReader gcts;
         std::vector<std::unique_ptr<MeshLib::Mesh>> meshes;
-        if (gcts.readFile(file_name, meshes))
+        if (FileIO::Gocad::GocadAsciiReader::readFile(file_name, meshes))
         {
             for (auto& mesh : meshes)
             {