HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1729:7809dd5f66eb

Refactor Visibly methods of axis...

Michal Klocek -

r1729:7809dd5f66eb

parent child

Context file:

r1729:7809dd5f66eb

Collapse all files

src/axis/categoriesaxis/chartcategoriesaxisx.cpp +1 -1

                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 Q_ASSERT(labels.size() == ticksList.size());
                 Q_ASSERT(layout.size() == ticksList.size());

src/axis/categoriesaxis/chartcategoriesaxisy.cpp +1 -1

                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 Q_ASSERT(labels.size() == ticksList.size());
                 Q_ASSERT(layout.size() == ticksList.size());

src/axis/chartaxis.cpp +47 -48

                 m_grid(new QGraphicsItemGroup(presenter->rootItem())),
                 m_shades(new QGraphicsItemGroup(presenter->rootItem())),
                 m_labels(new QGraphicsItemGroup(presenter->rootItem())),
-                m_axis(new QGraphicsItemGroup(presenter->rootItem())),
+                m_arrow(new QGraphicsItemGroup(presenter->rootItem())),
                 m_min(0),
                 m_max(0),
                 m_animation(0),
                 m_minHeight(0)
             {
                 //initial initialization
-                m_axis->setZValue(ChartPresenter::AxisZValue);
+                m_arrow->setZValue(ChartPresenter::AxisZValue);
-                m_axis->setHandlesChildEvents(false);
+                m_arrow->setHandlesChildEvents(false);
                 m_shades->setZValue(ChartPresenter::ShadesZValue);
                 m_grid->setZValue(ChartPresenter::GridZValue);
             void ChartAxis::createItems(int count)
             {
-                if (m_axis->children().size() == 0)
+                if (m_arrow->children().size() == 0)
-                m_axis->addToGroup(new AxisItem(this));
+                m_arrow->addToGroup(new AxisItem(this));
                 for (int i = 0; i < count; ++i) {
                     m_grid->addToGroup(new QGraphicsLineItem());
                     m_labels->addToGroup(new QGraphicsSimpleTextItem());
-                    m_axis->addToGroup(new QGraphicsLineItem());
+                    m_arrow->addToGroup(new QGraphicsLineItem());
                     if ((m_grid->childItems().size())%2 && m_grid->childItems().size()>2) m_shades->addToGroup(new QGraphicsRectItem());
                 }
             }
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 for (int i = 0; i < count; ++i) {
                     if (lines.size()%2 && lines.size() > 1) delete(shades.takeLast());
                 }
             }
-            void ChartAxis::setAxisOpacity(qreal opacity)
+            void ChartAxis::setArrowOpacity(qreal opacity)
             {
-                m_axis->setOpacity(opacity);
+                m_arrow->setOpacity(opacity);
             }
-            qreal ChartAxis::axisOpacity() const
+            qreal ChartAxis::arrowOpacity() const
             {
-                return m_axis->opacity();
+                return m_arrow->opacity();
+            }
+            void ChartAxis::setArrowVisibility(bool visible)
+            {
+                m_arrow->setOpacity(visible);
             }
             void ChartAxis::setGridOpacity(qreal opacity)
                 return m_grid->opacity();
             }
+            void ChartAxis::setGridVisibility(bool visible)
+            {
+                m_grid->setOpacity(visible);
+            }
             void ChartAxis::setLabelsOpacity(qreal opacity)
             {
                 m_labels->setOpacity(opacity);
                 return m_labels->opacity();
             }
+            void ChartAxis::setLabelsVisibility(bool visible)
+            {
+                m_labels->setOpacity(visible);
+            }
             void ChartAxis::setShadesOpacity(qreal opacity)
             {
                 m_shades->setOpacity(opacity);
                 return m_shades->opacity();
             }
+            void ChartAxis::setShadesVisibility(bool visible)
+            {
+                m_shades->setVisible(visible);
+            }
             void ChartAxis::setLabelsAngle(int angle)
             {
                 foreach(QGraphicsItem* item , m_labels->childItems()) {
                 }
             }
