Merge branch 'T26320-update-chart-widget'
f240b66e6515
Actions

Description

Merge branch 'T26320-update-chart-widget'

Conflicts:
Modules/Chart/include/QmitkChartxyData.h
Modules/Chart/resource/Chart.js
Modules/Chart/src/QmitkChartWidget.cpp
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.chartExample/src/internal/ChartExampleControls.ui

Details

Provenance

hentsch	Authored on May 23 2019, 4:53 PM
hentsch	Pushed on May 23 2019, 4:54 PM

Parents

rMITK5539b57629ef: Optimized SetShowSubchart Now directly changed in QmitkChartData instead of…
rMITK5713480ee556: Merge branch 'T26324-optimizeZoomingOption'

Branches

Unknown

Tags

Unknown

Event Timeline

hentsch committed rMITKf240b66e6515: Merge branch 'T26320-update-chart-widget' (authored by hentsch).May 23 2019, 4:53 PM

Merged Changes

5539b57629ef Optimized SetShowSubchart Now directly changed in QmitkChartData instead of…
Author
hentsch
Browse Repository
No Builds
No Audits
3babe03d733e removed unused function
Author
hentsch
Browse Repository
No Builds
No Audits
f53841c8221b Removed convenience function
Author
hentsch
Browse Repository
No Builds
No Audits
7ecd7d249f8a removed output
Author
hentsch
Browse Repository
No Builds
No Audits
727e77c6ad09 Add function to update an existing data label
Author
hentsch
Browse Repository
No Builds
No Audits
ea91dac23f48 Also the error data is cleared
Author
hentsch
Browse Repository
No Builds
No Audits
109c1623dced Implements the updateData functionality. Updates of the data are now directly…
Author
hentsch
Browse Repository
No Builds
No Audits
b3fd5ee59afd Added connections to instantly change global options in Chart example. The…
Author
hentsch
Browse Repository
No Builds
No Audits
2c8a1d2a3423 adds connect for m_C3xyData
Author
hentsch
Browse Repository
No Builds
No Audits
c7afdd7c6c51 adds connect for m_C3Data variables
Author
hentsch
Browse Repository
No Builds
No Audits
3a289212b988 extracted chart type data generation in function
Author
hentsch
Browse Repository
No Builds
No Audits
0d20dcf765c1 extracted data generation for legend position in function
Author
hentsch
Browse Repository
No Builds
No Audits
a74985288d2e removed multiply defined variable
Author
hentsch
Browse Repository
No Builds
No Audits
a7d13a99d3f9 legend position in chart is directly changed when user changes GUI
Author
hentsch
Browse Repository
No Builds
No Audits
30da4bc9b76c emit signal in case of x/y data change
Author
hentsch
Browse Repository
No Builds
No Audits
c01785d763fd adapted to MITK Style guide
Author
hentsch
Browse Repository
No Builds
No Audits
4c0ab7018d73 initialize xyData object with size of data vector
Author
hentsch
Browse Repository
No Builds
No Audits
009f58c400f5 initialization in header instead of constructor
Author
hentsch
Browse Repository
No Builds
No Audits
7fff9ea7fdab new tests for update chart
Author
hentsch
Browse Repository
No Builds
No Audits
88e23ac189b3 added function for creating all necessary GUI connections
Author
hentsch
Browse Repository
No Builds
No Audits
110756acb3b6 added labelCount variable to use this information in js updating routine
Author
hentsch
Browse Repository
No Builds
No Audits
423535fa1642 added UpdateData* functions for updating existing data values
Author
hentsch
Browse Repository
No Builds
No Audits
ef2223a118ba ChartExample: add button to update the current chart if it exists Add emit…
Author
• steint
Browse Repository
No Builds
No Audits

Changes (8)

Path

Size

Packages

Modules/

Chart/

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.chartExample/

src/

internal/

ChartExample.cpp

ChartExample.h

ChartExampleControls.ui

rMITKf240b66e6515

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.chartExample/src/internal/ChartExample.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExampleControls.ui

Merge branch 'T26320-update-chart-widget'f240b66e6515Actions

Description

Details

Event Timeline

Merged Changes

Changes (8)

rMITKf240b66e6515

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.chartExample/src/internal/ChartExample.cpp

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

Plugins/org.mitk.gui.qt.chartExample/src/internal/ChartExampleControls.ui

Merge branch 'T26320-update-chart-widget'
f240b66e6515
Actions