HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2297:bf59b22cf3e9

Bugfix: axis visibily issues...

Michal Klocek -

r2297:bf59b22cf3e9

parent child

Context file:

r2297:bf59b22cf3e9

Collapse all files

src/axis/chartaxis.cpp +22 0

                 QObject::connect(m_axis,SIGNAL(titleFontChanged(const QFont&)),this,SLOT(handleTitleFontChanged(const QFont&)));
                 QObject::connect(m_axis,SIGNAL(titlePenChanged(const QPen&)),this,SLOT(handleTitlePenChanged(const QPen&)));
                 QObject::connect(m_axis,SIGNAL(titleBrushChanged(const QBrush&)),this,SLOT(handleTitleBrushChanged(const QBrush&)));
+                QObject::connect(m_axis,SIGNAL(titleVisibleChanged(bool)),this,SLOT(handleTitleVisibleChanged(bool)));
                 QObject::connect(m_axis->d_ptr.data(),SIGNAL(rangeChanged(qreal,qreal)),this,SLOT(handleRangeChanged(qreal,qreal)));
             }
                 m_shades->setVisible(visible);
             }
+            void ChartAxis::handleTitleVisibleChanged(bool visible)
+            {
+                m_title->setVisible(visible);
+                presenter()->layout()->invalidate();
+            }
             void ChartAxis::handleLabelsAngleChanged(int angle)
             {
                 foreach (QGraphicsItem *item, m_labels->childItems())
             void ChartAxis::handleVisibleChanged(bool visible)
             {
                 setVisible(visible);
+                if(!visible) {
+                    m_grid->setVisible(visible);
+                    m_arrow->setVisible(visible);
+                    m_shades->setVisible(visible);
+                    m_labels->setVisible(visible);
+                    m_title->setVisible(visible);
+                }else {
+                    m_grid->setVisible(m_axis->isGridLineVisible());
+                    m_arrow->setVisible(m_axis->isLineVisible());
+                    m_shades->setVisible(m_axis->shadesVisible());
+                    m_labels->setVisible(m_axis->labelsVisible());
+                    m_title->setVisible(m_axis->isTitleVisible());
+                }
+                presenter()->layout()->invalidate();
             }
             void ChartAxis::handleRangeChanged(qreal min, qreal max)

src/axis/chartaxis_p.h +1 0

                 void handleTitleBrushChanged(const QBrush &brush);
                 void handleTitleFontChanged(const QFont &font);
                 void handleTitleTextChanged(const QString &title);
+                void handleTitleVisibleChanged(bool visible);
                 void handleRangeChanged(qreal min , qreal max);
             Q_SIGNALS:

src/axis/horizontalaxis.cpp +1 -1

                 QFontMetrics fn(titleFont());
                 QSizeF sh;
-                if (titleText().isNull())
+                if (titleText().isNull() || !titleItem()->isVisible())
                     return sh;
                 switch (which) {

src/axis/qabstractaxis.cpp +2 -2

             {
                 if (d_ptr->m_titleVisible != visible) {
                     d_ptr->m_titleVisible = visible;
-                    emit labelsVisibleChanged(visible);
+                    emit titleVisibleChanged(visible);
                 }
             }
-            bool QAbstractAxis::titleVisible() const
+            bool QAbstractAxis::isTitleVisible() const
             {
                 return d_ptr->m_titleVisible;
             }

src/axis/qabstractaxis.h +3 -3

                 Q_PROPERTY(QString titleText READ titleText WRITE setTitleText NOTIFY titleTextChanged)
                 Q_PROPERTY(QPen titlePen READ titlePen WRITE setTitlePen NOTIFY titlePenChanged)
                 Q_PROPERTY(QBrush titleBrush READ titleBrush WRITE setTitleBrush NOTIFY titleBrushChanged)
-                Q_PROPERTY(bool titleVisible READ titleVisible WRITE setTitleVisible)
+                Q_PROPERTY(bool titleVisible READ isTitleVisible WRITE setTitleVisible NOTIFY titleVisibleChanged)
-                Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)
+                Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont NOTIFY titleFontChanged)
                 //orientation
                 Q_PROPERTY(Qt::Orientation orinetation READ orientation)
                 //aligment
                 QColor labelsColor() const;
                 //title handling
-                bool titleVisible() const;
+                bool isTitleVisible() const;
                 void setTitleVisible(bool visible = true);
                 void setTitlePen(const QPen &pen);
                 QPen titlePen() const;

src/axis/verticalaxis.cpp +1 -1

                 QFontMetrics fn(titleFont());
                 QSizeF sh;
-                if (titleText().isNull())
+                if (titleText().isNull() || !titleItem()->isVisible())
                     return sh;
                 switch (which) {

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages