Merge branch 'insitu_10-21' into 'master' (013c2373) · Commits · SimVisSuite / visimpl · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

visimpl
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

013c2373

Commit 013c2373 authored 3 years ago by

Pablo Toharia

Downloads
- Plain Diff

Merge branch 'insitu_10-21' into 'master'

Insitu pipeline integration update.

See merge request nsviz/visimpl!72

parents 049188ed c1613219

No related branches found

No related tags found

No related merge requests found

Changes 18

Hide whitespace changes

Inline Side-by-side

Showing

.gitsubprojects 1 addition, 1 deletion

.gitsubprojects
CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
stackviz/MainWindow.cpp 94 additions, 37 deletions

stackviz/MainWindow.cpp
stackviz/MainWindow.h 7 additions, 5 deletions

stackviz/MainWindow.h
sumrice/CMakeLists.txt 2 additions, 0 deletions

sumrice/CMakeLists.txt
sumrice/DataInspector.cpp 5 additions, 5 deletions

sumrice/DataInspector.cpp
sumrice/DataInspector.h 0 additions, 0 deletions

sumrice/DataInspector.h
sumrice/Histogram.cpp 31 additions, 24 deletions

sumrice/Histogram.cpp
sumrice/LoaderThread.cpp 14 additions, 2 deletions

sumrice/LoaderThread.cpp
sumrice/Summary.cpp 12 additions, 7 deletions

sumrice/Summary.cpp
sumrice/Summary.h 1 addition, 1 deletion

sumrice/Summary.h
visimpl/CMakeLists.txt 0 additions, 3 deletions

visimpl/CMakeLists.txt
visimpl/DomainManager.cpp 0 additions, 2 deletions

visimpl/DomainManager.cpp
visimpl/MainWindow.cpp 105 additions, 86 deletions

visimpl/MainWindow.cpp
visimpl/MainWindow.h 5 additions, 7 deletions

visimpl/MainWindow.h
visimpl/OpenGLWidget.cpp 21 additions, 15 deletions

visimpl/OpenGLWidget.cpp
visimpl/OpenGLWidget.h 2 additions, 2 deletions

visimpl/OpenGLWidget.h
visimpl/SelectionManagerWidget.cpp 3 additions, 1 deletion

visimpl/SelectionManagerWidget.cpp

with 304 additions and 199 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment