diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-19 15:11:27 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-20 08:56:51 +0300 |
| commit | d395b8a944b1dc7eea69c5d2b4501e71552d659e (patch) | |
| tree | ee16bf4695d03e697e99819d34792c2ad37fc905 /examples/surfacechart | |
| parent | 14c8349dc0999f07c50504e70c91a604722eebf2 (diff) | |
Fix scaling of the surface
No longer will surface grid count cause scaling of the background
etc.
Task-number: QTRD-2267
Change-Id: I9dd62bcd6ed7b342abc8a52c7f88ed88d22ded69
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples/surfacechart')
| -rw-r--r-- | examples/surfacechart/chartmodifier.cpp | 8 | ||||
| -rw-r--r-- | examples/surfacechart/main.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp index 012ff68f..608f2701 100644 --- a/examples/surfacechart/chartmodifier.cpp +++ b/examples/surfacechart/chartmodifier.cpp @@ -28,8 +28,8 @@ QT_DATAVISUALIZATION_USE_NAMESPACE ChartModifier::ChartModifier(Q3DSurface *chart) : m_chart(chart), - m_xCount(10), - m_zCount(10), + m_xCount(30), + m_zCount(30), m_activeSample(0), m_fontSize(40.0f) { @@ -94,7 +94,7 @@ void ChartModifier::togglePlane(bool enable) if (enable) { QSurfaceDataArray *dataArray = new QSurfaceDataArray; - qreal y = 2.0 / qreal(m_zCount); + qreal y = 2.0 / qreal(m_zCount - 1); dataArray->reserve(m_zCount); for (int i = 0; i < m_zCount; i++) { QSurfaceDataRow *newRow = new QSurfaceDataRow(m_xCount); @@ -108,7 +108,7 @@ void ChartModifier::togglePlane(bool enable) m_chart->axisX()->setLabelFormat("%.2f"); m_chart->axisZ()->setLabelFormat("%.2f"); - m_chart->activeDataProxy()->resetArray(dataArray); + m_chart->activeDataProxy()->resetArray(dataArray, -2.0, 10.0, 16.0, 22.0); m_activeSample = ChartModifier::Plane; } diff --git a/examples/surfacechart/main.cpp b/examples/surfacechart/main.cpp index d3497077..de7987b1 100644 --- a/examples/surfacechart/main.cpp +++ b/examples/surfacechart/main.cpp @@ -86,13 +86,13 @@ int main(int argc, char *argv[]) QSlider *gridSliderX = new QSlider(Qt::Horizontal, widget); gridSliderX->setTickInterval(1); gridSliderX->setMinimum(2); - gridSliderX->setValue(10); + gridSliderX->setValue(30); gridSliderX->setMaximum(200); gridSliderX->setEnabled(true); QSlider *gridSliderZ = new QSlider(Qt::Horizontal, widget); gridSliderZ->setTickInterval(1); gridSliderZ->setMinimum(2); - gridSliderZ->setValue(10); + gridSliderZ->setValue(30); gridSliderZ->setMaximum(200); gridSliderZ->setEnabled(true); |