From c022ff656bccbda231623634b817f54066347c3f Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Tue, 13 Dec 2011 09:33:07 +0100
Subject: [PATCH] added tetgen-import to gui
---
Gui/mainwindow.cpp | 17 +++++++++++++++++
Gui/mainwindow.h | 1 +
VtkVis/VtkVisPipeline.cpp | 1 -
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index a5aa63d61e1..95bacb3fdbe 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -748,6 +748,8 @@ QMenu* MainWindow::createImportFilesMenu()
QAction* shapeFiles = importFiles->addAction("&Shape Files...");
connect(shapeFiles, SIGNAL(triggered()), this, SLOT(importShape()));
#endif
+ QAction* tetgenFiles = importFiles->addAction("&TetGen Files...");
+ connect( tetgenFiles, SIGNAL(triggered()), this, SLOT(importTetGen()) );
QAction* vtkFiles = importFiles->addAction("&VTK Files...");
connect( vtkFiles, SIGNAL(triggered()), this, SLOT(importVtk()) );
@@ -893,6 +895,21 @@ void MainWindow::importNetcdf()
}
}
+void MainWindow::importTetGen()
+{
+ QSettings settings("UFZ", "OpenGeoSys-5");
+ QString fileName = QFileDialog::getOpenFileName(this,
+ "Select TetGen file to import",
+ settings.value(
+ "lastOpenedFileDirectory").toString(),
+ "TetGen files (*.nc);;");
+ if (!fileName.isEmpty())
+ {
+ loadFile(fileName);
+ QDir dir = QDir(fileName);
+ settings.setValue("lastOpenedFileDirectory", dir.absolutePath());
+ }}
+
void MainWindow::importVtk()
{
QSettings settings("UFZ", "OpenGeoSys-5");
diff --git a/Gui/mainwindow.h b/Gui/mainwindow.h
index a8df06c1c0d..59baa051383 100644
--- a/Gui/mainwindow.h
+++ b/Gui/mainwindow.h
@@ -74,6 +74,7 @@ protected slots:
void importNetcdf(); //YW 07.2010
void importVtk();
void importFeflow();
+ void importTetGen();
void loadFEMConditions(std::string geoName);
void openDatabase();
void openDatabaseConnection();
diff --git a/VtkVis/VtkVisPipeline.cpp b/VtkVis/VtkVisPipeline.cpp
index d322b79bc42..ee6fe322fe4 100644
--- a/VtkVis/VtkVisPipeline.cpp
+++ b/VtkVis/VtkVisPipeline.cpp
@@ -531,7 +531,6 @@ void VtkVisPipeline::highlightGeoObject(const vtkPolyDataAlgorithm* source, int
parentItem->transformFilter());
static_cast<VtkCompositeGeoObjectFilter*>(filter)->SetIndex(index);
VtkVisPointSetItem* item = new VtkVisPointSetItem(filter, parentItem, itemData);
- //_highlighted_geo_index = this->createIndex(i, 0, item);
QModelIndex parent_index = static_cast<TreeModel*>(this)->index(i, 0, QModelIndex());
_highlighted_geo_index = this->addPipelineItem(item, parent_index);
break;
--
GitLab