From 4e66852e3b9ea7b1e85d4ea9a8296cd26268ca52 Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Thu, 23 Aug 2012 13:51:39 +0200
Subject: [PATCH] some small changes
---
FileIO/Legacy/OGSIOVer4.cpp | 2 --
Gui/DataView/StationTreeView.cpp | 5 +----
Gui/VtkVis/CMakeLists.txt | 1 +
Gui/VtkVis/VtkVisPipeline.h | 1 -
Gui/VtkVis/VtkVisPipelineItem.h | 2 +-
Gui/mainwindow.cpp | 6 ++++--
6 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/FileIO/Legacy/OGSIOVer4.cpp b/FileIO/Legacy/OGSIOVer4.cpp
index e2f5674c875..c675d37cf6c 100644
--- a/FileIO/Legacy/OGSIOVer4.cpp
+++ b/FileIO/Legacy/OGSIOVer4.cpp
@@ -8,8 +8,6 @@
#include <iomanip>
#include <sstream>
-//TODO6 #include "Configure.h"
-
// FileIO
#include "MeshIO/GMSHInterface.h"
#include "OGSIOVer4.h"
diff --git a/Gui/DataView/StationTreeView.cpp b/Gui/DataView/StationTreeView.cpp
index 50a61103d2c..f8ff5304610 100644
--- a/Gui/DataView/StationTreeView.cpp
+++ b/Gui/DataView/StationTreeView.cpp
@@ -7,9 +7,8 @@
#include <QMenu>
#include <iostream>
-//TODO6 #include "GMSInterface.h"
+#include "GMSInterface.h"
#include "Station.h"
-//TODO6 #include "StationIO.h"
#include "DiagramPrefsDialog.h"
#include "ModelTreeItem.h"
@@ -172,14 +171,12 @@ void StationTreeView::exportStation()
QString temp_name;
std::vector<std::string> temp_soil_names;
temp_soil_names.push_back(""); // soil name vector needs to be initialised
- /* TODO6
GMSInterface::writeBoreholeToGMS(static_cast<GeoLib::StationBorehole*>(static_cast<
StationTreeModel
*>(
model())->stationFromIndex(index,
temp_name)),
fileName.toStdString(), temp_soil_names);
- */
}
}
diff --git a/Gui/VtkVis/CMakeLists.txt b/Gui/VtkVis/CMakeLists.txt
index 1e94ce27c6b..5b48f3692c3 100644
--- a/Gui/VtkVis/CMakeLists.txt
+++ b/Gui/VtkVis/CMakeLists.txt
@@ -132,6 +132,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/Gui/VtkAct
${CMAKE_BINARY_DIR}/Gui/VtkVis
${CMAKE_SOURCE_DIR}/BaseLib
+ ${CMAKE_BINARY_DIR}/BaseLib
${CMAKE_SOURCE_DIR}/FemLib
${CMAKE_SOURCE_DIR}/GeoLib
${CMAKE_SOURCE_DIR}/MathLib
diff --git a/Gui/VtkVis/VtkVisPipeline.h b/Gui/VtkVis/VtkVisPipeline.h
index f76030fff9e..4db365bea0d 100644
--- a/Gui/VtkVis/VtkVisPipeline.h
+++ b/Gui/VtkVis/VtkVisPipeline.h
@@ -9,7 +9,6 @@
// ** INCLUDES **
#include "Color.h"
-//TODO6 #include "Configure.h"
#include "FEMCondition.h"
#include "GeoType.h"
#include "MSHEnums.h"
diff --git a/Gui/VtkVis/VtkVisPipelineItem.h b/Gui/VtkVis/VtkVisPipelineItem.h
index f645acb7121..8054a8de912 100644
--- a/Gui/VtkVis/VtkVisPipelineItem.h
+++ b/Gui/VtkVis/VtkVisPipelineItem.h
@@ -8,7 +8,7 @@
#define VTKVISPIPELINEITEM_H
// ** INCLUDES **
-//TODO6 #include "Configure.h"
+#include "BuildInfo.h"
#include "TreeItem.h"
#include <QList>
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index b5cf38e36b6..439e0dfa386 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -57,7 +57,6 @@
#include "MeshIO/GMSHInterface.h"
// TODO6 #include "MeshIO/TetGenInterface.h"
#include "PetrelInterface.h"
-// TODO6 #include "StationIO.h"
#include "XmlIO/XmlCndInterface.h"
#include "XmlIO/XmlGmlInterface.h"
#include "XmlIO/XmlGspInterface.h"
@@ -69,7 +68,6 @@
#include "Mesh.h"
#include "Node.h"
#include "MshEditor.h"
-//TODO6 #include "ExtractMeshNodes.h"
// Qt includes
#include <QDesktopWidget>
@@ -326,6 +324,7 @@ MainWindow::MainWindow(QWidget* parent /* = 0*/)
MainWindow::~MainWindow()
{
+ delete _signal_mapper;
delete _import_files_menu;
delete _vtkVisPipeline;
delete _meshModels;
@@ -532,6 +531,7 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
}
else if (t == ImportFileType::FEFLOW)
{
+ OGSError::box("Interface not yet integrated");
/* TODO6
FEFLOWInterface feflowIO(_geoModels);
MeshLib::Mesh* msh = feflowIO.readFEFLOWModelFile(fileName.toStdString());
@@ -572,6 +572,7 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
}
else if (t == ImportFileType::GMSH)
{
+ OGSError::box("Interface not yet integrated");
// TODO6
}
else if (t == ImportFileType::NETCDF)
@@ -630,6 +631,7 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
"TetGen element files (*.ele);;");
if (!fileName.isEmpty() && !element_fname.isEmpty()) {
+ OGSError::box("Interface not yet integrated");
/* TODO6
FileIO::TetGenInterface tetgen;
MeshLib::Mesh* msh (tetgen.readTetGenMesh(node_fname.toStdString(), element_fname.toStdString()));
--
GitLab