summaryrefslogtreecommitdiffstats
path: root/src/datavis3d
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-04-22 13:57:43 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-04-23 07:32:52 +0300
commitbd3fb010ea95f622b81c550e397b11d9eeae0698 (patch)
treed88c5f6f72eac9446bb435b20fb27a654dbb789f /src/datavis3d
parente6f2c15d221885bb2fac4c17c6b782e94ff41205 (diff)
More stuff to widget example
Change-Id: I7ae74f65ba739808b75b3f5a70c00eb92f2ab334 Change-Id: I7ae74f65ba739808b75b3f5a70c00eb92f2ab334 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d')
-rw-r--r--src/datavis3d/engine/q3dbars.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index bfb79049..cfa63266 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -1283,6 +1283,9 @@ void Q3DBars::setMeshFileName(const QString &objFileName)
void Q3DBars::setupSampleSpace(QPoint sampleCount, const QString &labelRow,
const QString &labelColumn, const QString &labelHeight)
{
+ // Delete previous data set
+ delete d_ptr->m_dataSet;
+ d_ptr->m_dataSet = new QDataSet();
d_ptr->m_sampleCount = sampleCount;
d_ptr->m_dataSet->setLabels(labelRow, labelColumn, labelHeight);
// TODO: Invent "idiotproof" max scene size formula..
@@ -1347,6 +1350,10 @@ void Q3DBars::setBarColor(QColor baseColor, QColor heightColor, QColor depthColo
void Q3DBars::setSelectionMode(SelectionMode mode)
{
d_ptr->m_selectionMode = mode;
+ // Disable zoom if mode changes
+ d_ptr->m_zoomActivated = false;
+ d_ptr->m_sceneViewPort = QRect(0, 0, width(), height());
+ // Create zoom selection if there isn't one
if (mode >= ZoomRow && !d_ptr->m_zoomSelection)
d_ptr->m_zoomSelection = new QDataRow();
}