Merge branch 'T26777-Refactor-QmitkChartWidget'
9a7b5772bc79
Actions

Description

Merge branch 'T26777-Refactor-QmitkChartWidget'

Details

Provenance

j762e	Authored on Dec 2 2019, 4:52 PM
j762e	Pushed on Dec 2 2019, 4:59 PM

Parents

rMITK4f7ded44047a: Refactor save of pieLabels
rMITK7b6da4439c06: Merge branch 'T26795-Fix-gcc'

Branches

Unknown

Tags

Unknown

Event Timeline

j762e committed rMITK9a7b5772bc79: Merge branch 'T26777-Refactor-QmitkChartWidget' (authored by j762e).Dec 2 2019, 4:52 PM

Merged Changes

4f7ded44047a Refactor save of pieLabels
Author
j762e
Browse Repository
No Builds
No Audits
23366ca51ce4 SetCurrentText of comboBoxes directly by string
Author
j762e
Browse Repository
No Builds
No Audits
3b358cae68b9 Adapt hardcoded comparison of strings
Author
j762e
Browse Repository
No Builds
No Audits
a7b4e993e201 Adapt the updateData function by adding a UpdateChartExampleData() function to…
Author
j762e
Browse Repository
No Builds
No Audits
99c91aa4e660 Remove .toLower() because its already lower in the .ui file
Author
j762e
Browse Repository
No Builds
No Audits
7b1c7eccf730 Adapt Include-Guard due to renaming the file
Author
j762e
Browse Repository
No Builds
No Audits
30066636fdc1 Add ConvertToText function that takes QVariantList
Author
j762e
Browse Repository
No Builds
No Audits
9d9cae87f8be Re-Add override and nullptr instead of 0
Author
j762e
Browse Repository
No Builds
No Audits
4998d268a7ff Erase GetIndexByString function and depending string vectors
Author
j762e
Browse Repository
No Builds
No Audits
8a54f26a0988 Change comboBox items of color, type and linestyle to lower due to conflicts…
Author
j762e
Browse Repository
No Builds
No Audits
b6992664bb45 Remove emplacement for lineType & clarify naming of it
Author
j762e
Browse Repository
No Builds
Audited
bb4e83cc238f Remove unnecessary variables
Author
j762e
Browse Repository
No Builds
Audited
7cff462e7484 Change name to QmitkChartExampleView
Author
j762e
Browse Repository
No Builds
Audited
6ca3be5448eb Rename ChartExample to QmitkChartExampleView
Author
j762e
Browse Repository
No Builds
Audited
b1bf2fd99dff Removing unnecessary dependencies and set()
Author
j762e
Browse Repository
No Builds
Audited
7217229045df Remove chartExistence boolean to avoid workaround
Author
j762e
Browse Repository
No Builds
Audited
c77d3d4e6e74 Add newlines
Author
j762e
Browse Repository
No Builds
Audited
45e3b8eabe97 Add default arguments for clear functions
Author
j762e
Browse Repository
No Builds
No Audits
2bb676acf3f1 Remove unnecessary emplacements
Author
j762e
Browse Repository
No Builds
Audited
56ef3218a034 Rearrange functions to an appropriate location
Author
j762e
Browse Repository
No Builds
Audited
3828ccbb401e Make some unnecessarily public functions private
Author
j762e
Browse Repository
No Builds
Audited
726b04a3e631 Refactor AddChartExampleData to avoid converting
Author
j762e
Browse Repository
No Builds
Audited
1283b8222c0e Add setUp and tearDown functionality
Author
j762e
Browse Repository
No Builds
No Audits
de875065927d Adapt CMake
Author
j762e
Browse Repository
No Builds
No Audits
cf13406d8478 Move TestExampleHelper outside of test dir
Author
j762e
Browse Repository
No Builds
No Audits
5bdfc4c4048e Avoid repeated converting
Author
j762e
Browse Repository
No Builds
Audited
be64b0e66a24 Re-add emplace functionality
Author
j762e
Browse Repository
No Builds
Audited
86d101c39ec2 Rearrange ::Impl::GetThemeName() function
Author
j762e
Browse Repository
No Builds
No Audits
4fe5206d5ca9 Add chartExistance boolean to avoid #T26790
Author
j762e
Browse Repository
No Builds
Audited
9f3eccc8c4ae Add test driver
Author
j762e
Browse Repository
No Builds
No Audits
0d7e89ce4c44 Reorder functions, improve readability
Author
j762e
Browse Repository
No Builds
Audited
461d97787618 Re-add override
Author
j762e
Browse Repository
No Builds
No Audits
026358ce529e Set LabelInfo text to red
Author
j762e
Browse Repository
No Builds
No Audits
2ef6a51b13de Add emplace
Author
j762e
Browse Repository
No Builds
Audited
e93ec50c83d7 Adapt HeaderFiles and Setup
Author
j762e
Browse Repository
No Builds
No Audits
581ed1167d1a Adapt AddData() function
Author
j762e
Browse Repository
No Builds
No Audits
7aa0559a1250 Add function to update existing data
Author
j762e
Browse Repository
No Builds
Audited
ea1cf2ffd166 Add new function for adding data
Author
j762e
Browse Repository
No Builds
Audited
f98609dac0c1 Modify functions for GUI
Author
j762e
Browse Repository
No Builds
Audited
cdda996996fd Add Function to update existing data
Author
j762e
Browse Repository
No Builds
Audited
39cfb5c5df5e Remove override
Author
j762e
Browse Repository
No Builds
Audited
61caf41dc62c Add Function for returning index by string
Author
j762e
Browse Repository
No Builds
Audited
67b78fbafabe Delete FillRandom-Functions
Author
j762e
Browse Repository
No Builds
No Audits
f49e7fc3c915 Adapt GUI
Author
j762e
Browse Repository
No Builds
No Audits
7f9ceb33fa6f Remove prescribed initialization
Author
j762e
Browse Repository
No Builds
No Audits
99804079e0a8 Add container for Type, LineStyle and Color
Author
j762e
Browse Repository
No Builds
Audited

