summaryrefslogtreecommitdiffstats
path: root/src/animations
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-04-09 11:24:36 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-04-09 11:31:26 +0300
commit56fd46a395765db6818f890676e42cc59a9f4a81 (patch)
tree6fd6a4cff82ae4773636284ce5962135fba1daf6 /src/animations
parent34f67c64ed9562dc3c0deef0592c0e88c453c3f5 (diff)
Revert "Remove TODOs for 1.2.1 release, revert this after release"
This reverts commit 9df61547fec62d7a608dd8cd2be94e04ed0f92e3. Release has been done, so bring back the TODOs. Change-Id: I1362a254a7f9c9c2f0b659b72af29638a980a394 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/animations')
-rw-r--r--src/animations/axisanimation.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/animations/axisanimation.cpp b/src/animations/axisanimation.cpp
index 32851309..e59d9aae 100644
--- a/src/animations/axisanimation.cpp
+++ b/src/animations/axisanimation.cpp
@@ -57,6 +57,11 @@ void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo
{
if (state() != QAbstractAnimation::Stopped) stop();
+// TODO: cannot return even if layout is empty
+// New layout is not set properly without it (crash)
+// if (newLayout.count() == 0)
+// return;
+
switch (m_type) {
case ZoomOutAnimation: {
QRectF rect = m_axis->gridGeometry();
@@ -125,6 +130,7 @@ void AxisAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped) { //workaround
QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value);
+// Q_ASSERT(vector.count() != 0);
m_axis->setLayout(vector);
m_axis->updateGeometry();
}