Diffusion MITK cf174c7b401a

Merge branch 'bug-9911-ToFUtilRedesign'
cf174c7b401a
Actions

Description

Merge branch 'bug-9911-ToFUtilRedesign'

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Details

Provenance

seitela

Authored on Nov 8 2011, 4:35 PM

Parents

rMITK8c593acbe01b: Changed property name for transfer function
rMITK2d9228603d9b: Merge branch 'bug-9959-vtkColorTransferFunctionProperty'

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITKcf174c7b401a: Merge branch 'bug-9911-ToFUtilRedesign' (authored by seitela).Nov 8 2011, 4:47 PM

Merged Changes

8c593acbe01b Changed property name for transfer function
Author
seitela
Browse Repository
No Builds
No Audits
28ee0348221f Correctly Set/ Reset visibility settings on Activated() / Deactivated()
Author
seitela
Browse Repository
No Builds
No Audits
d3fc4c316d8e Correctly reset overlay of point set
Author
seitela
Browse Repository
No Builds
No Audits
b0af71b7ebc8 Merge remote branch 'origin/bug-9911-ToFUtilRedesign' into bug-9911…
Author
seitela
Browse Repository
No Builds
No Audits
1c45c52f32c3 Added missing member initialization
Author
seitela
Browse Repository
No Builds
No Audits
3b4c93b5d3ca Correctly remove foreground renderer after closing.
Author
seitela
Browse Repository
No Builds
No Audits
31766fcfe2c6 Added initial usage information to overlay
Author
seitela
Browse Repository
No Builds
No Audits
3c65fdb35118 Merge remote-tracking branch 'origin/bug-9911-ToFUtilRedesign' into bug-9911…
Author
seitela
Browse Repository
No Builds
No Audits
1ef2245042f9 Remove all points from 3D point set when 2D point set is empty. Added…
Author
seitela
Browse Repository
No Builds
No Audits
3722128c1261 Use VtkForegroundRenderer instead of LayerController
Author
seitela
Browse Repository
No Builds
No Audits
12e85f463554 Merge remote branch 'origin/bug-9911-ToFUtilRedesign' into bug-9911…
Author
seitela
Browse Repository
No Builds
No Audits
5b0cae3f46a8 Check for valid databuffers for distance amplitude and intensity image.
Author
seitela
Browse Repository
No Builds
No Audits
ed1097c942e4 Merge remote branch 'origin/bug-9911-ToFUtilRedesign' into bug-9911…
Author
seitela
Browse Repository
No Builds
No Audits
a1d511d84d5b Added "stopp" and "disconnect" of the camera when closing ToFUtil.
Author
seitela
Browse Repository
No Builds
No Audits
fc6755cd6096 Enable texture checkbox only when a surface node is available.
Author
seitela
Browse Repository
No Builds
No Audits
ddeb44ed7055 Merge remote-tracking branch 'origin/bug-9911-ToFUtilRedesign' into bug-9911…
Author
seitela
Browse Repository
No Builds
No Audits
134858125d7c Removed unused code and added documentation.
Author
seitela
Browse Repository
No Builds
No Audits
cc93fa50ed8d Removed multiple destructions of m_OverlayController
Author
seitela
Browse Repository
No Builds
No Audits
a7e4c3fe87c0 Merge remote branch 'origin/bug-9911-ToFUtilRedesign' into bug-9911…
Author
seitela
Browse Repository
No Builds
No Audits
eb9a19aabf9a Fixed initialization of transfer function canvas
Author
seitela
Browse Repository
No Builds
No Audits
c41b357cd1b5 Merge remote-tracking branch 'origin/bug-9911-ToFUtilRedesign' into bug-9911…
Author
seitela
Browse Repository
No Builds
No Audits
7b1a9fdaa557 Correctly apply texture and color transfer function to surface.
Author
seitela
Browse Repository
No Builds
No Audits
05714d0782e4 Merge remote branch 'origin/bug-9911-ToFUtilRedesign' into bug-9911…
Author
seitela
Browse Repository
No Builds
No Audits
d4fe7500a4f9 Removed image selector and cleaned up ToFVisualizationSettingsWidget to be…
Author
seitela
Browse Repository
No Builds
No Audits
b84e34124c4e Set the colorTransferFunctionProperty inside tofutil.
Author
• kilgus
Browse Repository
No Builds
No Audits
3e93e70a2609 First version of the color transferfunction property inside the…
Author
• kilgus
Browse Repository
No Builds
No Audits
906da165961c Added check that PointSet is valid
Author
seitela
Browse Repository
No Builds
No Audits
5f6381855f90 Removed unused widget textures
Author
seitela
Browse Repository
No Builds
No Audits
d66f8ea524da Removed unused code.
Author
seitela
Browse Repository
No Builds
No Audits
a1c62fb5c233 Changes after widget addition
Author
seitela
Browse Repository
No Builds
No Audits
4ef66593d471 Added widget for ToF PointSet interaction / measurement
Author
seitela
Browse Repository
No Builds
No Audits
5cc1e11a7d21 Removed unnecessary methods and commented code
Author
seitela
Browse Repository
No Builds
No Audits
fec50e97ff1f Use images instead of background
Author
seitela
Browse Repository
No Builds
No Audits
2dde06abaf06 Removed unnecessary slot OnToFCameraStop()
Author
seitela
Browse Repository
No Builds
No Audits
a85bdcfc06ea Removed signal ToFCameraStop/Start and other unused code.
Author
seitela
Browse Repository
No Builds
No Audits
ee5c63bd3e84 Removed code that is not used within the bundle
Author
seitela
Browse Repository
No Builds
No Audits

Changes (20)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.cpp

QmitkToFUtilView.h

QmitkToFUtilViewControls.ui

ToFHardware/

mitkToFCameraMITKPlayerDevice.cpp

ToFProcessing/

mitkToFDistanceImageToSurfaceFilter.cpp

mitkToFDistanceImageToSurfaceFilter.h

ToFUI/

CMakeLists.txt

Qmitk/

QmitkToFConnectionWidget.cpp

QmitkToFConnectionWidget.h

QmitkToFPointSetWidget.cpp

QmitkToFPointSetWidget.h

QmitkToFPointSetWidgetControls.ui

QmitkToFRecorderWidget.cpp

QmitkToFVisualisationSettingsWidget.cpp

QmitkToFVisualisationSettingsWidget.h

QmitkToFVisualisationSettingsWidgetControls.ui

files.cmake

resources/

QmitkToFUtilWidget.qrc

	ToFUI/		resources/
	Bundles/	org.mitk.gui.qt.measurement/	resources/

measurement.png

path.png

rMITKcf174c7b401a

View Options

Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h

View Options

Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilViewControls.ui

View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

View Options

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

View Options

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.h

View Options

Modules/ToFUI/CMakeLists.txt

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h

View Options

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.h

View Options

Modules/ToFUI/Qmitk/QmitkToFPointSetWidgetControls.ui

View Options

Modules/ToFUI/Qmitk/QmitkToFRecorderWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidget.h

View Options

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidgetControls.ui

View Options

Modules/ToFUI/files.cmake

View Options

Modules/ToFUI/resources/QmitkToFUtilWidget.qrc

View Options

Modules/ToFUI/resources/measurement.png

View Options

Modules/ToFUI/resources/path.png

Merge branch 'bug-9911-ToFUtilRedesign'cf174c7b401aActions

Description

Details

Event Timeline

Merged Changes

Changes (20)

rMITKcf174c7b401a

Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h

Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilViewControls.ui

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.h

Modules/ToFUI/CMakeLists.txt

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFPointSetWidget.h

Modules/ToFUI/Qmitk/QmitkToFPointSetWidgetControls.ui

Modules/ToFUI/Qmitk/QmitkToFRecorderWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidget.cpp

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidget.h

Modules/ToFUI/Qmitk/QmitkToFVisualisationSettingsWidgetControls.ui

Modules/ToFUI/files.cmake

Modules/ToFUI/resources/QmitkToFUtilWidget.qrc

Modules/ToFUI/resources/measurement.png

Modules/ToFUI/resources/path.png

Merge branch 'bug-9911-ToFUtilRedesign'
cf174c7b401a
Actions