Merge branch 'bug-18118-UpdateSOFAToLatestRevision'
2d78ee4c84e1
Actions

Description

Merge branch 'bug-18118-UpdateSOFAToLatestRevision'

Details

Provenance

Authored on Jan 9 2015, 9:39 AM

Parents

rMITK5dbc23fe22bb: Removed debugging button.
rMITK61e5bcc3a4cf: Merge branch 'bug-17928-mimetypes-do-not-check-for-validity-writing'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK2d78ee4c84e1: Merge branch 'bug-18118-UpdateSOFAToLatestRevision' (authored by kislinsk).Jan 9 2015, 9:39 AM

Merged Changes

5dbc23fe22bb Removed debugging button.
Author
kislinsk
Browse Repository
No Builds
No Audits
54f5b61c0405 Updated SOFA tarball to latest git revision.
Author
kislinsk
Browse Repository
No Builds
No Audits
6faf9b7b66d7 Suppress SOFA warnings in org.mitk.simulation plugin.
Author
kislinsk
Browse Repository
No Builds
No Audits
fc4513ea367c Use VtkGLMapperWrapper for SimulationGLMapper2D.
Author
kislinsk
Browse Repository
No Builds
No Audits
260256586638 Merge branch 'bug-18118-UpdateSOFAToLatestRevision' of mitk.org:MITK into bug…
Author
kislinsk
Browse Repository
No Builds
No Audits
38c19b7c5e2c Fixed simulation module and plugin build script.
Author
kislinsk
Browse Repository
No Builds
No Audits
fd035545191d Intersecting triangles and planes are rendered by 2d simulation mapper now.
Author
kislinsk
Browse Repository
No Builds
No Audits
49ab2cfda3c5 WIP: Implementing 2D mapper for simulations.
Author
kislinsk
Browse Repository
No Builds
No Audits
2744ce885cfe WIP: Implementing plane intersection approach for 2D rendering.
Author
kislinsk
Browse Repository
No Builds
No Audits
a53e18e8edb7 WIP: Discarded clipping plane approach.
Author
kislinsk
Browse Repository
No Builds
No Audits
c56b175b3124 WIP: Implementing experimental 2D mapper for simulations. Not working yet.
Author
kislinsk
Browse Repository
No Builds
No Audits
615f7fbfc639 Updated SOFA to latest revision. Uses DAGSimulations instead of TreeSimulations…
Author
kislinsk
Browse Repository
No Builds
No Audits
3e2de59553c1 Intersecting triangles and planes are rendered by 2d simulation mapper now.
Author
kislinsk
Browse Repository
No Builds
No Audits
ea6f547f1e21 WIP: Implementing 2D mapper for simulations.
Author
kislinsk
Browse Repository
No Builds
No Audits
0c968f07403a WIP: Implementing plane intersection approach for 2D rendering.
Author
kislinsk
Browse Repository
No Builds
No Audits
93636bf2701c WIP: Discarded clipping plane approach.
Author
kislinsk
Browse Repository
No Builds
No Audits
e27c8b41f75a WIP: Implementing experimental 2D mapper for simulations. Not working yet.
Author
kislinsk
Browse Repository
No Builds
No Audits
20d33c3f620e Updated SOFA to latest revision. Uses DAGSimulations instead of TreeSimulations…
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

Packages

CMakeExternals/

	PatchSOFA-386a3a7.cmake
	PatchSOFA-rev10669.cmake

O1: MITK Reviewer Group I

PatchSOFA-rev10669.cmake

O1: MITK Reviewer Group I

SOFA.cmake

O1: MITK Reviewer Group I

Modules/

Simulation/

CMakeLists.txt

files.cmake

mitkPlaneIntersectionVisitor.cpp

mitkPlaneIntersectionVisitor.h

mitkSimulation.cpp

mitkSimulationGLMapper2D.cpp

mitkSimulationGLMapper2D.h

mitkSimulationObjectFactory.cpp

mitkSimulationVtkMapper3D.cpp

mitkSimulationVtkMapper3D.h

mitkVtkModel.h

Plugins/

org.mitk.gui.qt.simulation/

CMakeLists.txt

src/

internal/

QmitkSimulationView.cpp

QmitkSimulationView.h

QmitkSimulationViewControls.ui

org.mitk.simulation/

CMakeLists.txt

rMITK2d78ee4c84e1

View Options

CMakeExternals/PatchSOFA-386a3a7.cmake

View Options

CMakeExternals/PatchSOFA-rev10669.cmake

View Options

CMakeExternals/SOFA.cmake

View Options

Modules/Simulation/CMakeLists.txt

View Options

Modules/Simulation/files.cmake

View Options

Modules/Simulation/mitkPlaneIntersectionVisitor.cpp

View Options

Modules/Simulation/mitkPlaneIntersectionVisitor.h

View Options

Modules/Simulation/mitkSimulation.cpp

View Options

Modules/Simulation/mitkSimulationGLMapper2D.cpp

View Options

Modules/Simulation/mitkSimulationGLMapper2D.h

View Options

Modules/Simulation/mitkSimulationObjectFactory.cpp

View Options

Modules/Simulation/mitkSimulationVtkMapper3D.cpp

View Options

Modules/Simulation/mitkSimulationVtkMapper3D.h

View Options

Modules/Simulation/mitkVtkModel.h

View Options

Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.cpp

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.h

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationViewControls.ui

View Options

Plugins/org.mitk.simulation/CMakeLists.txt

Merge branch 'bug-18118-UpdateSOFAToLatestRevision'2d78ee4c84e1Actions

Description

Details

Event Timeline

Merged Changes

Changes (19)

rMITK2d78ee4c84e1

CMakeExternals/PatchSOFA-386a3a7.cmake

CMakeExternals/PatchSOFA-rev10669.cmake

CMakeExternals/SOFA.cmake

Modules/Simulation/CMakeLists.txt

Modules/Simulation/files.cmake

Modules/Simulation/mitkPlaneIntersectionVisitor.cpp

Modules/Simulation/mitkPlaneIntersectionVisitor.h

Modules/Simulation/mitkSimulation.cpp

Modules/Simulation/mitkSimulationGLMapper2D.cpp

Modules/Simulation/mitkSimulationGLMapper2D.h

Modules/Simulation/mitkSimulationObjectFactory.cpp

Modules/Simulation/mitkSimulationVtkMapper3D.cpp

Modules/Simulation/mitkSimulationVtkMapper3D.h

Modules/Simulation/mitkVtkModel.h

Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.cpp

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.h

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationViewControls.ui

Plugins/org.mitk.simulation/CMakeLists.txt

Merge branch 'bug-18118-UpdateSOFAToLatestRevision'
2d78ee4c84e1
Actions