HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1919:91b94c58701c

fix some Cppcheck findings

Jani Honkonen -

r1919:91b94c58701c

parent child

Context file:

r1919:91b94c58701c

Collapse all files

examples/scrollchart/chartview.h 0 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef CHARTVIEW_H
             #define CHARTVIEW_H
             #include <QChartView>
             #include <QRubberBand>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class ChartView : public QChartView
             {
             public:
                 ChartView(QChart *chart, QWidget *parent = 0);
             protected:
                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void mouseReleaseEvent(QMouseEvent *event);
                 void keyPressEvent(QKeyEvent *event);
             private:
                 bool m_isScrolling;
-                bool m_isRubberBandShown;
                 QRubberBand m_rubberBand;
                 QPoint m_origin;
             };
             #endif

src/chartdataset_p.h 0 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTDATASET_P_H
             #define CHARTDATASET_P_H
             #include "qabstractseries.h"
             #include "domain_p.h"
             #include "qabstractaxis_p.h"
             #include <QVector>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAbstractAxis;
             class QTCOMMERCIALCHART_AUTOTEST_EXPORT ChartDataSet : public QObject
             {
                 Q_OBJECT
             public:
                 ChartDataSet(QChart* parent=0);
                 virtual ~ChartDataSet();
                 void addSeries(QAbstractSeries* series);
                 void removeSeries(QAbstractSeries* series);
                 void removeAllSeries();
                 void updateSeries(QAbstractSeries* series);
                 void zoomInDomain(const QRectF& rect, const QSizeF& size);
                 void zoomOutDomain(const QRectF& rect, const QSizeF& size);
                 void scrollDomain(qreal dx,qreal dy,const QSizeF& size);
                 int seriesCount(QAbstractSeries::SeriesType type);
                 int seriesIndex(QAbstractSeries *series);
                 QAbstractAxis* axisX(QAbstractSeries *series) const;
                 QAbstractAxis* axisY(QAbstractSeries *series) const;
                 void setAxis(QAbstractSeries *series, QAbstractAxis *axis, Qt::Orientation orientation);
                 QList<QAbstractSeries*> series() const;
                 Domain* domain(QAbstractSeries *series) const;
                 void removeAxis(QAbstractAxis* axis);
                 void createDefaultAxes();
             Q_SIGNALS:
                 void seriesAdded(QAbstractSeries* series, Domain* domain);
                 void seriesRemoved(QAbstractSeries* series);
                 void seriesUpdated(QAbstractSeries* series);
                 void axisAdded(QAbstractAxis* axis,Domain* domain);
                 void axisRemoved(QAbstractAxis* axis);
             private:
                 void calculateDomain(QAbstractSeries* series,Domain* domain);
                 void createAxes(QAbstractAxis::AxisTypes type,Qt::Orientation orientation);
                 QAbstractAxis* createAxis(QAbstractAxis::AxisType type,Qt::Orientation orientation);
                 void initializeAxis(QAbstractAxis* axis,QAbstractSeries* series);
                 void removeAxes(QAbstractSeries* series);
                 void blockAxisSignals(bool enabled);
                 void createSeriesIndex(QAbstractSeries* series);
                 void removeSeriesIndex(QAbstractSeries* series);
             private:
                 QMap<QAbstractSeries*, QAbstractAxis*> m_seriesAxisXMap;
                 QMap<QAbstractSeries*, QAbstractAxis*> m_seriesAxisYMap;
                 QMap<QAbstractSeries*, Domain*> m_seriesDomainMap;
                 QMap<int, QAbstractSeries*> m_indexSeriesMap;
-                int m_domainIndex;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* CHARTENGINE_P_H_ */

src/charttheme.cpp +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "charttheme_p.h"
             #include "qchart.h"
             #include "qchart_p.h"
             #include "qchartview.h"
             #include "qlegend.h"
             #include "qabstractaxis.h"
             #include <QTime>
             //series
             #include "qbarset.h"
             #include "qabstractbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qlineseries.h"
             #include "qareaseries.h"
             #include "qscatterseries.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "qpieslice_p.h"
             #include "qsplineseries.h"
             //items
             #include "chartaxis_p.h"
             #include "abstractbarchartitem_p.h"
             #include "stackedbarchartitem_p.h"
             #include "percentbarchartitem_p.h"
             #include "linechartitem_p.h"
             #include "areachartitem_p.h"
             #include "scatterchartitem_p.h"
             #include "piechartitem_p.h"
             #include "splinechartitem_p.h"
             //themes
             #include "chartthemesystem_p.h"
             #include "chartthemelight_p.h"
             #include "chartthemebluecerulean_p.h"
             #include "chartthemedark_p.h"
             #include "chartthemebrownsand_p.h"
             #include "chartthemebluencs_p.h"
             #include "chartthemehighcontrast_p.h"
             #include "chartthemeblueicy_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartTheme::ChartTheme(QChart::ChartTheme id) :
+                m_id(id),
                 m_masterFont(QFont("arial", 14)),
                 m_labelFont(QFont("arial", 10)),
                 m_labelBrush(QColor(QRgb(0x000000))),
                 m_axisLinePen(QPen(QRgb(0x000000))),
                 m_backgroundShadesPen(Qt::NoPen),
                 m_backgroundShadesBrush(Qt::NoBrush),
                 m_backgroundShades(BackgroundShadesNone),
                 m_backgroundDropShadowEnabled(false),
                 m_gridLinePen(QPen(QRgb(0x000000))),
                 m_force(false)
             {
-                m_id = id;
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
             }
             ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme)
             {
                 switch(theme) {
                 case QChart::ChartThemeLight:
                     return new ChartThemeLight();
                 case QChart::ChartThemeBlueCerulean:
                     return new ChartThemeBlueCerulean();
                 case QChart::ChartThemeDark:
                     return new ChartThemeDark();
                 case QChart::ChartThemeBrownSand:
                     return new ChartThemeBrownSand();
                 case QChart::ChartThemeBlueNcs:
                     return new ChartThemeBlueNcs();
                 case QChart::ChartThemeHighContrast:
                     return new ChartThemeHighContrast();
                 case QChart::ChartThemeBlueIcy:
                     return new ChartThemeBlueIcy();
                 default:
                     return new ChartThemeSystem();
                 }
             }
             void ChartTheme::decorate(QChart *chart)
             {
                 QBrush brush;
                 if(m_force || brush == chart->backgroundBrush())
                     chart->setBackgroundBrush(m_chartBackgroundGradient);
                 chart->setTitleFont(m_masterFont);
                 chart->setTitleBrush(m_labelBrush);
                 chart->setDropShadowEnabled(m_backgroundDropShadowEnabled);
             }
             void ChartTheme::decorate(QLegend *legend)
             {
                 QPen pen;
                 QBrush brush;
                 QFont font;
                 if (m_force || pen == legend->pen())
                     legend->setPen(m_axisLinePen);
                 if (m_force || brush == legend->brush())
                     legend->setBrush(m_chartBackgroundGradient);
                 if (m_force || font == legend->font())
                     legend->setFont(m_labelFont);
                 if (m_force || brush == legend->labelBrush())
                     legend->setLabelBrush(m_labelBrush);
             }
             void ChartTheme::decorate(QAreaSeries *series, int index)
             {
                 QPen pen;
                 QBrush brush;
                 if (m_force || pen == series->pen()){
                     pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
                 if (m_force || brush == series->brush()) {
                     QBrush brush(m_seriesColors.at(index % m_seriesColors.size()));
                     series->setBrush(brush);
                 }
             }
             void ChartTheme::decorate(QLineSeries *series,int index)
             {
                 QPen pen;
                 if(m_force || pen == series->pen()){
                     pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
             }
             void ChartTheme::decorate(QAbstractBarSeries *series, int index)
             {
                 QBrush brush;
                 QPen pen;
                 QList<QBarSet *> sets = series->barSets();
                 qreal takeAtPos = 0.5;
                 qreal step = 0.2;
                 if (sets.count() > 1 ) {
                     step = 1.0 / (qreal) sets.count();
                     if (sets.count() % m_seriesGradients.count())
                         step *= m_seriesGradients.count();
                     else
                         step *= (m_seriesGradients.count() - 1);
                 }
                 for (int i(0); i < sets.count(); i++) {
                     int colorIndex = (index + i) % m_seriesGradients.count();
                     if (i > 0 && i % m_seriesGradients.count() == 0) {
                         // There is no dedicated base color for each sets, generate more colors
                         takeAtPos += step;
                         if (takeAtPos == 1.0)
                             takeAtPos += step;
                         takeAtPos -= (int) takeAtPos;
                     }
                     if (m_force || brush == sets.at(i)->brush())
                         sets.at(i)->setBrush(colorAt(m_seriesGradients.at(colorIndex), takeAtPos));
                     // Pick label color from the opposite end of the gradient.
                     // 0.3 as a boundary seems to work well.
                     if (m_force || brush == sets.at(i)->labelBrush()) {
                         if (takeAtPos < 0.3)
                             sets.at(i)->setLabelBrush(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1));
                         else
                             sets.at(i)->setLabelBrush(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0));
                     }
                     if (m_force || pen == sets.at(i)->pen()) {
                         QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);
                         sets.at(i)->setPen(c);
                     }
                 }
             }
             void ChartTheme::decorate(QScatterSeries *series, int index)
             {
                 QPen pen;
                 QBrush brush;
                 if (m_force || pen == series->pen()) {
                     pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
                 if (m_force || brush == series->brush()) {
                     QBrush brush(m_seriesColors.at(index % m_seriesColors.size()));
                     series->setBrush(brush);
                 }
             }
             void ChartTheme::decorate(QPieSeries *series, int index)
             {
                 for (int i(0); i < series->slices().count(); i++) {
                     QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);
                     // Get color for a slice from a gradient linearly, beginning from the start of the gradient
                     qreal pos = (qreal) (i + 1) / (qreal) series->count();
                     QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     QPieSlice *s = series->slices().at(i);
                     QPieSlicePrivate *d = QPieSlicePrivate::fromSlice(s);
                     if (m_force || d->m_data.m_slicePen.isThemed())
                         d->setPen(penColor, true);
                     if (m_force || d->m_data.m_sliceBrush.isThemed())
                         d->setBrush(brushColor, true);
                     if (m_force || d->m_data.m_labelBrush.isThemed())
                         d->setLabelBrush(m_labelBrush.color(), true);
                     if (m_force || d->m_data.m_labelFont.isThemed())
                         d->setLabelFont(m_labelFont, true);
                 }
             }
             void ChartTheme::decorate(QSplineSeries *series, int index)
             {
                 QPen pen;
                 if(m_force || pen == series->pen()){
                     pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
             }
             void ChartTheme::decorate(QAbstractAxis *axis)
             {
                 QPen pen;
                 QBrush brush;
                 QFont font;
                 bool axisX = axis->orientation()== Qt::Horizontal;
                 if (axis->isLineVisible()) {
                     if(m_force || brush == axis->labelsBrush()){
                         axis->setLabelsBrush(m_labelBrush);
                     }
                     if(m_force || pen == axis->labelsPen()){
                         axis->setLabelsPen(Qt::NoPen); // NoPen for performance reasons
                     }
                     if (m_force || axis->shadesVisible()) {
                         if(m_force || brush == axis->shadesBrush()){
                             axis->setShadesBrush(m_backgroundShadesBrush);
                         }
                         if(m_force || pen == axis->shadesPen()){
                             axis->setShadesPen(m_backgroundShadesPen);
                         }
                         if( m_force && (m_backgroundShades == BackgroundShadesBoth
                                         || (m_backgroundShades == BackgroundShadesVertical && axisX)
                                         || (m_backgroundShades == BackgroundShadesHorizontal && !axisX))){
                             axis->setShadesVisible(true);
                         }
                     }
                     if(m_force || pen == axis->linePen()){
                         axis->setLinePen(m_axisLinePen);
                     }
                     if(m_force || pen == axis->gridLinePen()){
                         axis->setGridLinePen(m_gridLinePen);
                     }
                     if(m_force || font == axis->labelsFont()){
                         axis->setLabelsFont(m_labelFont);
                     }
                 }
             }
             void ChartTheme::generateSeriesGradients()
             {
                 // Generate gradients in HSV color space
                 foreach (const QColor& color, m_seriesColors) {
                     QLinearGradient g;
                     qreal h = color.hsvHueF();
                     qreal s = color.hsvSaturationF();
                     // TODO: tune the algorithm to give nice results with most base colors defined in
                     // most themes. The rest of the gradients we can define manually in theme specific
                     // implementation.
                     QColor start = color;
                     start.setHsvF(h, 0.0, 1.0);
                     g.setColorAt(0.0, start);
                     g.setColorAt(0.5, color);
                     QColor end = color;
                     end.setHsvF(h, s, 0.25);
                     g.setColorAt(1.0, end);
                     m_seriesGradients << g;
                 }
             }
             QColor ChartTheme::colorAt(const QColor &start, const QColor &end, qreal pos)
             {
                 Q_ASSERT(pos >= 0.0 && pos <= 1.0);
                 qreal r = start.redF() + ((end.redF() - start.redF()) * pos);
                 qreal g = start.greenF() + ((end.greenF() - start.greenF()) * pos);
                 qreal b = start.blueF() + ((end.blueF() - start.blueF()) * pos);
                 QColor c;
                 c.setRgbF(r, g, b);
                 return c;
             }
             QColor ChartTheme::colorAt(const QGradient &gradient, qreal pos)
             {
                 Q_ASSERT(pos >= 0 && pos <= 1.0);
                 QGradientStops stops = gradient.stops();
                 int count = stops.count();
                 // find previous stop relative to position
                 QGradientStop prev = stops.first();
                 for (int i = 0; i < count; i++) {
                     QGradientStop stop = stops.at(i);
                     if (pos > stop.first)
                         prev = stop;
                     // given position is actually a stop position?
                     if (pos == stop.first) {
                         //qDebug() << "stop color" << pos;
                         return stop.second;
                     }
                 }
                 // find next stop relative to position
                 QGradientStop next = stops.last();
                 for (int i = count - 1; i >= 0; i--) {
                     QGradientStop stop = stops.at(i);
                     if (pos < stop.first)
                         next = stop;
                 }
                 //qDebug() << "prev" << prev.first << "pos" << pos << "next" << next.first;
                 qreal range = next.first - prev.first;
                 qreal posDelta = pos - prev.first;
                 qreal relativePos = posDelta / range;
                 //qDebug() << "range" << range << "posDelta" << posDelta << "relativePos" << relativePos;
                 return colorAt(prev.second, next.second, relativePos);
             }
             void ChartTheme::setForced(bool enabled)
             {
                 m_force = enabled;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/legendlayout_p.h 0 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef LEGENDLAYOUT_H_
             #define LEGENDLAYOUT_H_
             #include <QGraphicsLayout>
             #include "qchartglobal.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLegend;
             class LegendLayout : public QGraphicsLayout
             {
             public:
                 LegendLayout(QLegend* legend);
                 virtual ~LegendLayout();
                 void setGeometry(const QRectF& rect);
                 void setOffset(qreal x, qreal y);
                 QPointF offset() const;
             protected:
                 QSizeF sizeHint ( Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
                 int count() const { return 0; }
                 QGraphicsLayoutItem* itemAt(int) const { return 0; };
                 void removeAt(int){};
             private:
                 void setAttachedGeometry(const QRectF& rect);
                 void setDettachedGeometry(const QRectF& rect);
             private:
                 QLegend* m_legend;
-                int m_marginBig;
-                int m_marginSmall;
-                int m_marginTiny;
                 qreal m_offsetX;
                 qreal m_offsetY;
                 qreal m_minOffsetX;
                 qreal m_minOffsetY;
                 qreal m_maxOffsetX;
                 qreal m_maxOffsetY;
                 qreal m_width;
                 qreal m_height;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

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