HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r761:e53014bd1799

Internal review: fixed minor issues in Area and XySeries

Tero Ahola -

r761:e53014bd1799

parent child

Context file:

r761:e53014bd1799

Collapse all files

src/areachart/areachartitem.cpp +7 -8

             //TODO: optimize : remove points which are not visible
-            AreaChartItem::AreaChartItem(QAreaSeries *areaSeries,ChartPresenter *presenter) : ChartItem(presenter),
+            AreaChartItem::AreaChartItem(QAreaSeries *areaSeries, ChartPresenter *presenter)
+                : ChartItem(presenter),
                 m_series(areaSeries),
                 m_upper(0),
                 m_lower(0),
             {
                 setZValue(ChartPresenter::LineChartZValue);
                 m_upper = new AreaBoundItem(this,m_series->upperSeries());
-                if (m_series->lowerSeries()) {
+                if (m_series->lowerSeries())
                     m_lower = new AreaBoundItem(this,m_series->lowerSeries());
                 connect(areaSeries,SIGNAL(updated()),this,SLOT(handleUpdated()));
                 connect(this,SIGNAL(clicked(const QPointF&)),areaSeries,SIGNAL(clicked(const QPointF&)));
             {
                 delete m_upper;
                 delete m_lower;
-            };
             QRectF AreaChartItem::boundingRect() const
             {
                 }
                 path.closeSubpath();
                 prepareGeometryChange();
-                m_path=path;
+                m_path = path;
-                m_rect=path.boundingRect();
+                m_rect = path.boundingRect();
                 update();
             }
                 m_linePen = m_series->pen();
                 m_brush = m_series->brush();
                 m_pointPen = m_series->pen();
-                m_pointPen.setWidthF(2*m_pointPen.width());
+                m_pointPen.setWidthF(2 * m_pointPen.width());
                 update();
             }
                 if (m_lower)
                     m_lower->handleGeometryChanged(rect);
             }
-            //painter
             void AreaChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {

src/areachart/areachartitem_p.h +2 -3

                 Q_OBJECT
             public:
                 AreaChartItem(QAreaSeries *areaSeries, ChartPresenter *presenter);
-                ~ AreaChartItem();
+                ~AreaChartItem();
                 //from QGraphicsItem
                 QRectF boundingRect() const;
             {
             public:
                 AreaBoundItem(AreaChartItem *item,QLineSeries *lineSeries) : LineChartItem(lineSeries, 0), m_item(item) {}
-                ~AreaBoundItem(){}
+                ~AreaBoundItem() {}
                 void setLayout(QVector<QPointF> &points) {
                     LineChartItem::setLayout(points);
             private:
                 AreaChartItem* m_item;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/areachart/qareaseries.cpp +7 -5

                 upperSeries line and \a lowerSeries line.  If no \a lowerSeries is passed to constructor, area is specified by axis x (y=0) instead.
                 When series object is added to QChartView or QChart instance ownerships is transfered.
             */
-            QAreaSeries::QAreaSeries(QLineSeries* upperSeries,QLineSeries* lowerSeries):QSeries(upperSeries),
+            QAreaSeries::QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries)
-            m_upperSeries(upperSeries),
+                : QSeries(upperSeries),
-            m_lowerSeries(lowerSeries),
+                m_upperSeries(upperSeries),
-            m_pointsVisible(false)
+                m_lowerSeries(lowerSeries),
+                m_pointsVisible(false)
             {
             }
             /*!
                 Destroys the object. Series added to QChartView or QChart instances are owned by those,
                 and are deleted when mentioned object are destroyed.
             /*!
                 Sets \a pen used for drawing area outline.
             */
-            void QAreaSeries::setPen(const QPen& pen)
+            void QAreaSeries::setPen(const QPen &pen)
             {
                 if (m_pen != pen) {
                     m_pen = pen;

src/xychart/qxyseries.h +9 -9

             {
                 Q_OBJECT
             protected:
-                QXYSeries(QObject *parent=0);
+                QXYSeries(QObject *parent = 0);
                 virtual ~QXYSeries();
             public:
                 void setPen(const QPen &pen);
                 QPen pen() const {return m_pen;}
-                void setBrush(const QBrush &pen);
+                void setBrush(const QBrush &brush);
                 QBrush brush() const {return m_brush;}
                 bool setModel(QAbstractItemModel *model);
-                QAbstractItemModel* model() {return m_model;}
+                QAbstractItemModel* model() { return m_model; }
                 virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
                 virtual void setModelMappingShift(int first, int count = 0);
-                private slots:
+            private slots:
-                    void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
+                void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
-                    void modelDataAboutToBeAdded(QModelIndex parent, int start, int end);
+                void modelDataAboutToBeAdded(QModelIndex parent, int start, int end);
-                    void modelDataAdded(QModelIndex parent, int start, int end);
+                void modelDataAdded(QModelIndex parent, int start, int end);
-                    void modelDataAboutToBeRemoved(QModelIndex parent, int start, int end);
+                void modelDataAboutToBeRemoved(QModelIndex parent, int start, int end);
-                    void modelDataRemoved(QModelIndex parent, int start, int end);
+                void modelDataRemoved(QModelIndex parent, int start, int end);
             signals:
                 void clicked(const QPointF &point);

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