Diffusion MITK bcd4d2c2c430

Merge branch 'bug-15819-dicomrt-module-shader' into bug-15819-dicomrt…
bcd4d2c2c430
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-15819-dicomrt-module-shader' into bug-15819-dicomrt-integrationBranch

Details

Provenance

Authored on Mar 20 2014, 1:36 PM

Parents

rMITK1f4e28809d09: new method for activating sliding and vector for isolines
rMITKc7438c29e43e: COMP: Merge branch 'bug-17523-SetPlaceholderTextInUIFile'

Branches

Unknown

Tags

Unknown

Event Timeline

riecker committed rMITKbcd4d2c2c430: Merge branch 'bug-15819-dicomrt-module-shader' into bug-15819-dicomrt… (authored by riecker).Mar 20 2014, 1:36 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

1f4e28809d09 new method for activating sliding and vector for isolines
Author
riecker
Browse Repository
No Builds
No Audits
4dcabc774442 get the slicenavigationcontroller
Author
riecker
Browse Repository
No Builds
No Audits
18c0efbe3436 added an itk::MemberCommand for changing the slide
Author
riecker
Browse Repository
No Builds
No Audits
7a6828f2fc44 converted isolines to helperObjects
Author
riecker
Browse Repository
No Builds
No Audits
da7ecc269f09 added all standard isolines from preset and added some functions for button…
Author
riecker
Browse Repository
No Builds
No Audits
a6ca73f803ca set an other mapper for the isoline
Author
riecker
Browse Repository
No Builds
No Audits
d466c047dbe4 fixed the referenceDose bug in QmitkFreeIsoDoseLevelWidget
Author
riecker
Browse Repository
No Builds
No Audits
6a81890a6452 dummy isoslider for performance test
Author
riecker
Browse Repository
No Builds
No Audits
67cc7bb5b710 vtkcontourfilter-isoline from a single slice
Author
riecker
Browse Repository
No Builds
No Audits
9a36ee4e9219 added the vtkcontourfilter for isolines
Author
riecker
Browse Repository
No Builds
No Audits
7669cfaf96b2 opacity for lut
Author
riecker
Browse Repository
No Builds
No Audits
7ad495e985e4 added the lut update by changing the reference dose
Author
riecker
Browse Repository
No Builds
No Audits
afbcc056bce9 fixed a windows include-problem
Author
riecker
Browse Repository
No Builds
No Audits
204eb7200937 Merge cherry-pick-branch 'integration of final dipp prototype' into 'bug-15819…
Author
riecker
Browse Repository
No Builds
No Audits
113fc7efbd97 removed the loading buttons
Author
riecker
Browse Repository
No Builds
No Audits
1905eaaca1a3 fixed the reference dose
Author
riecker
Browse Repository
No Builds
No Audits
79f1a212d2f0 edited the vtkcolortransferfunction
Author
riecker
Browse Repository
No Builds
No Audits
7f45dfbf4e5d added second view for loading buttons added transferfunction for colorwash
Author
riecker
Browse Repository
No Builds
No Audits
62f4715780fc enabled shader loading in plugins contructor
Author
riecker
Browse Repository
No Builds
No Audits
55464bc3ac01 Merge branch 'bug-15819-dicomrt-module-dipp-integration-shader' into bug-15819…
Author
riecker
Browse Repository
No Builds
No Audits
fc4839e39ad1 fixed some cmake problems
Author
riecker
Browse Repository
No Builds
No Audits
732ba3347d6e - corrected wrong usage of IPreferences. Presets are now correctly stored.
Author
floca
Browse Repository
No Builds
No Audits
0385b54eb292 + 1st Draft for dose visualization module and plugin
Author
floca
Browse Repository
No Builds
No Audits
b6342e229275 cleaned the vtkmitkshadertexture
Author
riecker
Browse Repository
No Builds
No Audits
57e1bafcc086 added a new RenderingMode for isodoseshader images
Author
riecker
Browse Repository
No Builds
No Audits
92cc2d5db0da cleaned up the used shader files
Author
riecker
Browse Repository
No Builds
No Audits
8dc730b50f87 first version of the contour shader is running
Author
riecker
Browse Repository
No Builds
No Audits
813076e8bf8b edited the vtkMitkLevelWindowFilter -> no char casting anymore
Author
riecker
Browse Repository
No Builds
No Audits
f2a934028563 changed the texture given to the shader
Author
riecker
Browse Repository
No Builds
No Audits
d896d9666401 added a new vtktexture for the shader
Author
riecker
Browse Repository
No Builds
No Audits
817efe5aff94 isoline button only for dose files available
Author
riecker
Browse Repository
No Builds
No Audits
903eb2bff88a connected the UI elements with functions
Author
riecker
Browse Repository
No Builds
No Audits
60ef4977b6d8 integrated the dicom rt dipp plugin into the mitk dicom rt plugin
Author
riecker
Browse Repository
No Builds
No Audits
fd25be55e8c9 integrated the shader in mitkimagevtkmapper2D
Author
riecker
Browse Repository
No Builds
No Audits
c5ce944db614 auto load for the shader
Author
riecker
Browse Repository
No Builds
No Audits
cdda2a1f46aa implemented functionality for loading a shader
Author
riecker
Browse Repository
No Builds
No Audits
9d2814e1b44f integrated the datastructures from DIPP
Author
riecker
Browse Repository
No Builds
No Audits
fd6788fcdf65 Merge branch 'bug-15819-dicomrt-module' into bug-15819-dicomrt-module-dipp…
Author
riecker
Browse Repository
No Builds
No Audits
dbc0f5ded40e added a slider
Author
riecker
Browse Repository
No Builds
No Audits
fd9a9cfce2ea added some methods for isolines
Author
riecker
Browse Repository
No Builds
No Audits
70bafafb04df added 3rd dimension in mapper
Author
riecker
Browse Repository
No Builds
No Audits
a0505a87df9b added name + docu
Author
riecker
Browse Repository
No Builds
No Audits
77c47e76f5b2 changed the geometry of the dose image
Author
riecker
Browse Repository
No Builds
No Audits
16fb2b63b743 deleted the mitknamedcontourmodelsetcontainer
Author
riecker
Browse Repository
No Builds
No Audits
c73c14174338 modified the mitkNamedContourModelSet
Author
riecker
Browse Repository
No Builds
No Audits
41192e71f4e2 added a vector for the NamedContourModelSet
Author
riecker
Browse Repository
No Builds
No Audits
8a70cc625982 replaced the namedcontourmodelset as an nested class
Author
riecker
Browse Repository
No Builds
No Audits
f6b5c773a0d2 implemented the basic of mitkNamedContourModelSet
Author
riecker
Browse Repository
No Builds
No Audits
ea135ca930bd added a new class mitkNamedContourModelSet
Author
riecker
Browse Repository
No Builds
No Audits
e2eb080c10e6 added a prescription dose and relative transferfunction
Author
riecker
Browse Repository
No Builds
No Audits

Changes (109)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

Packages

CMake/

FindDCMTK.cmake

O1: MITK Reviewer Group I

Core/

Code/

DataManagement/

mitkRenderingModeProperty.cpp

mitkRenderingModeProperty.h

Rendering/

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

vtkMitkShaderTexture.cpp

vtkMitkShaderTexture.h

Modules/

ContourModel/

Rendering/

mitkContourModelGLMapper2D.cpp

O3: MITK Reviewer Group II

mitkContourModelGLMapper2DBase.cpp

O3: MITK Reviewer Group II

mitkContourModelMapper2D.cpp

O3: MITK Reviewer Group II

mitkContourModelMapper3D.cpp

O3: MITK Reviewer Group II

mitkContourModelSetGLMapper2D.cpp

O3: MITK Reviewer Group II

mitkContourModelSetMapper3D.cpp

O3: MITK Reviewer Group II

mitkContourModelSetMapper3D.h

O3: MITK Reviewer Group II

mitkDoseValueType.h

mitkIsoDoseLevel.cpp

mitkIsoDoseLevel.h

mitkIsoDoseLevelCollections.cpp

mitkIsoDoseLevelCollections.h

mitkIsoDoseLevelSetProperty.cpp

mitkIsoDoseLevelSetProperty.h

mitkIsoDoseLevelVectorProperty.cpp

mitkIsoDoseLevelVectorProperty.h

mitkRTConstants.cpp

mitkRTConstants.h

mitkDicomRTReaderTest.cpp

mitkDicomRTWriterTest.cpp

mitkDicomRTReader.cpp

mitkDicomRTReader.h

mitkDicomRTWriter.cpp

mitkDicomRTWriter.h

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

