resolved mergeconflicts
f6d5540ad41b
Actions

Description

resolved mergeconflicts

Details

Provenance

hentsch	Authored on Aug 3 2017, 5:08 PM
hentsch	Pushed 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

Tags

Event Timeline

hentsch committed rMITKf6d5540ad41b: resolved mergeconflicts (authored by hentsch).Aug 3 2017, 5:08 PM

Merged Changes

184bd5bf43ef Changed function names and adapted to MITK style guide after review of Stefan.
Author
hentsch
Browse Repository
No Builds
No Audits
9e6cc4d15a90 added documentation
Author
hentsch
Browse Repository
No Builds
No Audits
60a9fd549b4c Renamed MitkC3js --> MitkChart
Author
hentsch
Browse Repository
No Builds
No Audits
2b6a7fe2d2d8 Fixed const correctness
Author
hentsch
Browse Repository
No Builds
No Audits
a18e5c4e5a72 Cleanups with cppcheck
Author
hentsch
Browse Repository
No Builds
No Audits
dac3437d526b Added documentation.
Author
hentsch
Browse Repository
No Builds
No Audits
debcb68b25f3 const correctness, clean-up
Author
hentsch
Browse Repository
No Builds
No Audits
b305ba2e7abe Clean-up, removing unneccessary code
Author
hentsch
Browse Repository
No Builds
No Audits
d461d3525c1b added signal emits and const correctness.
Author
hentsch
Browse Repository
No Builds
No Audits
ef02419a859f Updated to C3.js 0.4.12
Author
hentsch
Browse Repository
No Builds
No Audits
9f6530569a2b Updated tooltip and legend
Author
hentsch
Browse Repository
No Builds
No Audits
c0d1b4dc2d66 fixes for bin size changing + moved data to data class
Author
hentsch
Browse Repository
No Builds
No Audits
5a41c77b1f7c strings are automatically constructed empty
Author
hentsch
Browse Repository
No Builds
No Audits
daab978f4914 Refactored statistics to TableWidget functionality
Author
hentsch
Browse Repository
No Builds
No Audits
fd7365f11e7a Adapted ImageStatisticsPlugin to changes made in C3js
Author
hentsch
Browse Repository
No Builds
No Audits
e79d33ad7c8d Minor corrections. Connected Webchannel to react to changes of DiagramType in…
Author
hentsch
Browse Repository
No Builds
No Audits
17c4631188c0 Deleted unused ui file
Author
hentsch
Browse Repository
No Builds
No Audits
80a0bb58a39d Migrated C3js changes done in DIPP branch T19972-doseAnalyzerVisualizeDVH
Author
hentsch
Browse Repository
No Builds
No Audits

Changes (64)

Path

Size

Packages

Documentation/

Doxygen/

3-DeveloperManual/

Toolkit/

ModuleManuals/

MITKModuleManualsList.dox

Modules/

O3: MITK Reviewer Group II

documentation

O3: MITK Reviewer Group II

2DDataExample.png

O3: MITK Reviewer Group II

barChartTemperature.png

O3: MITK Reviewer Group II

images

O3: MITK Reviewer Group II

barChartTemperature.png

O3: MITK Reviewer Group II

lineChartTemperature.png

O3: MITK Reviewer Group II

splineChartTemperature.png

O3: MITK Reviewer Group II

userDefinedWidget.png

O3: MITK Reviewer Group II

lineChartTemperature.png

O3: MITK Reviewer Group II

mitkChart.dox

O3: MITK Reviewer Group II

pieChartExample.png

O3: MITK Reviewer Group II

splineChartTemperature.png

O3: MITK Reviewer Group II

userDefinedWidget.png

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

include

O3: MITK Reviewer Group II

QmitkChartData.h

O3: MITK Reviewer Group II

QmitkChartWidget.h

O3: MITK Reviewer Group II

QmitkChartxyData.h

O3: MITK Reviewer Group II

resource

O3: MITK Reviewer Group II

Chart.js

O3: MITK Reviewer Group II

c3.min.css

O3: MITK Reviewer Group II

c3.min.js

O3: MITK Reviewer Group II

src

O3: MITK Reviewer Group II

QmitkChartWidget.cpp

O3: MITK Reviewer Group II

QmitkChartxyData.cpp

O3: MITK Reviewer Group II

	Chart/
	C3js/

CMakeLists.txt

O3: MITK Reviewer Group II

resource/

C3js.qrc

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

d3.min.js

O3: MITK Reviewer Group II

empty.html

O3: MITK Reviewer Group II

src/

	QmitkChartData.cpp
	C3Data.cpp

O3: MITK Reviewer Group II

ImageStatistics/

mitkIntensityProfile.cpp

O1: MITK Reviewer Group I

mitkIntensityProfile.h

O1: MITK Reviewer Group I

ModuleList.cmake

Plugins/

org.mitk.gui.qt.measurementtoolbox/

CMakeLists.txt

O1: MITK Reviewer Group I

src/

internal/

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsView.h

O1: MITK Reviewer Group I

QmitkImageStatisticsViewControls.ui

O1: MITK Reviewer Group I

QmitkMeasurementControls.ui

O1: MITK Reviewer Group I

rMITKf6d5540ad41b

View Options

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

View Options

Modules/C3js

View Options

Modules/C3js/CMakeLists.txt

View Options

Modules/C3js/files.cmake

View Options

Modules/C3js/include

View Options

Modules/C3js/include/C3Data.h

View Options

Modules/C3js/include/QmitkC3Data.h

View Options

Modules/C3js/include/QmitkC3jsWidget.h