Changes (21)

Path

Size

Packages

Modules/

Chart/

CMakeLists.txt

O3: MITK Reviewer Group II

Test

O3: MITK Reviewer Group II

CMakeLists.txt

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

mitkChartExampleTest.cpp

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

include/

QmitkChartWidget.h

O3: MITK Reviewer Group II

QmitkChartxyData.h

O3: MITK Reviewer Group II

mitkChartExampleTestHelper.h

O3: MITK Reviewer Group II

src/

QmitkChartWidget.cpp

O3: MITK Reviewer Group II

mitkChartExampleTestHelper.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.chartExample/

CMakeLists.txt

files.cmake

plugin.xml

src/

internal/

ChartExample.cpp

ChartExample.h

ChartExampleControls.ui

QmitkChartExampleView.cpp

	QmitkChartExampleView.h
	ChartExample.h

	QmitkChartExampleViewControls.ui
	ChartExampleControls.ui

org_mitk_gui_qt_chartExample_Activator.cpp

rMITK9a7b5772bc79

View Options

Modules/Chart/CMakeLists.txt

View Options

Modules/Chart/Test/CMakeLists.txt

View Options

Modules/Chart/Test/files.cmake

View Options

Modules/Chart/Test/mitkChartExampleTest.cpp

View Options

Modules/Chart/files.cmake

View Options

Modules/Chart/include/QmitkChartWidget.h

View Options

Modules/Chart/include/QmitkChartxyData.h

View Options

Modules/Chart/include/mitkChartExampleTestHelper.h

View Options

Modules/Chart/src/QmitkChartWidget.cpp

View Options

Modules/Chart/src/mitkChartExampleTestHelper.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.chartExample/files.cmake

View Options

Plugins/org.mitk.gui.qt.chartExample/plugin.xml

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'T26777-Refactor-QmitkChartWidget'9a7b5772bc79Actions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rMITK9a7b5772bc79

Modules/Chart/CMakeLists.txt

Modules/Chart/Test/CMakeLists.txt

Modules/Chart/Test/files.cmake

Modules/Chart/Test/mitkChartExampleTest.cpp

Modules/Chart/files.cmake

Modules/Chart/include/QmitkChartWidget.h

Modules/Chart/include/QmitkChartxyData.h

Modules/Chart/include/mitkChartExampleTestHelper.h

Modules/Chart/src/QmitkChartWidget.cpp

Modules/Chart/src/mitkChartExampleTestHelper.cpp

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

Plugins/org.mitk.gui.qt.chartExample/files.cmake

Plugins/org.mitk.gui.qt.chartExample/plugin.xml

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

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

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

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

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

Merge branch 'T26777-Refactor-QmitkChartWidget'
9a7b5772bc79
Actions