From 71185c7f11d3cb19a7a4b678861457af7a7f8af1 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 22 May 2014 11:17:25 +0300 Subject: Fix misc minor issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rename bars background mesh more logically - Reorder ElementAxis enums logically - Change the sun in rotations example to a custom item Task-number: QTRD-3132 Change-Id: I00dacb68ebce222edc1a732cf7d14f1660934b36 Reviewed-by: Tomi Korpipää --- .../draggableaxes/axesinputhandler.cpp | 6 +++--- .../qmlaxisdrag/qml/qmlaxisdrag/main.qml | 12 ++++++------ .../rotations/scatterdatamodifier.cpp | 21 ++++++++++----------- .../rotations/scatterdatamodifier.h | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) (limited to 'examples/datavisualization') diff --git a/examples/datavisualization/draggableaxes/axesinputhandler.cpp b/examples/datavisualization/draggableaxes/axesinputhandler.cpp index ef7b871b..7b570e5c 100644 --- a/examples/datavisualization/draggableaxes/axesinputhandler.cpp +++ b/examples/datavisualization/draggableaxes/axesinputhandler.cpp @@ -76,12 +76,12 @@ void AxesInputHandler::handleElementSelected(QAbstract3DGraph::ElementType type) case QAbstract3DGraph::ElementAxisXLabel: m_state = StateDraggingX; break; - case QAbstract3DGraph::ElementAxisZLabel: - m_state = StateDraggingZ; - break; case QAbstract3DGraph::ElementAxisYLabel: m_state = StateDraggingY; break; + case QAbstract3DGraph::ElementAxisZLabel: + m_state = StateDraggingZ; + break; default: m_state = StateNormal; break; diff --git a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml index 8daf4983..e161cf41 100644 --- a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml +++ b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml @@ -154,7 +154,7 @@ Item { //! [5] onSelectedElementChanged: { if (selectedElement >= AbstractGraph3D.ElementAxisXLabel - && selectedElement <= AbstractGraph3D.ElementAxisYLabel) + && selectedElement <= AbstractGraph3D.ElementAxisZLabel) selectedAxisLabel = selectedElement else selectedAxisLabel = -1 @@ -216,16 +216,16 @@ Item { scatterGraph.axisX.min -= distance scatterGraph.axisX.max -= distance break - case AbstractGraph3D.ElementAxisZLabel: - distance = ((moveX + moveY) * cameraMultiplier) / dragSpeedModifier - scatterGraph.axisZ.min += distance - scatterGraph.axisZ.max += distance - break case AbstractGraph3D.ElementAxisYLabel: distance = moveY / dragSpeedModifier scatterGraph.axisY.min += distance scatterGraph.axisY.max += distance break + case AbstractGraph3D.ElementAxisZLabel: + distance = ((moveX + moveY) * cameraMultiplier) / dragSpeedModifier + scatterGraph.axisZ.min += distance + scatterGraph.axisZ.max += distance + break } } //! [7] diff --git a/examples/datavisualization/rotations/scatterdatamodifier.cpp b/examples/datavisualization/rotations/scatterdatamodifier.cpp index c4b439b1..d2c2c52d 100644 --- a/examples/datavisualization/rotations/scatterdatamodifier.cpp +++ b/examples/datavisualization/rotations/scatterdatamodifier.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include using namespace QtDataVisualization; @@ -40,7 +41,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_fieldLines(12), m_arrowsPerLine(16), m_magneticField(new QScatter3DSeries), - m_sun(new QScatter3DSeries), + m_sun(new QCustom3DItem), m_magneticFieldArray(0), m_angleOffset(0.0f), m_angleStep(doublePi / m_arrowsPerLine / animationFrames) @@ -62,17 +63,15 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_magneticField->setColorStyle(Q3DTheme::ColorStyleRangeGradient); //! [4] - // For 'sun' we use a custom large sphere. - m_sun->setItemSize(0.2f); - m_sun->setName(QStringLiteral("Sun")); - m_sun->setItemLabelFormat(QStringLiteral("@seriesName")); - m_sun->setMesh(QAbstract3DSeries::MeshUserDefined); - m_sun->setUserDefinedMesh(QStringLiteral(":/mesh/largesphere.obj")); - m_sun->setBaseColor(QColor(0xff, 0xBB, 0x00)); - m_sun->dataProxy()->addItem(QScatterDataItem(QVector3D())); + // For 'sun' we use a custom large sphere + m_sun->setScaling(QVector3D(0.07f, 0.07f, 0.07f)); + m_sun->setMeshFile(QStringLiteral(":/mesh/largesphere.obj")); + QImage sunColor = QImage(2, 2, QImage::Format_RGB32); + sunColor.fill(QColor(0xff, 0xbb, 0x00)); + m_sun->setTextureImage(sunColor); m_graph->addSeries(m_magneticField); - m_graph->addSeries(m_sun); + m_graph->addCustomItem(m_sun); // Configure the axes according to the data m_graph->axisX()->setRange(-horizontalRange, horizontalRange); @@ -171,7 +170,7 @@ void ScatterDataModifier::triggerRotation() void ScatterDataModifier::toggleSun() { - m_sun->setVisible(!m_graph->seriesList().at(1)->isVisible()); + m_sun->setVisible(!m_sun->isVisible()); } void ScatterDataModifier::toggleRotation() diff --git a/examples/datavisualization/rotations/scatterdatamodifier.h b/examples/datavisualization/rotations/scatterdatamodifier.h index 9df1f26a..c4f7e7a4 100644 --- a/examples/datavisualization/rotations/scatterdatamodifier.h +++ b/examples/datavisualization/rotations/scatterdatamodifier.h @@ -47,7 +47,7 @@ private: int m_fieldLines; int m_arrowsPerLine; QScatter3DSeries *m_magneticField; - QScatter3DSeries *m_sun; + QCustom3DItem *m_sun; QScatterDataArray *m_magneticFieldArray; float m_angleOffset; float m_angleStep; -- cgit v1.2.3