-            void ChartAxis::setAxisPen(const QPen &pen)
+            void ChartAxis::setArrowPen(const QPen &pen)
             {
-                foreach(QGraphicsItem* item , m_axis->childItems()) {
+                foreach(QGraphicsItem* item , m_arrow->childItems()) {
                        static_cast<QGraphicsLineItem*>(item)->setPen(pen);
                 }
             }
             {
                 if(isEmpty()) return;
-                if (!m_chartAxis->isVisible()) {
-                    setAxisOpacity(0);
-                    setGridOpacity(0);
-                    setLabelsOpacity(0);
-                    setShadesOpacity(0);
-                else {
-                    if (m_chartAxis->isArrowVisible()) {
-                        setAxisOpacity(100);
-                    else {
-                        setAxisOpacity(0);
-                    if (m_chartAxis->isGridLineVisible()) {
+                bool visible = m_chartAxis->isVisible();
-                        setGridOpacity(100);
-                    else {
-                        setGridOpacity(0);
-                    if (m_chartAxis->labelsVisible()) {
-                        setLabelsOpacity(100);
-                    else {
-                        setLabelsOpacity(0);
-                    if (m_chartAxis->shadesVisible()) {
+                setArrowVisibility(visible && m_chartAxis->isArrowVisible());
-                        setShadesOpacity(100);
+                setGridVisibility(visible && m_chartAxis->isGridLineVisible());
+                setLabelsVisibility(visible && m_chartAxis->labelsVisible());
-                    else {
+                setShadesVisibility(visible && m_chartAxis->shadesVisible());
-                        setShadesOpacity(0);
                 setLabelsAngle(m_chartAxis->labelsAngle());
-                setAxisPen(m_chartAxis->axisPen());
+                setArrowPen(m_chartAxis->axisPen());
                 setLabelsPen(m_chartAxis->labelsPen());
                 setLabelsBrush(m_chartAxis->labelsBrush());
                 setLabelsFont(m_chartAxis->labelsFont());
             }
+            void ChartAxis::hide()
+            {
+                setArrowVisibility(false);
+                setGridVisibility(false);
+                setLabelsVisibility(false);
+                setShadesVisibility(false);
+            }
             void ChartAxis::handleGeometryChanged(const QRectF &rect)
             {
                 if(m_rect != rect)

src/axis/chartaxis_p.h +10 -4

                 virtual AxisType axisType() const = 0;
-                void setAxisOpacity(qreal opacity);
+                void setArrowOpacity(qreal opacity);
-                qreal axisOpacity() const;
+                qreal arrowOpacity() const;
+                void setArrowVisibility(bool visible);
                 void setGridOpacity(qreal opacity);
                 qreal gridOpacity() const;
+                void setGridVisibility(bool visible);
                 void setLabelsOpacity(qreal opacity);
                 qreal labelsOpacity() const;
+                void setLabelsVisibility(bool visible);
                 void setShadesOpacity(qreal opacity);
                 qreal shadesOpacity() const;
+                void setShadesVisibility(bool visible);
                 void setLabelsAngle(int angle);
                 int labelsAngle()const { return m_labelsAngle; }
                 void setShadesBrush(const QBrush &brush);
                 void setShadesPen(const QPen &pen);
-                void setAxisPen(const QPen &pen);
+                void setArrowPen(const QPen &pen);
                 void setGridPen(const QPen &pen);
                 void setLabelsPen(const QPen &pen);
                 qreal minimumWidth();
                 qreal minimumHeight();
+                void hide();
             protected:
                 virtual void updateGeometry() = 0;
                 virtual QVector<qreal> calculateLayout() const = 0;
                 QScopedPointer<QGraphicsItemGroup> m_grid;
                 QScopedPointer<QGraphicsItemGroup> m_shades;
                 QScopedPointer<QGraphicsItemGroup> m_labels;
-                QScopedPointer<QGraphicsItemGroup> m_axis;
+                QScopedPointer<QGraphicsItemGroup> m_arrow;
                 QVector<qreal> m_layoutVector;
                 qreal m_min;
                 qreal m_max;

src/axis/datetimeaxis/chartdatetimeaxisx.cpp +1 -1

                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 Q_ASSERT(labels.size() == ticksList.size());
                 Q_ASSERT(layout.size() == ticksList.size());

src/axis/datetimeaxis/chartdatetimeaxisy.cpp +1 -1

                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 Q_ASSERT(labels.size() == ticksList.size());
                 Q_ASSERT(layout.size() == ticksList.size());

src/axis/intervalsaxis/chartintervalsaxisx.cpp +1 -1

                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 //    Q_ASSERT(labels.size() == ticksList.size());
                 //    Q_ASSERT(layout.size() == ticksList.size());

src/axis/intervalsaxis/chartintervalsaxisy.cpp +1 -1

                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 //    Q_ASSERT(labels.size() == ticksList.size());
                 //    Q_ASSERT(layout.size() == ticksList.size());

src/axis/valuesaxis/chartvaluesaxisx.cpp +1 -1

                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 Q_ASSERT(labels.size() == ticksList.size());
                 Q_ASSERT(layout.size() == ticksList.size());

src/axis/valuesaxis/chartvaluesaxisy.cpp +1 -1

                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QList<QGraphicsItem *> shades = m_shades->childItems();
-                QList<QGraphicsItem *> axis = m_axis->childItems();
+                QList<QGraphicsItem *> axis = m_arrow->childItems();
                 Q_ASSERT(labels.size() == ticksList.size());
                 Q_ASSERT(layout.size() == ticksList.size());

src/chartdataset.cpp +2 -1

                 QAbstractAxis *oldAxis = seriesAxisMap->take(series);
                 QList<QAbstractAxis*> axes = seriesAxisMap->values();
                 if(oldAxis) {
                     if(axes.indexOf(oldAxis)==-1) {
                         emit axisRemoved(oldAxis);
+                        oldAxis->disconnect();
+                        QObject::disconnect(domain,0,oldAxis,0);
                         oldAxis->d_ptr->m_dataset=0;
                         oldAxis->deleteLater();
                     }

src/chartpresenter.cpp +3 0

                 Q_ASSERT(item);
                 selectVisibleAxis();
                 if(m_animator) m_animator->removeAnimation(item);
+                item->hide();
+                item->disconnect();
+                QObject::disconnect(this,0,item,0);
                 item->deleteLater();
             }

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