Skip to content
Snippets Groups Projects
Commit c022ff65 authored by Karsten Rink's avatar Karsten Rink
Browse files

added tetgen-import to gui

parent 0827f0f1
No related branches found
No related tags found
No related merge requests found
...@@ -748,6 +748,8 @@ QMenu* MainWindow::createImportFilesMenu() ...@@ -748,6 +748,8 @@ QMenu* MainWindow::createImportFilesMenu()
QAction* shapeFiles = importFiles->addAction("&Shape Files..."); QAction* shapeFiles = importFiles->addAction("&Shape Files...");
connect(shapeFiles, SIGNAL(triggered()), this, SLOT(importShape())); connect(shapeFiles, SIGNAL(triggered()), this, SLOT(importShape()));
#endif #endif
QAction* tetgenFiles = importFiles->addAction("&TetGen Files...");
connect( tetgenFiles, SIGNAL(triggered()), this, SLOT(importTetGen()) );
QAction* vtkFiles = importFiles->addAction("&VTK Files..."); QAction* vtkFiles = importFiles->addAction("&VTK Files...");
connect( vtkFiles, SIGNAL(triggered()), this, SLOT(importVtk()) ); connect( vtkFiles, SIGNAL(triggered()), this, SLOT(importVtk()) );
...@@ -893,6 +895,21 @@ void MainWindow::importNetcdf() ...@@ -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() void MainWindow::importVtk()
{ {
QSettings settings("UFZ", "OpenGeoSys-5"); QSettings settings("UFZ", "OpenGeoSys-5");
......
...@@ -74,6 +74,7 @@ protected slots: ...@@ -74,6 +74,7 @@ protected slots:
void importNetcdf(); //YW 07.2010 void importNetcdf(); //YW 07.2010
void importVtk(); void importVtk();
void importFeflow(); void importFeflow();
void importTetGen();
void loadFEMConditions(std::string geoName); void loadFEMConditions(std::string geoName);
void openDatabase(); void openDatabase();
void openDatabaseConnection(); void openDatabaseConnection();
......
...@@ -531,7 +531,6 @@ void VtkVisPipeline::highlightGeoObject(const vtkPolyDataAlgorithm* source, int ...@@ -531,7 +531,6 @@ void VtkVisPipeline::highlightGeoObject(const vtkPolyDataAlgorithm* source, int
parentItem->transformFilter()); parentItem->transformFilter());
static_cast<VtkCompositeGeoObjectFilter*>(filter)->SetIndex(index); static_cast<VtkCompositeGeoObjectFilter*>(filter)->SetIndex(index);
VtkVisPointSetItem* item = new VtkVisPointSetItem(filter, parentItem, itemData); 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()); QModelIndex parent_index = static_cast<TreeModel*>(this)->index(i, 0, QModelIndex());
_highlighted_geo_index = this->addPipelineItem(item, parent_index); _highlighted_geo_index = this->addPipelineItem(item, parent_index);
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment