Resolve conflicts
5342dbafbc55Unpublished
Actions

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Resolve conflicts

Details

Provenance

clarkson	Authored on Apr 12 2012, 7:38 AM
kislinsk	Pushed on Aug 6 2018, 4:04 PM

Parents

rMITK0ab89b79f123: Merged conflicts
rMITK8334d5b02554: Merge branch 'bug-11660-NegativeDwiWarning'

Branches

Unknown

Tags

Unknown

Event Timeline

clarkson committed rMITK5342dbafbc55: Resolve conflicts (authored by clarkson).Apr 12 2012, 7:38 AM

Merged Changes

8334d5b02554 Merge branch 'bug-11660-NegativeDwiWarning'
Author
neher
Browse Repository
No Builds
No Audits
0f15e7eaafe0 catching negative dwi values according to tuch
Author
neher
Browse Repository
No Builds
No Audits
7d765f38b9db Merge branch 'bug-10906-Crash_contextmenue_after_reinitializing_perspective'
Author
metzger
Browse Repository
No Builds
No Audits
52fe344052e6 Deregistration of all QActions in the destructor. Now the QActions are stored…
Author
metzger
Browse Repository
No Builds
No Audits
d4653d64a58a Merge branch 'bug-11008-2D-RenderingForceImmediateUpdate'
Author
• heime
Browse Repository
No Builds
No Audits
431d7d821332 Using RequestUpdate instead of ForceImmediate update in mitkRenderingTestHelper
Author
• heime
Browse Repository
No Builds
No Audits
d669294f1174 Merge branch 'bug-11135-AuroraDomeTrackingVolumeSurfaceiscorrupt'
Author
maerz
Browse Repository
No Builds
No Audits
4ad55bc6e9fa Replaced corrupt tracking volume with better model. Still not perfect in the…
Author
maerz
Browse Repository
No Builds
No Audits
a692d2068269 Merge branch 'bug-11571-RemoveBundleToolPairNavigation'
Author
franza
Browse Repository
No Builds
No Audits
e420ac1850ef removed bundle IGT navigation (which holds the view IGTToolPairNavigation)
Author
franza
Browse Repository
No Builds
No Audits
0e911f0cd93d Merge branch 'bug-11564-resolve-transitive-dependency'
Author
• goch
Browse Repository
No Builds
No Audits
f2e322676e75 Merge branch 'bug-11615-ctk-with-increased-maxdegree-dgraph'
Author
zelzer
Browse Repository
No Builds
No Audits
e00fd2305f83 Use update CTK with increased max vertex degree in DGraph utility.
Author
zelzer
Browse Repository
No Builds
No Audits
bca1c64b701b Added the dependencies which have to be on
Author
• goch
Browse Repository
No Builds
No Audits
13c74c8c5edd Merge branch 'bug-11154-renderingmanager-incorrectly-adds-renderwindows'
Author
zelzer
Browse Repository
No Builds
No Audits
59fda6ae2d86 Test for proper add/remove logic of render windows.
Author
zelzer
Browse Repository
No Builds
No Audits
b7af39d97537 Merge branch 'bug-11152-QballRenderBug'
Author
neher
Browse Repository
No Builds
No Audits
a05fbac8a4a4 removed lighting in odf mapper
Author
neher
Browse Repository
No Builds
No Audits
a403a0141c86 Stop RenderingManager incorrectly adding to m_RenderWindowList
Author
clarkson
Browse Repository
No Builds
No Audits
99a9c746ed81 Added ImmediateUpdateAll to the GenerateRenderingRequest event function to the…
Author
• heime
Browse Repository
No Builds
No Audits

Changes (36)

Path

Size

Packages

Applications/

Tests/

QtFreeRender/

QtFreeRender.cpp

mitkDiffusion/

target_libraries.cmake

CMakeExternals/

CTK.cmake

O1: MITK Reviewer Group I

Core/

Code/

Controllers/

mitkRenderingManager.cpp

mitkRenderingManager.h

Testing/

mitkRenderingManagerTest.cpp

mitkRenderingTestHelper.cpp

Modules/

DiffusionImaging/

Reconstruction/

itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

itkAnalyticalDiffusionQballReconstructionImageFilter.h

Rendering/

mitkOdfVtkMapper2D.txx

IGT/

IGTTrackingDevices/

TrackingVolumeData/

NDIAuroraPlanarFG_Dome.stl

Plugins/

PluginList.cmake

org.mitk.gui.qt.datamanager/

src/

QmitkDataManagerView.cpp

O1: MITK Reviewer Group I

QmitkDataManagerView.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.diffusionimaging/

src/

QmitkODFRenderWidget.cpp

org.mitk.gui.qt.igtnavigation

QmitkToolPairNavigation.dox

doxygen

modules.dox

files.cmake

manifest_headers.cmake

plugin.xml

resources

QmitkToolPairNavigationView.qrc

toolpair.png

src

internal

QmitkToolPairNavigationView.cpp

QmitkToolPairNavigationView.h

QmitkToolPairNavigationViewControls.ui

mitkPluginActivator.cpp

mitkPluginActivator.h

rMITK5342dbafbc55

View Options

Applications/Tests/QtFreeRender/QtFreeRender.cpp

View Options

Applications/mitkDiffusion/target_libraries.cmake

View Options

CMakeExternals/CTK.cmake

View Options

Core/Code/Controllers/mitkRenderingManager.cpp

View Options

Core/Code/Controllers/mitkRenderingManager.h

View Options

Core/Code/Testing/mitkRenderingManagerTest.cpp

View Options

Core/Code/Testing/mitkRenderingTestHelper.cpp

View Options

Modules/DiffusionImaging/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

View Options

Modules/DiffusionImaging/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.h

View Options

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx

View Options

Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraPlanarFG_Dome.stl

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp

View Options

Plugins/org.mitk.gui.qt.igtnavigation

View Options

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

View Options

Plugins/org.mitk.gui.qt.igtnavigation/documentation

View Options

Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual

View Options

Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual/Manual.dox

View Options

Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual/QmitkToolPairNavigation.dox

View Options

Plugins/org.mitk.gui.qt.igtnavigation/documentation/doxygen

View Options

Plugins/org.mitk.gui.qt.igtnavigation/documentation/doxygen/modules.dox

View Options

Plugins/org.mitk.gui.qt.igtnavigation/files.cmake

View Options

Plugins/org.mitk.gui.qt.igtnavigation/manifest_headers.cmake

View Options

Plugins/org.mitk.gui.qt.igtnavigation/plugin.xml

View Options

Plugins/org.mitk.gui.qt.igtnavigation/resources

View Options

Plugins/org.mitk.gui.qt.igtnavigation/resources/QmitkToolPairNavigationView.qrc

View Options

Plugins/org.mitk.gui.qt.igtnavigation/resources/toolpair.png

View Options

Plugins/org.mitk.gui.qt.igtnavigation/src

View Options

Plugins/org.mitk.gui.qt.igtnavigation/src/internal

View Options

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.cpp

View Options

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.h

View Options

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationViewControls.ui

View Options

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.cpp

View Options

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.h

Resolve conflicts5342dbafbc55UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (36)

rMITK5342dbafbc55

Applications/Tests/QtFreeRender/QtFreeRender.cpp

Applications/mitkDiffusion/target_libraries.cmake

CMakeExternals/CTK.cmake

Core/Code/Controllers/mitkRenderingManager.cpp

Core/Code/Controllers/mitkRenderingManager.h

Core/Code/Testing/mitkRenderingManagerTest.cpp

Core/Code/Testing/mitkRenderingTestHelper.cpp

Modules/DiffusionImaging/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

Modules/DiffusionImaging/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.h

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx

Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraPlanarFG_Dome.stl

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp

Plugins/org.mitk.gui.qt.igtnavigation

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

Plugins/org.mitk.gui.qt.igtnavigation/documentation

Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual

Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual/QmitkToolPairNavigation.dox

Plugins/org.mitk.gui.qt.igtnavigation/documentation/doxygen

Plugins/org.mitk.gui.qt.igtnavigation/documentation/doxygen/modules.dox

Plugins/org.mitk.gui.qt.igtnavigation/files.cmake

Plugins/org.mitk.gui.qt.igtnavigation/manifest_headers.cmake

Plugins/org.mitk.gui.qt.igtnavigation/plugin.xml

Plugins/org.mitk.gui.qt.igtnavigation/resources

Plugins/org.mitk.gui.qt.igtnavigation/resources/QmitkToolPairNavigationView.qrc

Plugins/org.mitk.gui.qt.igtnavigation/resources/toolpair.png

Plugins/org.mitk.gui.qt.igtnavigation/src

Plugins/org.mitk.gui.qt.igtnavigation/src/internal

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.cpp

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.h

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationViewControls.ui

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.cpp

Plugins/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.h

Resolve conflicts
5342dbafbc55Unpublished
Actions