Merge branch 'insitu' into 'master' (c8d70e66) · 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

"api/src/git@gitlab.ebrains.eu:hbp-mip/gateway.git" did not exist on "fa77f687206a6e008f6d7172e183b429520a0eb6"

c8d70e66

Commit c8d70e66 authored 4 years ago by

Pablo Toharia

Downloads
- Plain Diff

Merge branch 'insitu' into 'master'

Insitu update

See merge request nsviz/visimpl!59

parents 54cdec59 7c641af6

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 3 additions, 2 deletions

.gitlab-ci.yml
stackviz/DisplayManagerWidget.cpp 12 additions, 12 deletions

stackviz/DisplayManagerWidget.cpp
stackviz/MainWindow.cpp 31 additions, 65 deletions

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

stackviz/MainWindow.h
stackviz/stackviz.cpp 17 additions, 1 deletion

stackviz/stackviz.cpp
sumrice/FocusFrame.cpp 0 additions, 3 deletions

sumrice/FocusFrame.cpp
sumrice/Histogram.cpp 19 additions, 13 deletions

sumrice/Histogram.cpp
sumrice/Summary.cpp 213 additions, 206 deletions

sumrice/Summary.cpp
sumrice/Summary.h 0 additions, 1 deletion

sumrice/Summary.h
visimpl/MainWindow.cpp 21 additions, 31 deletions

visimpl/MainWindow.cpp
visimpl/OpenGLWidget.cpp 27 additions, 26 deletions

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

visimpl/OpenGLWidget.h
visimpl/visimpl.cpp 13 additions, 0 deletions

visimpl/visimpl.cpp

with 361 additions and 376 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