View Options

Modules/C3js/resource

View Options

Modules/C3js/resource/C3js.qrc

View Options

Modules/C3js/resource/Histogram.css

View Options

Modules/C3js/resource/Histogram.js

View Options

Modules/C3js/resource/Histogram_dark.css

View Options

Modules/C3js/resource/QmitkC3jsWidget.html

View Options

Modules/C3js/resource/c3.min.css

View Options

Modules/C3js/resource/c3.min.js

View Options

Modules/C3js/resource/d3.min.js

View Options

Modules/C3js/resource/empty.html

View Options

Modules/C3js/src

View Options

Modules/C3js/src/C3Data.cpp

View Options

Modules/C3js/src/QmitkC3Data.cpp

View Options

Modules/C3js/src/QmitkC3jsWidget.cpp

View Options

Modules/Chart/CMakeLists.txt

View Options

Modules/Chart/documentation/2DDataExample.png

View Options

Modules/Chart/documentation/barChartTemperature.png

View Options

Modules/Chart/documentation/images/barChartTemperature.png

View Options

Modules/Chart/documentation/images/lineChartTemperature.png

View Options

Modules/Chart/documentation/images/splineChartTemperature.png

View Options

Modules/Chart/documentation/images/userDefinedWidget.png

View Options

Modules/Chart/documentation/lineChartTemperature.png

View Options

Modules/Chart/documentation/mitkChart.dox

View Options

Modules/Chart/documentation/pieChartExample.png

View Options

Modules/Chart/documentation/splineChartTemperature.png

View Options

Modules/Chart/documentation/userDefinedWidget.png

View Options

Modules/Chart/files.cmake

View Options

Modules/Chart/include/QmitkChartData.h

View Options

Modules/Chart/include/QmitkChartWidget.h

View Options

Modules/Chart/include/QmitkChartxyData.h

View Options

Modules/Chart/resource/C3js.qrc

View Options

Modules/Chart/resource/Chart.css

View Options

Modules/Chart/resource/Chart.js

View Options

Modules/Chart/resource/Chart_dark.css

View Options

Modules/Chart/resource/QmitkChartWidget.html

View Options

Modules/Chart/resource/c3.min.css

View Options

Modules/Chart/resource/c3.min.js

View Options

Modules/Chart/resource/d3.min.js

View Options

Modules/Chart/resource/empty.html

View Options

Modules/Chart/src/QmitkChartData.cpp

View Options

Modules/Chart/src/QmitkChartWidget.cpp

View Options

Modules/Chart/src/QmitkChartxyData.cpp

View Options

Modules/ImageStatistics/mitkIntensityProfile.cpp

View Options

Modules/ImageStatistics/mitkIntensityProfile.h

View Options

Modules/ModuleList.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

resolved mergeconflictsf6d5540ad41bActions

Description

Details

Event Timeline

Merged Changes

Changes (64)

rMITKf6d5540ad41b

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

Modules/C3js

Modules/C3js/CMakeLists.txt

Modules/C3js/files.cmake

Modules/C3js/include

Modules/C3js/include/C3Data.h

Modules/C3js/include/QmitkC3Data.h

Modules/C3js/include/QmitkC3jsWidget.h

Modules/C3js/resource

Modules/C3js/resource/C3js.qrc

Modules/C3js/resource/Histogram.css

Modules/C3js/resource/Histogram.js

Modules/C3js/resource/Histogram_dark.css

Modules/C3js/resource/QmitkC3jsWidget.html

Modules/C3js/resource/c3.min.css

Modules/C3js/resource/c3.min.js

Modules/C3js/resource/d3.min.js

Modules/C3js/resource/empty.html

Modules/C3js/src

Modules/C3js/src/C3Data.cpp

Modules/C3js/src/QmitkC3Data.cpp

Modules/C3js/src/QmitkC3jsWidget.cpp

Modules/Chart/CMakeLists.txt

Modules/Chart/documentation/2DDataExample.png

Modules/Chart/documentation/barChartTemperature.png

Modules/Chart/documentation/images/barChartTemperature.png

Modules/Chart/documentation/images/lineChartTemperature.png

Modules/Chart/documentation/images/splineChartTemperature.png

Modules/Chart/documentation/images/userDefinedWidget.png

Modules/Chart/documentation/lineChartTemperature.png

Modules/Chart/documentation/mitkChart.dox

Modules/Chart/documentation/pieChartExample.png

Modules/Chart/documentation/splineChartTemperature.png

Modules/Chart/documentation/userDefinedWidget.png

Modules/Chart/files.cmake

Modules/Chart/include/QmitkChartData.h

Modules/Chart/include/QmitkChartWidget.h

Modules/Chart/include/QmitkChartxyData.h

Modules/Chart/resource/C3js.qrc

Modules/Chart/resource/Chart.css

Modules/Chart/resource/Chart.js

Modules/Chart/resource/Chart_dark.css

Modules/Chart/resource/QmitkChartWidget.html

Modules/Chart/resource/c3.min.css

Modules/Chart/resource/c3.min.js

Modules/Chart/resource/d3.min.js

Modules/Chart/resource/empty.html

Modules/Chart/src/QmitkChartData.cpp

Modules/Chart/src/QmitkChartWidget.cpp

Modules/Chart/src/QmitkChartxyData.cpp

Modules/ImageStatistics/mitkIntensityProfile.cpp

Modules/ImageStatistics/mitkIntensityProfile.h

Modules/ModuleList.cmake

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

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

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

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

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

resolved mergeconflicts
f6d5540ad41b
Actions