HomePhabricator
Diffusion MITK c46b74d625c9

Merge branch 'master', version 48573155e7, for bug 14355, usResourceCompiler…
c46b74d625c9Unpublished
Actions

Unpublished Commit · Learn More

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

Description

Merge branch 'master', version 48573155e7, for bug 14355, usResourceCompiler path, into niftk

Details

Provenance
clarksonAuthored on Apr 15 2013, 8:28 AM
kislinskPushed on Aug 6 2018, 4:04 PM
Parents
rMITKd5eb05f63be6: Merge master onto niftk - v2013.03.0 - 1fd96dffa5
rMITK48573155e71d: Merge branch 'bug-14355-fix-resource-compiler-path'
Branches
Unknown
Tags
Unknown

Merged Changes

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

Changes (196)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSizePackages
CMake/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
CMakeExternals/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Core/
Code/
CppMicroServices/
CMake/
Interactions/
Rendering/
Resources/
Interactions/
Legacy/
Testing/
Documentation/
Doxygen/
Concepts/
images/
geometryoverview/
pipelining/
Documentation/
Doxygen/
DeveloperManual/
Starting/
GettingToKnow/
Tutorial/
Modules/
DiffusionImaging/
FiberTracking/
Algorithms/
GraphAlgorithms/
MitkExt/
IO/
Rendering/
OpenCL/
PlanarFigure/
Algorithms/
O1: MITK Reviewer Group I
Qmitk/
QmitkExt/
Segmentation/
Algorithms/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
DataManagement/
O1: MITK Reviewer Group I
Interactions/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Rendering/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Simulation/
Documentation/
doxygen/
mitkSimulationTemplateReader.h
mitkSimulationReader.h
ToFHardware/
Kinect/
MesaSR4000/
PMD/
Testing/
Modules/
QmitkExt/
Plugins/
org.mitk.gui.qt.datamanager/
src/
internal/
Plugins/
org.mitk.gui.qt.datamanager/
O1: MITK Reviewer Group I
src/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
internal/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
org.mitk.gui.qt.diffusionimaging/
documentation/
UserManual/
src/
internal/
org.mitk.gui.qt.diffusionimagingapp/
documentation/
org.mitk.gui.qt.dtiatlasapp/
documentation/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
org.mitk.gui.qt.properties/
org.mitk.gui.qt.simulation/
O1: MITK Reviewer Group I
src/
internal/
QmitkPropertiesPreferencePage.h
QmitkSimulationPreferencePage.h
O1: MITK Reviewer Group I
org.mitk.gui.qt.properties/
src/
internal/
org.mitk.gui.qt.datamanager/
src/
internal/
QmitkPropertyItem.h
QmitkPropertyTreeItem.h
O1: MITK Reviewer Group I
QmitkPropertyItemSortFilterProxyModel.h
QmitkPropertyTreeFilterProxyModel.h
O1: MITK Reviewer Group I
org.mitk.gui.qt.segmentation/
documentation/
UserManual/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
src/
internal/
O1: MITK Reviewer Group I
org.mitk.gui.qt.simulation/
src/
internal/
org.mitk.gui.qt.tofutil/
src/
internal/
org.mitk.simulation/
org.mitk.gui.qt.simulation/

rMITKc46b74d625c9

View Options

CMake/FindGit.cmake

View Options

CMake/mitkSetupVariables.cmake

View Options

CMakeExternals/MITKData.cmake

View Options

CMakeExternals/MITKData.cmake.BACKUP.9452.cmake

View Options

CMakeExternals/MITKData.cmake.BASE.9452.cmake

View Options

CMakeExternals/MITKData.cmake.LOCAL.9452.cmake

View Options

CMakeExternals/MITKData.cmake.REMOTE.9452.cmake

View Options

Core/Code/CppMicroServices/CMake/usFunctionEmbedResources.cmake

View Options

Core/Code/CppMicroServices/CMakeLists.txt

View Options

Core/Code/CppMicroServices/CppMicroServicesConfig.cmake.in

View Options

Core/Code/Interactions/mitkDisplayInteractor.h

View Options

Core/Code/Rendering/mitkRenderingTestHelper.cpp

View Options

Core/Code/Rendering/mitkRenderingTestHelper.h

View Options

Core/Code/Resources/Interactions/Legacy/StateMachine.xml

View Options

Core/Code/Testing/CMakeLists.txt

View Options

Core/Code/Testing/mitkImageVtkMapper2DColorTest.cpp

View Options

Core/Code/Testing/mitkImageVtkMapper2DLevelWindowTest.cpp

View Options

Core/Code/Testing/mitkImageVtkMapper2DOpacityTest.cpp

View Options

Core/Code/Testing/mitkImageVtkMapper2DSwivelTest.cpp

View Options

Core/Code/Testing/mitkImageVtkMapper2DTest.cpp

View Options

Core/Code/Testing/mitkImageVtkMapper2DTransferFunctionTest.cpp

View Options

Core/Code/Testing/mitkSurfaceVtkMapper3DTest.cpp

View Options

Core/Code/Testing/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp

View Options

Core/Documentation/Doxygen/Concepts/DataInteraction.dox

View Options

Core/Documentation/Doxygen/Concepts/DataInteractionTechnical.dox

View Options

Core/Documentation/Doxygen/Concepts/Pipelining.dox

View Options

Core/Documentation/Doxygen/Concepts/images/geometryoverview/CoordinateTypes.png

View Options

Core/Documentation/Doxygen/Concepts/images/pipelining/pipelining_example_us.png

View Options

Documentation/Doxygen/DeveloperManual/Starting/GettingToKnow/Tutorial/Step10.dox

View Options

Modules/CMakeLists.txt

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkDftImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkDftImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/files.cmake

View Options

Modules/GraphAlgorithms/files.cmake

View Options

Modules/GraphAlgorithms/itkShortestPathCostFunctionLiveWire.h

View Options

Modules/GraphAlgorithms/itkShortestPathCostFunctionLiveWire.txx

View Options

Modules/GraphAlgorithms/itkShortestPathImageFilter.h

View Options

Modules/GraphAlgorithms/itkShortestPathImageFilter.txx

View Options

Modules/MitkExt/IO/mitkPropertyListExportToXmlFile.cpp

View Options

Modules/MitkExt/IO/mitkPropertyListExportToXmlFile.h

View Options

Modules/MitkExt/IO/mitkPropertyListImportFromXmlFile.cpp

View Options

Modules/MitkExt/IO/mitkPropertyListImportFromXmlFile.h

View Options

Modules/MitkExt/Rendering/mitkGPUVolumeMapper3D.cpp

View Options

Modules/MitkExt/files.cmake

View Options

Modules/OpenCL/mitkOclBinaryThresholdImageFilter.cpp

View Options

Modules/OpenCL/mitkOclFilter.cpp

View Options

Modules/OpenCL/mitkOclImage.cpp

View Options

Modules/OpenCL/mitkOpenCLActivator.cpp

View Options

Modules/OpenCL/mitkOpenCLActivator.h

View Options

Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.cpp

View Options

Modules/Properties/CMakeLists.txt

View Options

Modules/Properties/files.cmake

View Options

Modules/Properties/mitkLoadPropertiesModule.cpp

View Options

Modules/Properties/mitkLoadPropertiesModule.h

View Options

Modules/Properties/mitkPropertiesActivator.cpp

View Options

Modules/Properties/mitkPropertyAliases.cpp

View Options

Modules/Properties/mitkPropertyAliases.h

View Options

Modules/Properties/mitkPropertyDescriptions.cpp

View Options

Modules/Properties/mitkPropertyDescriptions.h

View Options

Modules/Properties/mitkPropertyFilter.cpp

View Options

Modules/Properties/mitkPropertyFilter.h

View Options

Modules/Properties/mitkPropertyFilters.cpp

View Options

Modules/Properties/mitkPropertyFilters.h

View Options

Modules/Qmitk/QmitkDataStorageComboBox.cpp

View Options

Modules/QmitkExt/QmitkLineEdit.cpp

View Options

Modules/QmitkExt/QmitkLineEdit.h

View Options

Modules/QmitkExt/files.cmake

View Options

Modules/Segmentation/Algorithms/mitkImageLiveWireContourModelFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkImageLiveWireContourModelFilter.h

View Options

Modules/Segmentation/Algorithms/mitkImageToContourModelFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkImageToContourModelFilter.h

View Options

Modules/Segmentation/Algorithms/mitkImageToLiveWireContourFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkImageToLiveWireContourFilter.h

View Options

Modules/Segmentation/CMakeLists.txt

View Options

Modules/Segmentation/DataManagement/mitkContourElement.cpp

View Options

Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp

View Options

Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.h

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.h

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.xpm

View Options

Modules/Segmentation/Interactions/mitkSegTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkSegTool2D.h

View Options

Modules/Segmentation/Rendering/mitkContourModelGLMapper2D.cpp

View Options

Modules/Segmentation/Rendering/mitkContourModelMapper3D.cpp

View Options

Modules/Segmentation/files.cmake

View Options

Modules/Simulation/Documentation/doxygen/Manual.dox

View Options

Modules/Simulation/Documentation/doxygen/SOFA_MITK.png

View Options

Modules/Simulation/Documentation/doxygen/SimulationPreferences.png

View Options

Modules/Simulation/files.cmake

View Options

Modules/Simulation/mitkSimulation.cpp

View Options

Modules/Simulation/mitkSimulation.h

View Options

Modules/Simulation/mitkSimulationObjectFactory.cpp

View Options

Modules/Simulation/mitkSimulationObjectFactory.h

View Options

Modules/Simulation/mitkSimulationReader.h

View Options

Modules/Simulation/mitkSimulationTemplate.cpp

View Options

Modules/Simulation/mitkSimulationTemplate.h

View Options

Modules/Simulation/mitkSimulationTemplateIOFactory.cpp

View Options

Modules/Simulation/mitkSimulationTemplateIOFactory.h

View Options

Modules/Simulation/mitkSimulationTemplateReader.cpp

View Options

Modules/Simulation/mitkSimulationTemplateReader.h

View Options

Modules/ToFHardware/Kinect/mitkKinectDeviceFactory.h

View Options

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000DeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDCamCubeDeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDPlayerDeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamCubeDeviceFactory.h

View Options

Modules/ToFHardware/Testing/CMakeLists.txt

View Options

Modules/ToFHardware/Testing/files.cmake

View Options

Modules/ToFHardware/Testing/mitkPlayerLoadAndRenderDepthDataTest.cpp

View Options

Modules/ToFHardware/Testing/mitkPlayerLoadAndRenderRGBDataTest.cpp

View Options

Modules/ToFHardware/mitkToFCameraDevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

View Options

Plugins/PluginList.cmake

View Options

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

View Options

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

View Options

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

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.datamanager/src/internal/QmitkLineEdit.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkLineEdit.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeFilterProxyModel.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeFilterProxyModel.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeItem.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeItem.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeModel.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeModel.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeView.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberfoxViewUserManual.dox

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxViewControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp

View Options

Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcp

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.properties/resources/icon.png

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.ui

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItem.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItem.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemModel.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemModel.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemSortFilterProxyModel.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemSortFilterProxyModel.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.ui

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/mitkGetPropertyService.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/org_mitk_gui_qt_properties_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/org_mitk_gui_qt_properties_Activator.h

View Options

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentation.dox

View Options

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGLiveWireUsage.PNG

View Options

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconLiveWire.png

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h

View Options

Plugins/org.mitk.simulation/CMakeLists.txt

View Options

Plugins/org.mitk.simulation/files.cmake

View Options

Plugins/org.mitk.simulation/manifest_headers.cmake

View Options

Plugins/org.mitk.simulation/resources/Simulation.qrc

View Options

Plugins/org.mitk.simulation/resources/simulation.png

View Options

Plugins/org.mitk.simulation/resources/simulationTemplate.png

View Options

Plugins/org.mitk.simulation/src/internal/org_mitk_simulation_Activator.cpp

View Options

Plugins/org.mitk.simulation/src/internal/org_mitk_simulation_Activator.h

View Options

Plugins/org.mitk.simulation/src/mitkGetSimulationPreferences.cpp

View Options

Plugins/org.mitk.simulation/src/mitkGetSimulationPreferences.h

MITK · MIC · IMSY · DKFZ