summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-11 13:38:04 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-11 13:41:40 +0300
commita22a04dcc88ce5fe975288a6fd27e3f207950dc0 (patch)
treeaddac92e1dc2b94ce3de65aeed13d9ff16bfd007 /src
parent3cb8e6e5df3a65b88fe39baaf1a323c53adcab87 (diff)
Fix surface slice clearing when axis range changes
Now close slice view in these cases Change-Id: I4561f63a8d82e9168699662ba716fb14a0d5a634 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/datavisualization/engine/q3dscene.cpp1
-rw-r--r--src/datavisualization/engine/surface3dcontroller.cpp6
-rw-r--r--src/datavisualization/engine/surface3dcontroller_p.h1
3 files changed, 8 insertions, 0 deletions
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp
index 54c370b5..4908bde4 100644
--- a/src/datavisualization/engine/q3dscene.cpp
+++ b/src/datavisualization/engine/q3dscene.cpp
@@ -194,6 +194,7 @@ void Q3DScene::setSlicingActive(bool isSlicing)
d_ptr->m_isSlicingActive = isSlicing;
d_ptr->m_changeTracker.slicingActivatedChanged = true;
emit slicingActiveChanged(isSlicing);
+ emitNeedRender();
}
}
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index 87ea48f0..2272b731 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -102,6 +102,12 @@ void Surface3DController::handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstr
adjustValueAxisRange();
}
+void Surface3DController::handleAxisRangeChangedBySender(QObject *sender)
+{
+ scene()->setSlicingActive(false);
+ Abstract3DController::handleAxisRangeChangedBySender(sender);
+}
+
void Surface3DController::setSmoothSurface(bool enable)
{
m_isSmoothSurfaceEnabled = enable;
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index d4b97435..0efece97 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -87,6 +87,7 @@ public:
virtual void setActiveDataProxy(QAbstractDataProxy *proxy);
virtual void handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust);
+ virtual void handleAxisRangeChangedBySender(QObject *sender);
public slots:
void handleArrayReset();