Merge branch 'T25975-newPlotlyVersion'
abed3f7beebd
Actions

Description

Merge branch 'T25975-newPlotlyVersion'

Conflicts:
Modules/Chart/include/QmitkChartWidget.h
Modules/Chart/src/QmitkChartWidget.cpp

Details

Provenance

hentsch	Authored on Feb 5 2019, 11:25 AM
hentsch	Pushed on Feb 5 2019, 11:41 AM

Parents

rMITKed953d13bd0c: added info about plotly to module documentation
rMITK222ca8901c77: Merge branch 'T25979-FixImageStatisticsContainerCompilerError'

Branches

Unknown

Tags

Unknown

Event Timeline

hentsch committed rMITKabed3f7beebd: Merge branch 'T25975-newPlotlyVersion' (authored by hentsch).Feb 5 2019, 11:25 AM

Merged Changes

ed953d13bd0c added info about plotly to module documentation
Author
hentsch
Browse Repository
No Builds
No Audits
b272de6956db updated documentation
Author
hentsch
Browse Repository
No Builds
No Audits
fea713f26de7 resolved T25975 used new plotly version 1.44.1
Author
hentsch
Browse Repository
No Builds
No Audits
4494f8af86ba Renamed resource file to Chart
Author
hentsch
Browse Repository
No Builds
No Audits
2a71a407c88e removed unused code
Author
hentsch
Browse Repository
No Builds
No Audits
c24b52f1b061 typo
Author
hentsch
Browse Repository
No Builds
No Audits
662d69a37520 Renamed enum
Author
hentsch
Browse Repository
No Builds
No Audits
74376101677f Used the power of C++
Author
hentsch
Browse Repository
No Builds
No Audits
4868c58fdebc Removed Qt version check as minimal Qt version is 5.11.1
Author
hentsch
Browse Repository
No Builds
No Audits

Changes (20)

Path

Size

Packages

Modules/

Chart/

documentation/

mitkChart.dox

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

include/

QmitkChartWidget.h

O3: MITK Reviewer Group II

resource/

C3js.qrc

O3: MITK Reviewer Group II

Chart.js

O3: MITK Reviewer Group II

	Chart.qrc
	C3js.qrc

O3: MITK Reviewer Group II

QmitkChartWidget.html

O3: MITK Reviewer Group II

plotly-1.42.5.min.js

O3: MITK Reviewer Group II

plotly-1.44.1.min.js

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

QmitkIntensityProfileVisualizationWidget.cpp

O3: MITK Reviewer Group II

QmitkIntensityProfileVisualizationWidget.h

O3: MITK Reviewer Group II

QmitkIntensityProfileVisualizationWidget.ui

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.chartExample/

src/

internal/

ChartExample.cpp

ChartExample.h

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkImageStatisticsReloadedView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsReloadedView.h

O1: MITK Reviewer Group I

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

rMITKabed3f7beebd

View Options

Modules/Chart/documentation/mitkChart.dox

View Options

Modules/Chart/files.cmake

View Options

Modules/Chart/include/QmitkChartWidget.h

View Options

Modules/Chart/resource/C3js.qrc

View Options

Modules/Chart/resource/Chart.js

View Options

Modules/Chart/resource/Chart.qrc

View Options

Modules/Chart/resource/QmitkChartWidget.html

View Options

Modules/Chart/resource/plotly-1.42.5.min.js

View Options

Modules/Chart/resource/plotly-1.44.1.min.js

View Options

Modules/Chart/src/QmitkChartWidget.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.cpp

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.h

View Options

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.ui

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'T25975-newPlotlyVersion'abed3f7beebdActions

Description

Details

Event Timeline

Merged Changes

Changes (20)

rMITKabed3f7beebd

Modules/Chart/documentation/mitkChart.dox

Modules/Chart/files.cmake

Modules/Chart/include/QmitkChartWidget.h

Modules/Chart/resource/C3js.qrc

Modules/Chart/resource/Chart.js

Modules/Chart/resource/Chart.qrc

Modules/Chart/resource/QmitkChartWidget.html

Modules/Chart/resource/plotly-1.42.5.min.js

Modules/Chart/resource/plotly-1.44.1.min.js

Modules/Chart/src/QmitkChartWidget.cpp

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.cpp

Modules/ImageStatisticsUI/Qmitk/QmitkHistogramVisualizationWidget.h

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.cpp

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.h

Modules/ImageStatisticsUI/Qmitk/QmitkIntensityProfileVisualizationWidget.ui

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

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

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

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

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

Merge branch 'T25975-newPlotlyVersion'
abed3f7beebd
Actions