HomePhabricator
Diffusion MITK f6d5540ad41b

resolved mergeconflicts
f6d5540ad41b
Actions

Description

resolved mergeconflicts

Details

Provenance
hentschAuthored on Aug 3 2017, 5:08 PM
hentschPushed on Aug 3 2017, 5:14 PM
Parents
rMITK3b4dae6d577a: Merge branch 'T23145-DiffusionTractographyWarning'
rMITK184bd5bf43ef: Changed function names and adapted to MITK style guide after review of Stefan.
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (64)

PathSizePackages
Documentation/
Doxygen/
3-DeveloperManual/
Toolkit/
ModuleManuals/
Modules/
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
Chart/
C3js/
O3: MITK Reviewer Group II
resource/
O3: MITK Reviewer Group II
Chart.css
Histogram.css
O3: MITK Reviewer Group II
Chart_dark.css
Histogram_dark.css
O3: MITK Reviewer Group II
QmitkChartWidget.html
QmitkC3jsWidget.html
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
src/
O3: MITK Reviewer Group II
ImageStatistics/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Plugins/
org.mitk.gui.qt.measurementtoolbox/
O1: MITK Reviewer Group I
src/
internal/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I

rMITKf6d5540ad41b

View Options

Documentation/Doxygen/3-DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox

Loading...
View Options

Modules/C3js

Loading...
View Options

Modules/C3js/CMakeLists.txt

Loading...
View Options

Modules/C3js/files.cmake

Loading...
View Options

Modules/C3js/include

Loading...
View Options

Modules/C3js/include/C3Data.h

Loading...
View Options

Modules/C3js/include/QmitkC3Data.h

Loading...
View Options

Modules/C3js/include/QmitkC3jsWidget.h

Loading...
View Options

Modules/C3js/resource

Loading...
View Options

Modules/C3js/resource/C3js.qrc

Loading...
View Options

Modules/C3js/resource/Histogram.css

Loading...
View Options

Modules/C3js/resource/Histogram.js

Loading...
View Options

Modules/C3js/resource/Histogram_dark.css

Loading...
View Options

Modules/C3js/resource/QmitkC3jsWidget.html

Loading...
View Options

Modules/C3js/resource/c3.min.css

Loading...
View Options

Modules/C3js/resource/c3.min.js

Loading...
View Options

Modules/C3js/resource/d3.min.js

Loading...
View Options

Modules/C3js/resource/empty.html

Loading...
View Options

Modules/C3js/src

Loading...
View Options

Modules/C3js/src/C3Data.cpp

Loading...
View Options

Modules/C3js/src/QmitkC3Data.cpp

Loading...
View Options

Modules/C3js/src/QmitkC3jsWidget.cpp

Loading...
View Options

Modules/Chart/CMakeLists.txt

Loading...
View Options

Modules/Chart/documentation/2DDataExample.png

Loading...
View Options

Modules/Chart/documentation/barChartTemperature.png

Loading...
View Options

Modules/Chart/documentation/images/barChartTemperature.png

Loading...
View Options

Modules/Chart/documentation/images/lineChartTemperature.png

Loading...
View Options

Modules/Chart/documentation/images/splineChartTemperature.png

Loading...
View Options

Modules/Chart/documentation/images/userDefinedWidget.png

Loading...
View Options

Modules/Chart/documentation/lineChartTemperature.png

Loading...
View Options

Modules/Chart/documentation/mitkChart.dox

Loading...
View Options

Modules/Chart/documentation/pieChartExample.png

Loading...
View Options

Modules/Chart/documentation/splineChartTemperature.png

Loading...
View Options

Modules/Chart/documentation/userDefinedWidget.png

Loading...
View Options

Modules/Chart/files.cmake

Loading...
View Options

Modules/Chart/include/QmitkChartData.h

Loading...
View Options

Modules/Chart/include/QmitkChartWidget.h

Loading...
View Options

Modules/Chart/include/QmitkChartxyData.h

Loading...
View Options

Modules/Chart/resource/C3js.qrc

Loading...
View Options

Modules/Chart/resource/Chart.css

Loading...
View Options

Modules/Chart/resource/Chart.js

Loading...
View Options

Modules/Chart/resource/Chart_dark.css

Loading...
View Options

Modules/Chart/resource/QmitkChartWidget.html

Loading...
View Options

Modules/Chart/resource/c3.min.css

Loading...
View Options

Modules/Chart/resource/c3.min.js

Loading...
View Options

Modules/Chart/resource/d3.min.js

Loading...
View Options

Modules/Chart/resource/empty.html

Loading...
View Options

Modules/Chart/src/QmitkChartData.cpp

Loading...
View Options

Modules/Chart/src/QmitkChartWidget.cpp

Loading...
View Options

Modules/Chart/src/QmitkChartxyData.cpp

Loading...
View Options

Modules/ImageStatistics/mitkIntensityProfile.cpp

Loading...
View Options

Modules/ImageStatistics/mitkIntensityProfile.h

Loading...
View Options

Modules/ModuleList.cmake

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

Loading...
View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

Loading...
View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementControls.ui

Loading...
MITK · MIC · IMSY · DKFZ