Merge branch 'T25873-themeChange'
595127ec5b1c
Actions

Description

Merge branch 'T25873-themeChange'

Conflicts:
Modules/Chart/resource/Chart.js
Modules/Chart/src/QmitkChartWidget.cpp

Details

Provenance

hentsch	Authored on Feb 1 2019, 2:31 PM
hentsch	Pushed on Feb 1 2019, 2:31 PM

Parents

rMITKfb2fee118b3a: Theme change triggering now automatically in QmitkChart instead of plugin. Only…
rMITK244c9a325fba: Enabled asymmetric error bars Fixes T25969

Branches

Unknown

Tags

Unknown

Event Timeline

hentsch committed rMITK595127ec5b1c: Merge branch 'T25873-themeChange' (authored by hentsch).Feb 1 2019, 2:31 PM

Merged Changes

fb2fee118b3a Theme change triggering now automatically in QmitkChart instead of plugin. Only…
Author
hentsch
Browse Repository
No Builds
No Audits
731f56c4a609 removed function
Author
hentsch
Browse Repository
No Builds
No Audits
9ffdebd3d842 removed unecessary include
Author
hentsch
Browse Repository
No Builds
No Audits
163225a4e907 cleaned resource files
Author
hentsch
Browse Repository
No Builds
No Audits
977e843f69a9 included theming in JS
Author
hentsch
Browse Repository
No Builds
No Audits
fbb1be7322ef corrected chartTitle
Author
hentsch
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

Packages

Modules/

Chart/

include/

QmitkChartData.h

O3: MITK Reviewer Group II

QmitkChartWidget.h

O3: MITK Reviewer Group II

resource/

Chart.js

O3: MITK Reviewer Group II

Chart_dark.css

O3: MITK Reviewer Group II

QmitkChartWidget.html

O3: MITK Reviewer Group II

empty.html

O3: MITK Reviewer Group II

empty_dark.html

O3: MITK Reviewer Group II

src/

QmitkChartWidget.cpp

O3: MITK Reviewer Group II

ImageStatisticsUI/

Qmitk/

QmitkHistogramVisualizationWidget.cpp

O3: MITK Reviewer Group II

QmitkHistogramVisualizationWidget.h

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.chartExample/

src/

internal/

ChartExample.cpp

rMITK595127ec5b1c

View Options

Modules/Chart/include/QmitkChartData.h

View Options

Modules/Chart/include/QmitkChartWidget.h

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/empty.html

View Options

Modules/Chart/resource/empty_dark.html

View Options

Modules/Chart/src/QmitkChartWidget.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h

View Options

Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.cpp

Merge branch 'T25873-themeChange'595127ec5b1cActions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rMITK595127ec5b1c

Modules/Chart/include/QmitkChartData.h

Modules/Chart/include/QmitkChartWidget.h

Modules/Chart/resource/Chart.js

Modules/Chart/resource/Chart_dark.css

Modules/Chart/resource/QmitkChartWidget.html

Modules/Chart/resource/empty.html

Modules/Chart/resource/empty_dark.html

Modules/Chart/src/QmitkChartWidget.cpp

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h

Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExample.cpp

Merge branch 'T25873-themeChange'
595127ec5b1c
Actions