From 64d6b482bfb9dbacd548b72cb9c073513f6aa56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 15 Jan 2014 11:34:59 +0200 Subject: Removed QDataVis and namespace macros - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen --- tests/barstest/chart.cpp | 16 ++++++++-------- tests/barstest/chart.h | 2 +- tests/directional/scatterdatamodifier.cpp | 6 +++--- tests/directional/scatterdatamodifier.h | 2 +- tests/multigraphs/data.cpp | 12 ++++++------ tests/scattertest/scatterchart.cpp | 8 ++++---- tests/scattertest/scatterchart.h | 2 +- tests/spectrum/spectrumapp/main.cpp | 6 +++--- tests/surfacetest/graphmodifier.cpp | 6 +++--- tests/surfacetest/main.cpp | 24 ++++++++++++------------ 10 files changed, 42 insertions(+), 42 deletions(-) (limited to 'tests') diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index c83a9389..f162cbff 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -25,7 +25,7 @@ #include #include -QT_DATAVISUALIZATION_USE_NAMESPACE +using namespace QtDataVisualization; const QString celsiusString = QString(QChar(0xB0)) + "C"; @@ -119,7 +119,7 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog) m_graph->addAxis(m_genericColumnAxis); m_graph->setActiveTheme(m_builtinTheme); - m_graph->setShadowQuality(QDataVis::ShadowQualitySoftMedium); + m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftMedium); m_temperatureData->setName("Oulu"); m_temperatureData2->setName("Helsinki"); @@ -637,10 +637,10 @@ void GraphModifier::changeSelectionMode() { static int selectionMode = m_graph->selectionMode(); - if (++selectionMode > (QDataVis::SelectionItemAndColumn | QDataVis::SelectionSlice | QDataVis::SelectionMultiSeries)) - selectionMode = QDataVis::SelectionNone; + if (++selectionMode > (QAbstract3DGraph::SelectionItemAndColumn | QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionMultiSeries)) + selectionMode = QAbstract3DGraph::SelectionNone; - m_graph->setSelectionMode((QDataVis::SelectionFlag)selectionMode); + m_graph->setSelectionMode((QAbstract3DGraph::SelectionFlag)selectionMode); } void GraphModifier::changeFont(const QFont &font) @@ -658,7 +658,7 @@ void GraphModifier::changeFontSize(int fontsize) m_graph->activeTheme()->setFont(font); } -void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) +void GraphModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq) { int quality = int(sq); // Updates the UI component to show correct shadow quality @@ -709,7 +709,7 @@ void GraphModifier::handleValueAxisChanged(QValue3DAxis *axis) void GraphModifier::changeShadowQuality(int quality) { - QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); + QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality); m_graph->setShadowQuality(sq); emit shadowQualityChanged(quality); } @@ -718,7 +718,7 @@ void GraphModifier::showFiveSeries() { releaseProxies(); releaseAxes(); - m_graph->setSelectionMode(QDataVis::SelectionItemRowAndColumn | QDataVis::SelectionMultiSeries); + m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemRowAndColumn | QAbstract3DGraph::SelectionMultiSeries); m_dummyData->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList()); m_dummyData2->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList()); diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index f617a348..9c14e5cd 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -85,7 +85,7 @@ public slots: void flipViews(); void setGradient(); void changeShadowQuality(int quality); - void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality); + void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void handleSelectionChange(const QPoint &position); void setUseNullInputHandler(bool useNull); diff --git a/tests/directional/scatterdatamodifier.cpp b/tests/directional/scatterdatamodifier.cpp index 065d9a89..f7089ae4 100644 --- a/tests/directional/scatterdatamodifier.cpp +++ b/tests/directional/scatterdatamodifier.cpp @@ -44,7 +44,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) QFont font = m_graph->activeTheme()->font(); font.setPointSize(m_fontSize); m_graph->activeTheme()->setFont(font); - m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow); + m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow); m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront); m_graph->setAxisX(new QValue3DAxis); @@ -158,7 +158,7 @@ void ScatterDataModifier::changeFont(const QFont &font) m_graph->activeTheme()->setFont(newFont); } -void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) +void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq) { int quality = int(sq); emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp @@ -166,7 +166,7 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s void ScatterDataModifier::changeShadowQuality(int quality) { - QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); + QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality); m_graph->setShadowQuality(sq); } diff --git a/tests/directional/scatterdatamodifier.h b/tests/directional/scatterdatamodifier.h index fbb92e86..e3979818 100644 --- a/tests/directional/scatterdatamodifier.h +++ b/tests/directional/scatterdatamodifier.h @@ -46,7 +46,7 @@ public slots: void changeStyle(int style); void changeTheme(int theme); void changeShadowQuality(int quality); - void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality); + void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); signals: void backgroundEnabledChanged(bool enabled); diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp index e70a01df..9df5e668 100644 --- a/tests/multigraphs/data.cpp +++ b/tests/multigraphs/data.cpp @@ -29,7 +29,7 @@ #include #include -QT_DATAVISUALIZATION_USE_NAMESPACE +using namespace QtDataVisualization; Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, QTextEdit *statusArea, QWidget *widget) : @@ -53,7 +53,7 @@ Data::Data(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::SelectionNone); + m_surface->setSelectionMode(QAbstract3DGraph::SelectionNone); m_surface->activeTheme()->setGridEnabled(false); m_surface->activeTheme()->setBackgroundEnabled(false); m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150); @@ -66,9 +66,9 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, // Initialize scatter m_scatter->activeTheme()->setType(Q3DTheme::ThemeStoneMoss); - m_scatter->setSelectionMode(QDataVis::SelectionNone); + m_scatter->setSelectionMode(QAbstract3DGraph::SelectionNone); m_scatter->activeTheme()->setGridEnabled(false); - m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow); + m_scatter->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow); m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 85.0, 150); QScatter3DSeries *series2 = new QScatter3DSeries; series2->setMesh(QAbstract3DSeries::MeshPoint); @@ -76,9 +76,9 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, // Initialize bars m_bars->activeTheme()->setType(Q3DTheme::ThemeQt); - m_bars->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice); + m_bars->setSelectionMode(QAbstract3DGraph::SelectionItemAndRow | QAbstract3DGraph::SelectionSlice); m_bars->activeTheme()->setGridEnabled(false); - m_bars->setShadowQuality(QDataVis::ShadowQualityLow); + m_bars->setShadowQuality(QAbstract3DGraph::ShadowQualityLow); m_bars->setBarSpacing(QSizeF(0.0, 0.0)); m_bars->scene()->activeCamera()->setCameraPosition(0.0, 75.0, 150); QBar3DSeries *series3 = new QBar3DSeries; diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index 9482ee18..bcc0a4ab 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -41,7 +41,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) QFont font = m_chart->activeTheme()->font(); font.setPointSize(m_fontSize); m_chart->activeTheme()->setFont(font); - m_chart->setShadowQuality(QDataVis::ShadowQualityNone); + m_chart->setShadowQuality(QAbstract3DGraph::ShadowQualityNone); m_chart->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront); m_chart->setAxisX(new QValue3DAxis); m_chart->setAxisY(new QValue3DAxis); @@ -50,7 +50,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) createAndAddSeries(); createAndAddSeries(); - m_chart->setSelectionMode(QDataVis::SelectionItem); + m_chart->setSelectionMode(QAbstract3DGraph::SelectionItem); QObject::connect(&m_timer, &QTimer::timeout, this, &ScatterDataModifier::timeout); QObject::connect(m_chart, &Q3DScatter::shadowQualityChanged, this, @@ -201,7 +201,7 @@ void ScatterDataModifier::changePointSize(int pointSize) m_targetSeries->setItemSize(0.01f * float(pointSize)); } -void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) +void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq) { int quality = int(sq); // Updates the UI component to show correct shadow quality @@ -499,7 +499,7 @@ void ScatterDataModifier::handleAxisZChanged(QValue3DAxis *axis) void ScatterDataModifier::changeShadowQuality(int quality) { - QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); + QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality); m_chart->setShadowQuality(sq); emit shadowQualityChanged(quality); } diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h index ce6c2073..d4908023 100644 --- a/tests/scattertest/scatterchart.h +++ b/tests/scattertest/scatterchart.h @@ -49,7 +49,7 @@ public: public slots: void changeShadowQuality(int quality); - void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality); + void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void clear(); void resetAxes(); void addOne(); diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index c4fe111d..b1bcb358 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -78,14 +78,14 @@ MainApp::MainApp(Q3DBars *window) // Disable auto-scaling of height by defining explicit range m_chart->valueAxis()->setRange(0.0f, 1.0f); // Disable shadows - m_chart->setShadowQuality(QDataVis::ShadowQualityNone); + m_chart->setShadowQuality(QAbstract3DGraph::ShadowQualityNone); #if USE_CONES // Set bar specifications; make them a bit wider than deep and make them be drawn 75% // inside each other m_chart->setBarThickness(1.25); m_chart->setBarSpacing(QSizeF(0.2, -0.75)); // Set bar type, smooth cones - m_chart->setBarType(QDataVis::MeshCones, true); + m_chart->setBarType(QAbstract3DGraph::MeshCones, true); // Adjust zoom manually; automatic zoom level calculation does not work well with negative // spacings (in setBarSpacing) m_chart->setCameraPosition(10.0f, 5.0f, 70.0f); @@ -98,7 +98,7 @@ MainApp::MainApp(Q3DBars *window) m_chart->scene()->activeCamera()->setCameraPosition(10.0f, 7.5f, 75.0f); #endif // Disable selection - m_chart->setSelectionMode(QDataVis::SelectionNone); + m_chart->setSelectionMode(QAbstract3DGraph::SelectionNone); QObject::connect(m_engine, &Engine::changedSpectrum, this, &MainApp::spectrumChanged); QObject::connect(m_engine, &Engine::stateChanged, this, &MainApp::stateChanged); m_restartTimer->setSingleShot(true); diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp index 1c177219..04a41cfe 100644 --- a/tests/surfacetest/graphmodifier.cpp +++ b/tests/surfacetest/graphmodifier.cpp @@ -27,7 +27,7 @@ #include #include -QT_DATAVISUALIZATION_USE_NAMESPACE +using namespace QtDataVisualization; //#define JITTER_PLANE //#define WONKY_PLANE @@ -438,7 +438,7 @@ void GraphModifier::resetArrayAndSliders(QSurfaceDataArray *array, float minZ, f void GraphModifier::changeShadowQuality(int quality) { - QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); + QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality); m_graph->setShadowQuality(sq); } @@ -447,7 +447,7 @@ void GraphModifier::changeSelectionMode(int mode) QComboBox *comboBox = qobject_cast(sender()); if (comboBox) { int flags = comboBox->itemData(mode).toInt(); - m_graph->setSelectionMode(QDataVis::SelectionFlags(flags)); + m_graph->setSelectionMode(QAbstract3DGraph::SelectionFlags(flags)); } } diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp index 54c27981..7279b27a 100644 --- a/tests/surfacetest/main.cpp +++ b/tests/surfacetest/main.cpp @@ -184,29 +184,29 @@ int main(int argc, char *argv[]) QComboBox *selectionMode = new QComboBox(widget); selectionMode->addItem(QStringLiteral("None"), - int(QDataVis::SelectionNone)); + int(QAbstract3DGraph::SelectionNone)); selectionMode->addItem(QStringLiteral("Item"), - int(QDataVis::SelectionItem)); + int(QAbstract3DGraph::SelectionItem)); selectionMode->addItem(QStringLiteral("Row"), - int(QDataVis::SelectionRow)); + int(QAbstract3DGraph::SelectionRow)); selectionMode->addItem(QStringLiteral("Item and Row"), - int(QDataVis::SelectionItemAndRow)); + int(QAbstract3DGraph::SelectionItemAndRow)); selectionMode->addItem(QStringLiteral("Column"), - int(QDataVis::SelectionColumn)); + int(QAbstract3DGraph::SelectionColumn)); selectionMode->addItem(QStringLiteral("Item and Column"), - int(QDataVis::SelectionItemAndColumn)); + int(QAbstract3DGraph::SelectionItemAndColumn)); selectionMode->addItem(QStringLiteral("Row and Column"), - int(QDataVis::SelectionRowAndColumn)); + int(QAbstract3DGraph::SelectionRowAndColumn)); selectionMode->addItem(QStringLiteral("Item, Row and Column"), - int(QDataVis::SelectionItemRowAndColumn)); + int(QAbstract3DGraph::SelectionItemRowAndColumn)); selectionMode->addItem(QStringLiteral("Slice into Row"), - int(QDataVis::SelectionSlice | QDataVis::SelectionRow)); + int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionRow)); selectionMode->addItem(QStringLiteral("Slice into Row and Item"), - int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndRow)); + int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndRow)); selectionMode->addItem(QStringLiteral("Slice into Column"), - int(QDataVis::SelectionSlice | QDataVis::SelectionColumn)); + int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionColumn)); selectionMode->addItem(QStringLiteral("Slice into Column and Item"), - int(QDataVis::SelectionSlice | QDataVis::SelectionItemAndColumn)); + int(QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionItemAndColumn)); selectionMode->setCurrentIndex(1); QPushButton *selectButton = new QPushButton(widget); -- cgit v1.2.3