resolved mergeconflicts between T23383 and T23381
bf0fafb4ded5
Actions

Description

resolved mergeconflicts between T23383 and T23381

Details

Provenance

hentsch	Authored on Sep 18 2017, 2:22 PM
hentsch	Pushed on Sep 18 2017, 2:23 PM

Parents

rMITK50b7b0a5cfbc: Adapted documentation page to changes of T23383.
rMITKac2ffd02a187: Merge branch 'T23381-MitkChartTitleFunctionality'

Branches

Unknown

Tags

Unknown

Event Timeline

hentsch committed rMITKbf0fafb4ded5: resolved mergeconflicts between T23383 and T23381 (authored by hentsch).Sep 18 2017, 2:22 PM

Merged Changes

50b7b0a5cfbc Adapted documentation page to changes of T23383.
Author
hentsch
Browse Repository
No Builds
No Audits
340eeac01ff2 Added documentation.
Author
hentsch
Browse Repository
No Builds
No Audits
c24139353678 Added setter for dashed line style.
Author
hentsch
Browse Repository
No Builds
No Audits
04c82f892398 Adapted function name according to MITK style guide.
Author
hentsch
Browse Repository
No Builds
No Audits
6020fe39f9d3 Added SetColor() functionality for each data entry.
Author
hentsch
Browse Repository
No Builds
No Audits
792a5c215971 Refactored SetDataLabels --> AddData1D/2D(data, labels)
Author
hentsch
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

Packages

Modules/

Chart/

documentation/

mitkChart.dox

O3: MITK Reviewer Group II

include/

QmitkChartWidget.h

O3: MITK Reviewer Group II

QmitkChartxyData.h

O3: MITK Reviewer Group II

resource/

Chart.js

O3: MITK Reviewer Group II

src/

QmitkChartWidget.cpp

O3: MITK Reviewer Group II

QmitkChartxyData.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

rMITKbf0fafb4ded5

View Options

Modules/Chart/documentation/mitkChart.dox

View Options

Modules/Chart/include/QmitkChartWidget.h

View Options

Modules/Chart/include/QmitkChartxyData.h

View Options

Modules/Chart/resource/Chart.js

View Options

Modules/Chart/src/QmitkChartWidget.cpp

View Options

Modules/Chart/src/QmitkChartxyData.cpp

View Options

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

resolved mergeconflicts between T23383 and T23381bf0fafb4ded5Actions

Description

Details

Event Timeline

Merged Changes

Changes (7)

rMITKbf0fafb4ded5

Modules/Chart/documentation/mitkChart.dox

Modules/Chart/include/QmitkChartWidget.h

Modules/Chart/include/QmitkChartxyData.h

Modules/Chart/resource/Chart.js

Modules/Chart/src/QmitkChartWidget.cpp

Modules/Chart/src/QmitkChartxyData.cpp

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

resolved mergeconflicts between T23383 and T23381
bf0fafb4ded5
Actions