HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r759:ea8e9f62638e

minor code review fixes

sauimone -

r759:ea8e9f62638e

parent child

Context file:

r759:ea8e9f62638e

Collapse all files

src/axis/axisitem.cpp +21 -22

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            Axis::Axis(QChartAxis* axis,ChartPresenter* presenter,AxisType type) : Chart(presenter),
+            Axis::Axis(QChartAxis *axis,ChartPresenter *presenter,AxisType type) : Chart(presenter),
                 m_chartAxis(axis),
                 m_type(type),
                 m_labelsAngle(0),
             void Axis::createItems(int count)
             {
-                if (m_axis.children().size()==0)
+                if (m_axis.children().size() == 0)
                     m_axis.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());
-                    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());
                    }
             }
                 }
             }
-            void Axis::updateLayout(QVector<qreal>& layout)
+            void Axis::updateLayout(QVector<qreal> &layout)
             {
                 if (animator()) {
                     animator()->updateLayout(this,layout);
                 }
             }
-            bool Axis::createLabels(QStringList& labels,qreal min, qreal max,int ticks) const
+            bool Axis::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
             {
                 Q_ASSERT(max>=min);
                 Q_ASSERT(ticks>1);
                 if (!category) {
                     int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
-                    for(int i=0; i< ticks; i++) {
+                    for (int i=0; i< ticks; i++) {
                         qreal value = min + (i * (max - min)/ (ticks-1));
                         labels << QString::number(value,'f',n);
                     }
                 return points;
             }
-            void Axis::setLayout(QVector<qreal>& layout)
+            void Axis::setLayout(QVector<qreal> &layout)
             {
             	int diff = m_layoutVector.size() - layout.size();
                 if (diff>0) {
             		deleteItems(diff);
+                } else if (diff<0) {
-            	else if(diff<0) {
             		createItems(-diff);
             	}
-            	if(diff!=0) handleAxisUpdated();
+                if( diff!=0) handleAxisUpdated();
             	QStringList ticksList;
             				QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
             				lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
             				QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-            				if(!categories){
+                            if (!categories) {
             				    labelItem->setText(ticksList.at(i));
             				    QPointF center = labelItem->boundingRect().center();
             				    labelItem->setTransformOriginPoint(center.x(), center.y());
             				    labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);
-            				}else if(i>0){
+                            } else if(i>0) {
             				    labelItem->setText(ticksList.at(i));
             				    QPointF center = labelItem->boundingRect().center();
             				    labelItem->setTransformOriginPoint(center.x(), center.y());
             				    labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
             				}
-            				if((i+1)%2 && i>1) {
+                            if ((i+1)%2 && i>1) {
             					QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
             					rectItem->setRect(layout[i-1],m_rect.top(),layout[i]-layout[i-1],m_rect.height());
             				}
             				lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
             				QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-            				if(!categories){
+                            if (!categories) {
             				    labelItem->setText(ticksList.at(i));
             				    QPointF center = labelItem->boundingRect().center();
             				    labelItem->setTransformOriginPoint(center.x(), center.y());
             				    labelItem->setPos(m_rect.left() - labelItem->boundingRect().width() - label_padding , layout[i]-center.y());
-            				} else if(i>0){
+                            } else if (i>0) {
             				    labelItem->setText(ticksList.at(i));
             				    QPointF center = labelItem->boundingRect().center();
             				    labelItem->setTransformOriginPoint(center.x(), center.y());
             				    labelItem->setPos(m_rect.left() - labelItem->boundingRect().width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y());
             				}
-            				if((i+1)%2 && i>1) {
+                            if ((i+1)%2 && i>1) {
             					QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
             					rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);
             				}
             		}
             		break;
             		default:
-            		qDebug()<<"Unknown axis type";
+                    qDebug()<<"Unknown axis type";
             		break;
             	}
             void Axis::handleAxisCategoriesUpdated()
             {
-            	if(isEmpty()) return;
+                if (isEmpty()) return;
             	updateLayout(m_layoutVector);
             }
                     setAxisOpacity(0);
                 }
-                if(m_chartAxis->isGridLineVisible()) {
+                if (m_chartAxis->isGridLineVisible()) {
                     setGridOpacity(100);
                 } else {
                     setGridOpacity(0);
                 }
-                if(m_chartAxis->labelsVisible()) {
+                if (m_chartAxis->labelsVisible()) {
                     setLabelsOpacity(100);
                 } else {
                     setLabelsOpacity(0);
             void Axis::handleRangeChanged(qreal min, qreal max,int tickCount)
             {
-                if(min==max || tickCount<2) return;
+                if (min==max || tickCount<2) return;
                 m_min = min;
                 m_max = max;
             }
-            void Axis::handleGeometryChanged(const QRectF& rect)
+            void Axis::handleGeometryChanged(const QRectF &rect)
             {
                 m_rect = rect;
                 if (isEmpty()) return;

src/axis/qchartaxis.cpp +69 -71

                 QChatView or QChart when axis added.
             */
-            QChartAxis::QChartAxis(QObject* parent):QObject(parent),
+            QChartAxis::QChartAxis(QObject *parent) : QObject(parent),
-            m_axisVisible(true),
+                m_axisVisible(true),
-            m_gridLineVisible(true),
+                m_gridLineVisible(true),
-            m_labelsVisible(true),
+                m_labelsVisible(true),
-            m_labelsAngle(0),
+                m_labelsAngle(0),
-            m_shadesVisible(false),
+                m_shadesVisible(false),
-            m_shadesOpacity(1.0),
+                m_shadesOpacity(1.0),
-            m_min(0),
+                m_min(0),
-            m_max(0),
+                m_max(0),
-            m_ticksCount(5),
+                m_ticksCount(5),
-            m_niceNumbers(false)
+                m_niceNumbers(false)
             {
             }
             /*!
               Sets \a pen used to draw axis line and ticks.
              */
-            void QChartAxis::setAxisPen(const QPen& pen)
+            void QChartAxis::setAxisPen(const QPen &pen)
             {
             	if (pen != m_axisPen) {
-                m_axisPen=pen;
+                    m_axisPen = pen;
-                emit updated();
+                    emit updated();
             	}
             }
              */
             void QChartAxis::setAxisVisible(bool visible)
             {
-            	if (m_axisVisible!=visible) {
+                if (m_axisVisible != visible) {
-                m_axisVisible=visible;
+                    m_axisVisible = visible;
-                emit updated();
+                    emit updated();
             	}
             }
              */
             void QChartAxis::setGridLineVisible(bool visible)
             {
-            	if (m_gridLineVisible!=visible) {
+                if (m_gridLineVisible != visible) {
-                m_gridLineVisible=visible;
+                    m_gridLineVisible = visible;
-                emit updated();
+                    emit updated();
             	}
             }
             /*!
               Sets \a pen used to draw grid line.
              */
-            void QChartAxis::setGridLinePen(const QPen& pen)
+            void QChartAxis::setGridLinePen(const QPen &pen)
             {
-            	if (m_gridLinePen!=pen) {
+                if (m_gridLinePen != pen) {
-                m_gridLinePen=pen;
+                    m_gridLinePen = pen;
-                emit updated();
+                    emit updated();
             	}
             }
              */
             void QChartAxis::setLabelsVisible(bool visible)
             {
-            	if(m_labelsVisible!=visible) {
+                if (m_labelsVisible != visible) {
-                m_labelsVisible=visible;
+                    m_labelsVisible = visible;
-                emit updated();
+                    emit updated();
             	}
             }
             /*!
               Sets \a pen used to draw labels.
              */
-            void QChartAxis::setLabelsPen(const QPen& pen)
+            void QChartAxis::setLabelsPen(const QPen &pen)
             {
-            	if(m_labelsPen!=pen) {
+                if (m_labelsPen != pen) {
-                m_labelsPen=pen;
+                    m_labelsPen = pen;
-                emit updated();
+                    emit updated();
             	}
             }
             /*!
               Sets \a brush used to draw labels.
              */
-            void QChartAxis::setLabelsBrush(const QBrush& brush)
+            void QChartAxis::setLabelsBrush(const QBrush &brush)
             {
-            	if(m_labelsBrush!=brush) {
+                if (m_labelsBrush != brush) {
-                m_labelsBrush=brush;
+                    m_labelsBrush = brush;
-                emit updated();
+                    emit updated();
             	}
             }
             /*!
               Sets \a font used to draw labels.
              */
-            void QChartAxis::setLabelsFont(const QFont& font)
+            void QChartAxis::setLabelsFont(const QFont &font)
             {
-            	if(m_labelsFont!=font) {
+                if (m_labelsFont != font) {
-                m_labelsFont=font;
+                    m_labelsFont = font;
-                emit updated();
+                    emit updated();
             	}
             }
              */
             void QChartAxis::setLabelsAngle(int angle)
             {
-            	if(m_labelsAngle!=angle) {
+                if (m_labelsAngle != angle) {
-            	m_labelsAngle=angle;
+                    m_labelsAngle = angle;
-            	emit updated();
+                    emit updated();
             	}
             }
              */
             void QChartAxis::setShadesVisible(bool visible)
             {
-            	if(m_shadesVisible!=visible) {
+                if (m_shadesVisible != visible) {
-                m_shadesVisible=visible;
+                    m_shadesVisible = visible;
-                emit updated();
+                    emit updated();
             	}
             }
             /*!
               Sets \a pen used to draw shades.
              */
-            void QChartAxis::setShadesPen(const QPen& pen)
+            void QChartAxis::setShadesPen(const QPen &pen)
             {
-            	if(m_shadesPen!=pen) {
+                if (m_shadesPen != pen) {
-            	m_shadesPen=pen;
+                    m_shadesPen = pen;
-            	emit updated();
+                    emit updated();
             	}
             }
             /*!
               Sets \a brush used to draw shades.
              */
-            void QChartAxis::setShadesBrush(const QBrush& brush)
+            void QChartAxis::setShadesBrush(const QBrush &brush)
             {
-            	if(m_shadesBrush!=brush) {
+                if (m_shadesBrush != brush) {
-                m_shadesBrush=brush;
+                    m_shadesBrush = brush;
-                emit updated();
+                    emit updated();
             	}
             }
              */
             void QChartAxis::setShadesOpacity(qreal opacity)
             {
-            	if(m_shadesOpacity!=opacity) {
+                if (m_shadesOpacity != opacity) {
                 m_shadesOpacity=opacity;
                 emit updated();
             	}
              */
             void QChartAxis::setRange(qreal min, qreal max)
             {
             	bool changed = false;
-                if(m_min!=min) {
+                if (m_min != min) {
-                    m_min=min;
+                    m_min = min;
-                    changed=true;
+                    changed = true;
                     emit minChanged(min);
                 }
-                if(m_max!=max) {
+                if (m_max != max) {
-                    m_max=max;
+                    m_max = max;
-                    changed=true;
+                    changed = true;
                     emit maxChanged(max);
                 }
-                if(changed) {
+                if (changed) {
                     emit rangeChanged(m_min,m_max);
                     emit this->changed(m_min, m_max, m_ticksCount, m_niceNumbers);
                 }
              */
             void QChartAxis::setTicksCount(int count)
             {
-            	if(m_ticksCount!=count) {
+                if (m_ticksCount != count) {
-            		m_ticksCount=count;
+                    m_ticksCount = count;
             		emit ticksCountChanged(count);
             		emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
             	}
              */
             void QChartAxis::hide()
             {
-                m_axisVisible=false;
+                m_axisVisible = false;
-                m_gridLineVisible=false;
+                m_gridLineVisible = false;
-                m_labelsVisible=false;
+                m_labelsVisible = false;
-                m_shadesVisible=false;
+                m_shadesVisible = false;
                 emit updated();
             }
             void QChartAxis::setNiceNumbers(bool enabled)
             {
-                if(m_niceNumbers!=enabled){
+                if (m_niceNumbers != enabled){
-                    m_niceNumbers=enabled;
+                    m_niceNumbers = enabled;
                     emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
                 }
             }

src/axis/qchartaxiscategories.cpp +2 -2

                 // TODO Auto-generated destructor stub
             }
-            void QChartAxisCategories::insert(const QBarCategories& categories)
+            void QChartAxisCategories::insert(const QBarCategories &categories)
             {
                 int i=1;
-                foreach(QString string , categories){
+                foreach (QString string , categories) {
                     m_map.insert(i,string);
                     i++;
                 }

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