Fix QLogValueAxis update

Reverting previous fix. Instead fix the update so that the axis arrow
and title are updated for logarithmic axis even when the layout is
empty. The logarithmic axis is special case as it can have zero ticks
where the other axises have to have at least two.

Change-Id: I47d49e83b713994d4b01e022df5badcb5d947095
Task-number: QTRD-3431
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/src/charts/axis/verticalaxis.cpp b/src/charts/axis/verticalaxis.cpp
index 294e1a56..ddea15c3 100644
--- a/src/charts/axis/verticalaxis.cpp
+++ b/src/charts/axis/verticalaxis.cpp
@@ -36,14 +36,12 @@ void VerticalAxis::updateGeometry()
 {
     const QVector<qreal> &layout = ChartAxisElement::layout();
 
-    if (layout.isEmpty())
+    if (layout.isEmpty() && axis()->type() != QAbstractAxis::AxisTypeLogValue)
         return;
 
     QStringList labelList = labels();
 
-    QList<QGraphicsItem *> lines = gridItems();
     QList<QGraphicsItem *> labels = labelItems();
-    QList<QGraphicsItem *> shades = shadeItems();
     QList<QGraphicsItem *> arrow = arrowItems();
     QGraphicsTextItem *title = titleItem();
 
@@ -55,7 +53,6 @@ void VerticalAxis::updateGeometry()
 
     qreal height = axisRect.bottom();
 
-
     //arrow
     QGraphicsLineItem *arrowItem = static_cast<QGraphicsLineItem*>(arrow.at(0));
 
@@ -93,6 +90,12 @@ void VerticalAxis::updateGeometry()
         availableSpace -= titleBoundingRect.height();
     }
 
+    if (layout.isEmpty() && axis()->type() == QAbstractAxis::AxisTypeLogValue)
+        return;
+
+    QList<QGraphicsItem *> lines = gridItems();
+    QList<QGraphicsItem *> shades = shadeItems();
+
     for (int i = 0; i < layout.size(); ++i) {
         //items
         QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem *>(lines.at(i));