HomePhabricator
Diffusion MITK 3ddae7750ed2

Merge branch 'bug-8554-diffusion-imaging-app' into bug-8554-dti-atlas-app
3ddae7750ed2
Actions

Description

Merge branch 'bug-8554-diffusion-imaging-app' into bug-8554-dti-atlas-app

Conflicts:
Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc

Details

Provenance
fritzsckAuthored on Aug 19 2011, 6:37 PM
Parents
rMITKf1f9ba135ebf: corrected file descriptions in welcome page
rMITKa27d8d3ed77d: Merge branch 'bug-8858-planarFigureCrash'
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (120)

PathSize
Modules/
Bundles/
org.mitk.gui.qt.diffusionimaging/
resources/
src/
internal/
org.mitk.gui.qt.diffusionimagingapp/
resources/
welcome/
pics/
src/
internal/
org.mitk.gui.qt.diffusionimagingapp/
src/
internal/
org.mitk.gui.qt.diffusionimaging/
src/
internal/
QmitkNavigationButtonsView.h
QmitkControlVisualizationPropertiesView.h
org.mitk.gui.qt.dtiatlasapp/
org.mitk.gui.qt.diffusionimagingapp/
documentation/
resources/
assistant-icon.png
app-icon.png
resources/
welcome/
mitkdtiatlasappwelcomeview.html
mitkdiffusionimagingappwelcomeview.html
pics/
src/
QmitkDTIAtlasAppWorkbenchAdvisor.cpp
QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
internal/
QmitkDTIAtlasAppIntroPart.cpp
QmitkDiffusionImagingAppIntroPart.cpp
QmitkDTIAtlasAppPerspective.cpp
QmitkDiffusionImagingAppPerspective.cpp
org.mitk.gui.qt.dtiatlasapp/
src/
internal/
org.mitk.gui.qt.diffusionimaging/
src/
internal/
QmitkNavigationButtonsView.h
QmitkControlVisualizationPropertiesView.h
org.mitk.gui.qt.ext/
src/

rMITK3ddae7750ed2

View Options

Modules/Bundles/CMakeLists.txt

Loading...
View Options

Modules/Bundles/PluginList.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color24.gif

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color48.gif

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color64.gif

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/crosshair.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/paint2.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/plugin.xml

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/app-icon.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07PEDUNCLES.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07aPEDUNCLES.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsViewControls.ui

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/Crosshair_Modes.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/GUI.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/GUI_Commented.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/Open_Perspective.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/QmitkDTIAtlasAppUserManual.dox

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/Show_Views.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/Top_Right_Corner_Menu.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/Views_Choices.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/Welcome.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/Window_Dropdown.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/theme_black.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/theme_default.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/about-logo.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/assistant-icon.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/doxygen/modules.dox

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/files.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/manifest_headers.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/plugin.xml

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/ImageProcessing_48.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/Measurement_48.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/RigidRegistration.xpm

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/app-icon.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/diffusionimaging.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/icon_dicom.xpm

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/icon_vesseltreesegmentation.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/mintLogo.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/org_mitk_gui_qt_dtiatlasapp.qrc

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/segmentation.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/volvis.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/QmitkWelcomeScreenView.qrc

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/function.js

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/mitkdtiatlasappwelcomeview.html

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01CING.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01aCING.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02CORPUS.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02aCORPUS.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03CST.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03aCST.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04FORNIX.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04aFORNIX.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05ILF+IFO+UNCUS.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05aILF+IFO+UNCUS.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06SLF+SOFF+ARCUATE.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06aSLF+SOFF+ARCUATE.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07PEDUNCLES.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07aPEDUNCLES.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aaref_alltracts.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aref_alltracts.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.gif

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.gif

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/background.jpg

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitk.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitka.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti.jpg

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti_animated.gif

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/experimental.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_bottom.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_middle.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_top.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bttn_close.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/shadow.png

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/style.css

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplication.h~bug-8511-DTI-atlas-app

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsViewControls.ui

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomeScreenViewControls.ui

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h

Loading...
MITK · MIC · IMSY · DKFZ