HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r745:477bbc361e58

more minor code review fixes

sauimone -

r745:477bbc361e58

parent child

Context file:

r745:477bbc361e58

Collapse all files

src/axis/axisitem.cpp +47 -53

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            Axis::Axis(QChartAxis* axis,ChartPresenter* presenter,AxisType type) :
+            Axis::Axis(QChartAxis* axis,ChartPresenter* presenter,AxisType type) : Chart(presenter),
-            Chart(presenter),
+                m_chartAxis(axis),
-            m_chartAxis(axis),
+                m_type(type),
-            m_type(type),
+                m_labelsAngle(0),
-            m_labelsAngle(0),
+                m_grid(presenter->rootItem()),
-            m_grid(presenter->rootItem()),
+                m_shades(presenter->rootItem()),
-            m_shades(presenter->rootItem()),
+                m_labels(presenter->rootItem()),
-            m_labels(presenter->rootItem()),
+                m_axis(presenter->rootItem()),
-            m_axis(presenter->rootItem()),
+                m_min(0),
-            m_min(0),
+                m_max(0),
-            m_max(0),
+                m_ticksCount(0)
-            m_ticksCount(0)
             {
                 //initial initialization
                 m_axis.setZValue(ChartPresenter::AxisZValue);
                 m_shades.setZValue(ChartPresenter::ShadesZValue);
                 m_grid.setZValue(ChartPresenter::GridZValue);
-                QObject::connect(m_chartAxis,SIGNAL(updated()),this,SLOT(handleAxisUpdated()));
+                connect(m_chartAxis,SIGNAL(updated()),this,SLOT(handleAxisUpdated()));
-                QObject::connect(m_chartAxis->categories(),SIGNAL(updated()),this,SLOT(handleAxisCategoriesUpdated()));
+                connect(m_chartAxis->categories(),SIGNAL(updated()),this,SLOT(handleAxisCategoriesUpdated()));
                 handleAxisUpdated();
             }
             void Axis::createItems(int count)
             {
-                if(m_axis.children().size()==0)
+                if (m_axis.children().size()==0)
-                       m_axis.addToGroup(new AxisItem(this));
+                    m_axis.addToGroup(new AxisItem(this));
                 for (int i = 0; i < count; ++i) {
-                       m_grid.addToGroup(new QGraphicsLineItem());
+                    m_grid.addToGroup(new QGraphicsLineItem());
-                       m_labels.addToGroup(new QGraphicsSimpleTextItem());
+                    m_labels.addToGroup(new QGraphicsSimpleTextItem());
-                       m_axis.addToGroup(new QGraphicsLineItem());
+                    m_axis.addToGroup(new QGraphicsLineItem());
-                      if((m_grid.childItems().size())%2 && m_grid.childItems().size()>2) m_shades.addToGroup(new QGraphicsRectItem());
+                    if((m_grid.childItems().size())%2 && m_grid.childItems().size()>2) m_shades.addToGroup(new QGraphicsRectItem());
                    }
             }
                 QList<QGraphicsItem *> axis = m_axis.childItems();
                 for (int i = 0; i < count; ++i) {
-                    if(lines.size()%2 && lines.size()>1) delete(shades.takeLast());
+                    if (lines.size()%2 && lines.size() > 1) delete(shades.takeLast());
                     delete(lines.takeLast());
                     delete(labels.takeLast());
                     delete(axis.takeLast());
             void Axis::updateLayout(QVector<qreal>& layout)
             {
-                if(animator()){
+                if (animator()) {
-                   animator()->updateLayout(this,layout);
+                    animator()->updateLayout(this,layout);
+                } else {
+                    setLayout(layout);
                 }
-                else setLayout(layout);
             }
             bool Axis::createLabels(QStringList& labels,qreal min, qreal max,int ticks) const
                 bool category = categories->count()>0;
-                if(!category) {
+                if (!category) {
                     int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
                     for(int i=0; i< ticks; i++) {
                         qreal value = min + (i * (max - min)/ (ticks-1));
                         labels << QString::number(value,'f',n);
                     }
+                } else {
-                else {
                     QList<qreal> values = categories->values();
-                    for(int i=0; i< ticks; i++) {
+                    for (int i=0; i< ticks; i++) {
                         qreal value = (min + (i * (max - min)/ (ticks-1)));
                         int j=0;
-                        for(; j<values.count(); j++){
+                        for (; j<values.count(); j++) {
                             if (values.at(j) > value) break;
                         }
-                        if(j!=0) value=values.at(j-1);
+                        if (j!=0) value=values.at(j-1);
                         QString label = categories->label(value);
                         labels << label;
                 m_labelsAngle=angle;
             }
-            void Axis::setLabelsPen(const QPen& pen)
+            void Axis::setLabelsPen(const QPen &pen)
             {
                 foreach(QGraphicsItem* item , m_labels.childItems()) {
                     static_cast<QGraphicsSimpleTextItem*>(item)->setPen(pen);
                 }
             }
-            void Axis::setLabelsBrush(const QBrush& brush)
+            void Axis::setLabelsBrush(const QBrush &brush)
             {
                 foreach(QGraphicsItem* item , m_labels.childItems()) {
                     static_cast<QGraphicsSimpleTextItem*>(item)->setBrush(brush);
                 }
             }
-            void Axis::setLabelsFont(const QFont& font)
+            void Axis::setLabelsFont(const QFont &font)
             {
                 foreach(QGraphicsItem* item , m_labels.childItems()) {
                     static_cast<QGraphicsSimpleTextItem*>(item)->setFont(font);
                 }
             }
-            void Axis::setShadesBrush(const QBrush& brush)
+            void Axis::setShadesBrush(const QBrush &brush)
             {
                 foreach(QGraphicsItem* item , m_shades.childItems()) {
                     static_cast<QGraphicsRectItem*>(item)->setBrush(brush);
                 }
             }
-            void Axis::setShadesPen(const QPen& pen)
+            void Axis::setShadesPen(const QPen &pen)
             {
                 foreach(QGraphicsItem* item , m_shades.childItems()) {
                     static_cast<QGraphicsRectItem*>(item)->setPen(pen);
                 }
             }
-            void Axis::setAxisPen(const QPen& pen)
+            void Axis::setAxisPen(const QPen &pen)
             {
                 foreach(QGraphicsItem* item , m_axis.childItems()) {
                        static_cast<QGraphicsLineItem*>(item)->setPen(pen);
                 }
             }
-            void Axis::setGridPen(const QPen& pen)
+            void Axis::setGridPen(const QPen &pen)
             {
                 foreach(QGraphicsItem* item , m_grid.childItems()) {
                     static_cast<QGraphicsLineItem*>(item)->setPen(pen);
             {
             	int diff = m_layoutVector.size() - layout.size();
-            	if(diff>0) {
+                if (diff>0) {
             		deleteItems(diff);
             	}
             	else if(diff<0) {
             void Axis::handleAxisUpdated()
             {
-                if(isEmpty()) return;
+                if (isEmpty()) return;
-                if(m_chartAxis->isAxisVisible()) {
+                if (m_chartAxis->isAxisVisible()) {
                     setAxisOpacity(100);
+                } else {
-                else {
                     setAxisOpacity(0);
                 }
                 if(m_chartAxis->isGridLineVisible()) {
                     setGridOpacity(100);
+                } else {
-                else {
                     setGridOpacity(0);
                 }
-                if(m_chartAxis->labelsVisible())
+                if(m_chartAxis->labelsVisible()) {
                     setLabelsOpacity(100);
+                } else {
-                else {
                     setLabelsOpacity(0);
                 }
-                if(m_chartAxis->shadesVisible()) {
+                if (m_chartAxis->shadesVisible()) {
                     setShadesOpacity(m_chartAxis->shadesOpacity());
+                } else {
-                else {
                     setShadesOpacity(0);
                 }
                 m_max = max;
                 m_ticksCount= tickCount;
-                if(isEmpty()) return;
+                if (isEmpty()) return;
                 QVector<qreal> layout = calculateLayout();
                 updateLayout(layout);
             void Axis::handleGeometryChanged(const QRectF& rect)
             {
                 m_rect = rect;
-                if(isEmpty()) return;
+                if (isEmpty()) return;
                 QVector<qreal> layout = calculateLayout();
                 updateLayout(layout);
             }

src/axis/axisitem_p.h +13 -13

             public:
                 enum AxisType{X_AXIS,Y_AXIS};
-                Axis(QChartAxis* axis,ChartPresenter* presenter,AxisType type = X_AXIS);
+                Axis(QChartAxis *axis, ChartPresenter *presenter, AxisType type = X_AXIS);
                 ~Axis();
                 AxisType axisType() const {return m_type;};
                 void setLabelsAngle(int angle);
                 int labelsAngle()const { return m_labelsAngle; }
-                void setShadesBrush(const QBrush& brush);
+                void setShadesBrush(const QBrush &brush);
-                void setShadesPen(const QPen& pen);
+                void setShadesPen(const QPen &pen);
-                void setAxisPen(const QPen& pen);
+                void setAxisPen(const QPen &pen);
-                void setGridPen(const QPen& pen);
+                void setGridPen(const QPen &pen);
-                void setLabelsPen(const QPen& pen);
+                void setLabelsPen(const QPen &pen);
-                void setLabelsBrush(const QBrush& brush);
+                void setLabelsBrush(const QBrush &brush);
-                void setLabelsFont(const QFont& font);
+                void setLabelsFont(const QFont &font);
                 inline QRectF geometry() const { return m_rect; }
                 inline QVector<qreal> layout() { return m_layoutVector;};
                 void handleAxisUpdated();
                 void handleAxisCategoriesUpdated();
                 void handleRangeChanged(qreal min , qreal max,int tickCount);
-                void handleGeometryChanged(const QRectF& size);
+                void handleGeometryChanged(const QRectF &size);
             private:
                 void deleteItems(int count);
                 QVector<qreal> calculateLayout() const;
-                void updateLayout(QVector<qreal>& layout);
+                void updateLayout(QVector<qreal> &layout);
-                void setLayout(QVector<qreal>& layout);
+                void setLayout(QVector<qreal> &layout);
-                bool createLabels(QStringList& labels,qreal min, qreal max,int ticks) const;
+                bool createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
                 void axisSelected();
             private:
             {
             public:
-                AxisItem(Axis* axis,QGraphicsItem* parent=0):QGraphicsLineItem(parent),m_axis(axis){};
+                AxisItem(Axis *axis, QGraphicsItem *parent=0) : QGraphicsLineItem(parent), m_axis(axis) {};
             protected:
                void mousePressEvent(QGraphicsSceneMouseEvent *event)

src/axis/qchartaxis.h +8 -8

             	Q_OBJECT
             public:
-                QChartAxis(QObject* parent =0);
+                QChartAxis(QObject *parent =0);
                 ~QChartAxis();
                 //axis handling
                 bool isAxisVisible() const { return m_axisVisible;};
                 void setAxisVisible(bool visible);
-                void setAxisPen(const QPen& pen);
+                void setAxisPen(const QPen &pen);
                 QPen axisPen() const { return m_axisPen;};
                 //grid handling
                 bool isGridLineVisible() const { return m_gridLineVisible;};
                 void setGridLineVisible(bool visible);
-                void setGridLinePen(const QPen& pen);
+                void setGridLinePen(const QPen &pen);
                 QPen gridLinePen() const {return m_gridLinePen;}
                 //labels handling
                 bool labelsVisible() const { return m_labelsVisible;};
                 void setLabelsVisible(bool visible);
-                void setLabelsPen(const QPen& pen);
+                void setLabelsPen(const QPen &pen);
                 QPen labelsPen() const { return m_labelsPen;}
-                void setLabelsBrush(const QBrush& brush);
+                void setLabelsBrush(const QBrush &brush);
                 QBrush labelsBrush() const { return m_labelsBrush;}
-                void setLabelsFont(const QFont& font);
+                void setLabelsFont(const QFont &font);
                 QFont labelsFont() const { return m_labelsFont;}
                 void setLabelsAngle(int angle);
                 int labelsAngle() const { return m_labelsAngle;};
                 //shades handling
                 bool shadesVisible() const { return m_shadesVisible;};
                 void setShadesVisible(bool visible);
-                void setShadesPen(const QPen& pen);
+                void setShadesPen(const QPen &pen);
                 QPen shadesPen() const { return m_shadesPen;}
-                void setShadesBrush(const QBrush& brush);
+                void setShadesBrush(const QBrush &brush);
                 QBrush shadesBrush() const { return m_shadesBrush;}
                 void setShadesOpacity(qreal opacity);
                 qreal shadesOpacity() const { return m_shadesOpacity;}

src/axis/qchartaxiscategories.h +1 -1

             public:
                 ~QChartAxisCategories();
-                void insert(const QBarCategories& category);
+                void insert(const QBarCategories &category);
                 void insert(qreal value,QString label);
                 void remove(qreal value);
                 QList<qreal> values() const;

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