mitkIsoLevelsGenerator.cpp

O4: MITK Reviewer Group III

mitkIsoLevelsGenerator.h

O4: MITK Reviewer Group III

mitkRTUIConstants.cpp

O4: MITK Reviewer Group III

mitkRTUIConstants.h

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

QmitkDoseColorDelegate.cpp

O4: MITK Reviewer Group III

QmitkDoseColorDelegate.h

O4: MITK Reviewer Group III

QmitkDoseValueDelegate.cpp

O4: MITK Reviewer Group III

QmitkDoseValueDelegate.h

O4: MITK Reviewer Group III

QmitkDoseVisualStyleDelegate.cpp

O4: MITK Reviewer Group III

QmitkDoseVisualStyleDelegate.h

O4: MITK Reviewer Group III

QmitkFreeIsoDoseLevelWidget.cpp

O4: MITK Reviewer Group III

QmitkFreeIsoDoseLevelWidget.h

O4: MITK Reviewer Group III

QmitkFreeIsoDoseLevelWidget.ui

O4: MITK Reviewer Group III

QmitkIsoDoseLevelSetModel.cpp

O4: MITK Reviewer Group III

QmitkIsoDoseLevelSetModel.h

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

O4: MITK Reviewer Group III

Segmentation/

Interactions/

mitkFeedbackContourTool.cpp

O1: MITK Reviewer Group I

mitkLiveWireTool2D.cpp

O1: MITK Reviewer Group I

Plugins/

PluginList.cmake

org.mitk.dicomrtview

DcmRTVControls.ui

org.mitk.gui.qt.rt.dosevisualization

manifest_headers.cmake

DoseVisualizationPreferencePage.cpp

DoseVisualizationPreferencePage.h

DoseVisualizationPreferencePageControls.ui

LoadingRTView.cpp

LoadingRTView.h

LoadingRTViewControls.ui

RTDoseVisualizer.cpp

RTDoseVisualizer.h

RTDoseVisualizerControls.ui

RTUIPreferencePage.cpp

RTUIPreferencePage.h

RTUIPreferencePageControls.ui

mitkDoseVisPreferenceHelper.cpp

mitkDoseVisPreferenceHelper.h

org_mitk_gui_qt_rt_dosevisualization_Activator.cpp

org_mitk_gui_qt_rt_dosevisualization_Activator.h

rMITKbcd4d2c2c430

CMake/FindDCMTK.cmake

Core/Code/DataManagement/mitkRenderingModeProperty.cpp

Core/Code/DataManagement/mitkRenderingModeProperty.h

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.h

Core/Code/Rendering/vtkMitkShaderTexture.cpp

Core/Code/Rendering/vtkMitkShaderTexture.h

Core/Code/files.cmake

Modules/CMakeLists.txt

Modules/ContourModel/Rendering/mitkContourModelGLMapper2D.cpp

Modules/ContourModel/Rendering/mitkContourModelGLMapper2DBase.cpp

Modules/ContourModel/Rendering/mitkContourModelMapper2D.cpp

Modules/ContourModel/Rendering/mitkContourModelMapper3D.cpp

Modules/ContourModel/Rendering/mitkContourModelSetGLMapper2D.cpp

Modules/ContourModel/Rendering/mitkContourModelSetMapper3D.cpp

Modules/ContourModel/Rendering/mitkContourModelSetMapper3D.h

Modules/DicomRT/CMakeLists.txt

Modules/DicomRT/DataStructures/mitkDoseValueType.h

Modules/DicomRT/DataStructures/mitkIsoDoseLevel.cpp

Modules/DicomRT/DataStructures/mitkIsoDoseLevel.h

Modules/DicomRT/DataStructures/mitkIsoDoseLevelCollections.cpp

Modules/DicomRT/DataStructures/mitkIsoDoseLevelCollections.h

Modules/DicomRT/DataStructures/mitkIsoDoseLevelSetProperty.cpp

Modules/DicomRT/DataStructures/mitkIsoDoseLevelSetProperty.h

Modules/DicomRT/DataStructures/mitkIsoDoseLevelVectorProperty.cpp

Modules/DicomRT/DataStructures/mitkIsoDoseLevelVectorProperty.h

Modules/DicomRT/DataStructures/mitkRTConstants.cpp

Modules/DicomRT/DataStructures/mitkRTConstants.h

Modules/DicomRT/Testing/CMakeLists.txt

Modules/DicomRT/Testing/files.cmake

Modules/DicomRT/Testing/mitkDicomRTReaderTest.cpp

Modules/DicomRT/Testing/mitkDicomRTWriterTest.cpp

Modules/DicomRT/files.cmake

Modules/DicomRT/mitkDicomRTReader.cpp

Modules/DicomRT/mitkDicomRTReader.h

Modules/DicomRT/mitkDicomRTWriter.cpp

Modules/DicomRT/mitkDicomRTWriter.h

Modules/RTUI/CMakeLists.txt

Modules/RTUI/Helper/mitkIsoLevelsGenerator.cpp

Modules/RTUI/Helper/mitkIsoLevelsGenerator.h

Modules/RTUI/Helper/mitkRTUIConstants.cpp

Modules/RTUI/Helper/mitkRTUIConstants.h

Modules/RTUI/Qmitk/QmitkDoseColorDelegate.cpp

Modules/RTUI/Qmitk/QmitkDoseColorDelegate.h

Modules/RTUI/Qmitk/QmitkDoseValueDelegate.cpp

Modules/RTUI/Qmitk/QmitkDoseValueDelegate.h

Modules/RTUI/Qmitk/QmitkDoseVisualStyleDelegate.cpp

Modules/RTUI/Qmitk/QmitkDoseVisualStyleDelegate.h

Modules/RTUI/Qmitk/QmitkFreeIsoDoseLevelWidget.cpp

Modules/RTUI/Qmitk/QmitkFreeIsoDoseLevelWidget.h

Modules/RTUI/Qmitk/QmitkFreeIsoDoseLevelWidget.ui

Modules/RTUI/Qmitk/QmitkIsoDoseLevelSetModel.cpp

Modules/RTUI/Qmitk/QmitkIsoDoseLevelSetModel.h

Modules/RTUI/files.cmake

Modules/RTUI/resources/RTUI.qrc

Modules/RTUI/resources/eye_close.png

Modules/RTUI/resources/eye_open.png

Modules/RTUI/resources/powerGreen.png

Modules/RTUI/resources/powerRed.png

Modules/Segmentation/Interactions/mitkFeedbackContourTool.cpp

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

Plugins/PluginList.cmake

Plugins/org.mitk.dicomrtview/src/internal/DcmRTV.cpp

Plugins/org.mitk.dicomrtview/src/internal/DcmRTVControls.ui

Plugins/org.mitk.gui.qt.rt.dosevisualization/CMakeLists.txt

Plugins/org.mitk.gui.qt.rt.dosevisualization/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.rt.dosevisualization/documentation/UserManual/icon.xpm

Plugins/org.mitk.gui.qt.rt.dosevisualization/documentation/doxygen/modules.dox

Plugins/org.mitk.gui.qt.rt.dosevisualization/files.cmake

Plugins/org.mitk.gui.qt.rt.dosevisualization/manifest_headers.cmake

Plugins/org.mitk.gui.qt.rt.dosevisualization/plugin.xml

Plugins/org.mitk.gui.qt.rt.dosevisualization/resources/icon4.png

Plugins/org.mitk.gui.qt.rt.dosevisualization/resources/icon5.png

Plugins/org.mitk.gui.qt.rt.dosevisualization/resources/icon7.png

Plugins/org.mitk.gui.qt.rt.dosevisualization/resources/iso.png

Plugins/org.mitk.gui.qt.rt.dosevisualization/resources/iso2.png

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/DoseVisualizationPreferencePage.cpp

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/DoseVisualizationPreferencePage.h

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/DoseVisualizationPreferencePageControls.ui

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/LoadingRTView.cpp

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/LoadingRTView.h

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/LoadingRTViewControls.ui

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/RTDoseVisualizer.cpp

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/RTDoseVisualizer.h

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/RTDoseVisualizerControls.ui

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/RTUIPreferencePage.cpp

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/RTUIPreferencePage.h

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/RTUIPreferencePageControls.ui

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/mitkDoseVisPreferenceHelper.cpp

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/mitkDoseVisPreferenceHelper.h

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/org_mitk_gui_qt_rt_dosevisualization_Activator.cpp

Plugins/org.mitk.gui.qt.rt.dosevisualization/src/internal/org_mitk_gui_qt_rt_dosevisualization_Activator.h