diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 12:17:16 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 12:17:39 +0300 |
| commit | b1b18047c5e98333610716b0ef53dccbe00ca72e (patch) | |
| tree | 3e5e1315d8ec02075664fcfabf67f2f40406ea32 /tests | |
| parent | 03a6fa33bce2459d12e906ab3c01a37d66a74942 (diff) | |
Refactored SelectionMode
Task-number: QTRD-2362
Change-Id: I8d0c54d7a7d40fa063763427764aa32b4a3ed6a9
Change-Id: I8d0c54d7a7d40fa063763427764aa32b4a3ed6a9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/barstest/chart.cpp | 8 | ||||
| -rw-r--r-- | tests/kinectsurface/surfacedata.cpp | 6 | ||||
| -rw-r--r-- | tests/spectrum/spectrumapp/main.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index d07b87f4..fa1d55e4 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -140,7 +140,7 @@ void ChartModifier::restart(bool dynamicData) m_chart->setRowAxis(m_yearAxis); m_chart->setColumnAxis(m_monthAxis); - m_chart->setSelectionMode(QDataVis::ModeItem); + m_chart->setSelectionMode(QDataVis::SelectionModeItem); } else { m_chart->setActiveDataProxy(m_genericData); @@ -150,7 +150,7 @@ void ChartModifier::restart(bool dynamicData) m_chart->setRowAxis(m_genericRowAxis); m_chart->setColumnAxis(m_genericColumnAxis); - m_chart->setSelectionMode(QDataVis::ModeItem); + m_chart->setSelectionMode(QDataVis::SelectionModeItem); } } @@ -475,8 +475,8 @@ void ChartModifier::changeSelectionMode() { static int selectionMode = m_chart->selectionMode(); - if (++selectionMode > QDataVis::ModeSliceColumn) - selectionMode = QDataVis::ModeNone; + if (++selectionMode > QDataVis::SelectionModeSliceColumn) + selectionMode = QDataVis::SelectionModeNone; m_chart->setSelectionMode((QDataVis::SelectionMode)selectionMode); } diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp index 28022a4e..d69c35ce 100644 --- a/tests/kinectsurface/surfacedata.cpp +++ b/tests/kinectsurface/surfacedata.cpp @@ -45,7 +45,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars gradient.setColorAt(0.33, Qt::blue); gradient.setColorAt(0.67, Qt::red); gradient.setColorAt(1.0, Qt::yellow); - m_surface->setSelectionMode(QDataVis::ModeNone); + m_surface->setSelectionMode(QDataVis::SelectionModeNone); m_surface->setGridVisible(false); m_surface->setGradient(gradient); m_surface->axisY()->setMax(255); @@ -57,7 +57,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars // Initialize scatter m_scatter->setTheme(QDataVis::ThemeStoneMoss); - m_scatter->setSelectionMode(QDataVis::ModeNone); + m_scatter->setSelectionMode(QDataVis::SelectionModeNone); m_scatter->setGridVisible(false); m_scatter->setObjectType(QDataVis::Dots, false); m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow); @@ -71,7 +71,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars // Initialize bars m_bars->setTheme(QDataVis::ThemeQt); - m_bars->setSelectionMode(QDataVis::ModeNone); + m_bars->setSelectionMode(QDataVis::SelectionModeNone); m_bars->setGridVisible(false); m_bars->setBarType(QDataVis::Bars, true); #if 1 diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index 7fbd92d5..560c3a83 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -97,7 +97,7 @@ MainApp::MainApp(Q3DBars *window) // Set color scheme m_chart->setBarColor(QColor(Qt::red), false); // Disable selection - m_chart->setSelectionMode(QDataVis::ModeNone); + m_chart->setSelectionMode(QDataVis::SelectionModeNone); QObject::connect(m_engine, &Engine::changedSpectrum, this, &MainApp::spectrumChanged); QObject::connect(m_engine, &Engine::stateChanged, this, &MainApp::stateChanged); m_restartTimer->setSingleShot(true); |