Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yuhao Liu
ogs
Commits
c022ff65
Commit
c022ff65
authored
13 years ago
by
Karsten Rink
Browse files
Options
Downloads
Patches
Plain Diff
added tetgen-import to gui
parent
0827f0f1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Gui/mainwindow.cpp
+17
-0
17 additions, 0 deletions
Gui/mainwindow.cpp
Gui/mainwindow.h
+1
-0
1 addition, 0 deletions
Gui/mainwindow.h
VtkVis/VtkVisPipeline.cpp
+0
-1
0 additions, 1 deletion
VtkVis/VtkVisPipeline.cpp
with
18 additions
and
1 deletion
Gui/mainwindow.cpp
+
17
−
0
View file @
c022ff65
...
@@ -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"
);
...
...
This diff is collapsed.
Click to expand it.
Gui/mainwindow.h
+
1
−
0
View file @
c022ff65
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
VtkVis/VtkVisPipeline.cpp
+
0
−
1
View file @
c022ff65
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment