HomePhabricator
Diffusion MITK 917d31e6fcfc

Merge branch 'master' into niftk
917d31e6fcfcUnpublished
Actions

Unpublished Commit · Learn More

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

Description

Merge branch 'master' into niftk

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Details

Provenance
espakAuthored on Mar 28 2013, 6:25 PM
kislinskPushed on Aug 6 2018, 4:04 PM
Parents
rMITK62e2e5ba98df: Merge branch 'master' into niftk, to pick up MITK bug 14640 containing fixes…
rMITK56034eaac29e: Merge branch 'bug-14864-UpdateWelcomeScreen'
Branches
Unknown
Tags
Unknown

Merged Changes

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

Changes (645)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSizePackages
Applications/
PluginGenerator/
ProjectTemplate/
BlueBerry/
Bundles/
org.blueberry.test/
org.blueberry.uitest/
CMake/
CMake/
PackageDepends/
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
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
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Core/
Code/
Common/
mitkCoreServices.cpp/
Plugins/
org.mitk.gui.qt.python.console/
src/
internal/
QmitkPythonPerspective.h
Core/
Code/
Common/
Controllers/
CppMicroServices/
CMake/
documentation/
doxygen/
standalone/
src/
module/
service/
util/
test/
modules/
libRWithResources/
resources/
icons/
tools/
DataManagement/
IO/
Interactions/
Interfaces/
Rendering/
Resources/
Interactions/
Legacy/
DisplayConfigMITKTools.xml
DisplayConfigMITK.xml
Resources/
Shaders/
Rendering/
Testing/
Documentation/
Doxygen/
Concepts/
images/
rendering/
Core/
Code/
Resources/
Config/
Documentation/
Doxygen/
DeveloperManual/
Starting/
FirstSteps/
GettingToKnow/
SettingUpMITK/
Toolkit/
ModuleManuals/
Overview/
UserManual/
Examples/
Plugins/
org.mitk.example.gui.customviewer.views/
org.mitk.example.gui.customviewer/
org.mitk.example.gui.extensionpointcontribution/
org.mitk.example.gui.extensionpointdefinition/
org.mitk.example.gui.minimalapplication/
org.mitk.example.gui.multipleperspectives/
org.mitk.example.gui.regiongrowing/
org.mitk.example.gui.selectionservicemitk.views/
org.mitk.example.gui.selectionservicemitk/
org.mitk.example.gui.selectionserviceqt/
O1: MITK Reviewer Group I
Modules/
DiffusionImaging/
DiffusionCore/
Algorithms/
Reconstruction/
DicomImport/
FiberTracking/
Algorithms/
GibbsTracking/
IODataStructures/
FiberBundleX/
Rendering/
Resources/
Shaders/
Rendering/
SignalModels/
mitkSignalDecay.cpp
mitkT2SmearingArtifact.cpp
mitkSignalDecay.h
mitkT2SmearingArtifact.h
Testing/
ImageStatistics/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
MitkExt/
Algorithms/
Controllers/
DataManagement/
Rendering/
PlanarFigure/
Rendering/
O1: MITK Reviewer Group I
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
Qmitk/
QmitkExt/
resources/
RigidRegistration/
SceneSerialization/
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
SceneSerializationBase/
BasePropertySerializer/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Segmentation/
Controllers/
O1: MITK Reviewer Group I
Interactions/
O1: MITK Reviewer Group I
US/
USFilters/
USModel/
USUI/
Qmitk/
Modules/
Plugins/
DiffusionImaging/
FiberTracking/
SignalModels/
org.mitk.gui.qt.python.console/
src/
internal/
mitkDotModel.cpp
mitkPluginActivator.h
MitkExt/
Controllers/
mitkIPythonService.cpp/
org.mitk.gui.qt.python.console/
src/
internal/
mitkPluginActivator.h
Python/
org.mitk.gui.qt.python.console/
src/
internal/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
QmitkPythonVariableStackTableModel.h/
src/
internal/
QmitkPythonVariableStackTreeWidget.h
O3: MITK Reviewer Group II
Modules/
RigidRegistration/
Resources/
Config/
Plugins/
org.mitk.gui.qt.dicom/
src/
internal/
O1: MITK Reviewer Group I
org.mitk.gui.qt.diffusionimaging/
documentation/
UserManual/
resources/
old-phantom.png
phantom.png
src/
internal/
QmitkFiberExtractionView.cpp
QmitkFiberProcessingView.cpp
QmitkFiberExtractionView.h
QmitkFiberProcessingView.h
QmitkFiberExtractionViewControls.ui
QmitkFiberProcessingViewControls.ui
org.mitk.gui.qt.diffusionimagingapp/
resources/
perspectives/
welcome/
pics/
src/
internal/
Perspectives/
org.mitk.gui.qt.ext/
src/
internal/
O1: MITK Reviewer Group I
org.mitk.gui.qt.imagecropper/
src/
internal/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
org.mitk.gui.qt.measurementtoolbox/
documentation/
UserManual/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
src/
internal/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
org.mitk.gui.qt.python/
org.mitk.gui.qt.python.console/
resources/
O3: MITK Reviewer Group II
src/
internal/
O3: MITK Reviewer Group II
org.mitk.gui.qt.segmentation/
src/
internal/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
org.mitk.gui.qt.ultrasound/
src/
internal/
O1: MITK Reviewer Group I

rMITK917d31e6fcfc

View Options

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

View Options

Applications/PluginGenerator/ProjectTemplate/SuperBuild.cmake

View Options

BlueBerry/Bundles/org.blueberry.test/CMakeLists.txt

View Options

BlueBerry/Bundles/org.blueberry.uitest/CMakeLists.txt

View Options

BlueBerry/CMake/FunctionCreateProvisioningFile.cmake

View Options

BlueBerry/CMake/MacroCreateCTKPlugin.cmake

View Options

CMake/PackageDepends/MITK_PythonLibs_Config.cmake

View Options

CMake/mitkFunctionCheckCompilerFlags.cmake

View Options

CMake/mitkInstallRules.cmake

View Options

CMake/mitkMacroCreateCTKPlugin.cmake

View Options

CMake/mitkMacroCreateModule.cmake

View Options

CMakeExternals/Boost.cmake

View Options

CMakeExternals/CTK.cmake

View Options

CMakeExternals/ChangeBoostLibsInstallNameForMac.cmake.in

View Options

CMakeExternals/DCMTK.cmake

View Options

CMakeExternals/ITK.cmake

View Options

CMakeExternals/OpenCV.cmake

View Options

CMakeExternals/VTK.cmake

View Options

CMakeLists.txt

View Options

Config/mitkLevelWindowPresets.xml

View Options

Config/mitkRigidRegistrationPresets.xml

View Options

Config/mitkRigidRegistrationTestPresets.xml

View Options

Core/Code/Common/mitkCoreServices.cpp