HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1949:39b74020ad7b

Fix include issues

Jani Honkonen -

r1949:39b74020ad7b

parent child

Context file:

r1949:39b74020ad7b

Collapse all files

demos/chartinteractions/chart.cpp +1 -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$
             **
             ****************************************************************************/
+            #include "chart.h"
             #include <QValueAxis>
             #include <QAbstractAxis>
             #include <cmath>
-            #include <QDebug>
-            #include "chart.h"
             Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series)
                 : QChart(parent, wFlags), m_series(series)
             {
                 m_clicked = false;
             }
             Chart::~Chart()
             {
             }
             void Chart::clickPoint(const QPointF &point)
             {
                 // Find the closes data point
                 m_movingPoint = QPoint();
                 m_clicked = false;
                 foreach (QPointF p, m_series->points()) {
                     if (distance(p, point) < distance(m_movingPoint, point)) {
                         m_movingPoint = p;
                         m_clicked = true;
                     }
                 }
             }
             qreal Chart::distance(const QPointF &p1, const QPointF &p2)
             {
                 return sqrt((p1.x() - p2.x()) * (p1.x() - p2.x())
                             + (p1.y() - p2.y()) * (p1.y() - p2.y()));
             }
             void Chart::setPointClicked(bool clicked)
             {
                m_clicked = clicked;
             }
             void Chart::handlePointMove(const QPoint &point)
             {
                 if (m_clicked) {
                     //Map the point clicked from the ChartView
                     //to the area occupied by the chart.
                     QPoint mappedPoint = point;
                     mappedPoint.setX(point.x()-this->plotArea().x());
                     mappedPoint.setY(point.y()-this->plotArea().y());
                     //Get the x- and y axis to be able to convert the mapped
                     //coordinate point to the charts scale.
                     QAbstractAxis * axisx = this->axisX();
                     QValueAxis* haxis = 0;
                     if (axisx->type() == QAbstractAxis::AxisTypeValue)
                         haxis = qobject_cast<QValueAxis*>(axisx);
                     QAbstractAxis * axisy = this->axisY();
                     QValueAxis* vaxis = 0;
                     if (axisy->type() == QAbstractAxis::AxisTypeValue)
                         vaxis = qobject_cast<QValueAxis*>(axisy);
                     if (haxis && vaxis) {
                         //Calculate the "unit" between points on the x
                         //y axis.
                         double xUnit = this->plotArea().width()/haxis->max();
                         double yUnit = this->plotArea().height()/vaxis->max();
                         //Convert the mappedPoint to the actual chart scale.
                         double x = mappedPoint.x()/xUnit;
                         double y = vaxis->max() - mappedPoint.y()/yUnit;
                         //Replace the old point with the new one.
                         m_series->replace(m_movingPoint, QPointF(x, y));
                         //Update the m_movingPoint so we are able to
                         //do the replace also during mousemoveEvent.
                         m_movingPoint.setX(x);
                         m_movingPoint.setY(y);
                     }
                 }
             }

demos/chartinteractions/chartview.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 <QMouseEvent>
             #include "chartview.h"
+            #include <QMouseEvent>
             #include "chart.h"
             ChartView::ChartView(Chart *chart, QWidget *parent) :
                 QChartView(chart, parent)
             {
                 m_chart = chart;
             }
             void ChartView::mousePressEvent(QMouseEvent *event)
             {
                 m_mousePos = event->pos();
                 QChartView::mousePressEvent(event);
             }
             void ChartView::mouseMoveEvent(QMouseEvent *event)
             {
                 m_chart->handlePointMove(event->pos());
                 QChartView::mouseMoveEvent(event);
             }
             void ChartView::mouseReleaseEvent(QMouseEvent *event)
             {
                 if (event->pos() != m_mousePos) {
                     m_chart->handlePointMove(event->pos());
                     m_chart->setPointClicked(false);
                 }
                 QChartView::mouseReleaseEvent(event);
             }

demos/chartthemes/themewidget.h +4 -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 THEMEWINDOW_H
+            #ifndef THEMEWIDGET_H
-            #define THEMEWINDOW_H
+            #define THEMEWIDGET_H
             #include <QWidget>
             #include <QChartGlobal>
             class QComboBox;
             class QCheckBox;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartView;
             class QChart;
             QTCOMMERCIALCHART_END_NAMESPACE
             typedef QPair<QPointF, QString> Data;
             typedef QList<Data> DataList;
             typedef QList<DataList> DataTable;
             QTCOMMERCIALCHART_USE_NAMESPACE
             class ThemeWidget: public QWidget
             {
                 Q_OBJECT
             public:
                 explicit ThemeWidget(QWidget *parent = 0);
                 ~ThemeWidget();
             private Q_SLOTS:
                 void updateUI();
             private:
                 DataTable generateRandomData(int listCount,int valueMax,int valueCount) const;
                 QComboBox* createThemeBox() const;
                 QComboBox* createAnimationBox() const;
                 QComboBox* createLegendBox() const;
                 void connectSignals();
                 QChart* createAreaChart() const;
                 QChart* createBarChart(int valueCount) const;
                 QChart* createPieChart() const;
                 QChart* createLineChart() const;
                 QChart* createSplineChart() const;
                 QChart* createScatterChart() const;
             private:
                 int m_listCount;
                 int m_valueMax;
                 int m_valueCount;
                 QList<QChartView*> m_charts;
                 DataTable m_dataTable;
                 QComboBox *m_themeComboBox;
                 QCheckBox *m_antialiasCheckBox;
                 QComboBox *m_animatedComboBox;
                 QComboBox *m_legendComboBox;
             };
-            #endif /* THEMEWINDOW_H */
+            #endif /* THEMEWIDGET_H */

examples/barmodelmapper/customtablemodel.h +3 -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 XYPOINTSMODEL_H
+            #ifndef CUSTOMTABLEMODEL_H
-            #define XYPOINTSMODEL_H
+            #define CUSTOMTABLEMODEL_H
             #include <QAbstractTableModel>
             #include <QHash>
             #include <QRect>
             class CustomTableModel : public QAbstractTableModel
             {
                 Q_OBJECT
             public:
                 explicit CustomTableModel(QObject *parent = 0);
                 int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
                 int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
                 QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
                 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
                 bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole );
                 Qt::ItemFlags flags ( const QModelIndex & index ) const;
                 void addMapping(QString color, QRect area);
                 void clearMapping() { m_mapping.clear(); }
             private:
                 QList<QVector<qreal> * > m_data;
                 QHash<QString, QRect> m_mapping;
                 int m_columnCount;
                 int m_rowCount;
             };
-            #endif // XYPOINTSMODEL_H
+            #endif // CUSTOMTABLEMODEL_H

examples/modeldata/customtablemodel.h +3 -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 XYPOINTSMODEL_H
+            #ifndef CUSTOMTABLEMODEL_H
-            #define XYPOINTSMODEL_H
+            #define CUSTOMTABLEMODEL_H
             #include <QAbstractTableModel>
             #include <QHash>
             #include <QRect>
             class CustomTableModel : public QAbstractTableModel
             {
                 Q_OBJECT
             public:
                 explicit CustomTableModel(QObject *parent = 0);
                 int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
                 int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
                 QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
                 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
                 bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole );
                 Qt::ItemFlags flags ( const QModelIndex & index ) const;
                 void addMapping(QString color, QRect area);
                 void clearMapping() { m_mapping.clear(); }
             private:
                 QList<QVector<qreal> * > m_data;
                 QHash<QString, QRect> m_mapping;
                 int m_columnCount;
                 int m_rowCount;
             };
-            #endif // XYPOINTSMODEL_H
+            #endif // CUSTOMTABLEMODEL_H

examples/scatterinteractions/chartview.h +3 -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 MAINWINDOW_H
+            #ifndef CHARTVIEW_H
-            #define MAINWINDOW_H
+            #define CHARTVIEW_H
             #include <QChartGlobal>
             #include <QChartView>
             #include <QScatterSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class ChartView : public QChartView
             {
                 Q_OBJECT
             public:
                 ChartView(QWidget *parent = 0);
                 ~ChartView();
             private Q_SLOTS:
                 void handleClickedPoint(const QPointF& point);
             private:
                 QScatterSeries *m_scatter;
                 QScatterSeries *m_scatter2;
             };
-            #endif // MAINWINDOW_H
+            #endif // CHARTVIEW_H

tests/auto/qabstractaxis/tst_qabstractaxis.h +2 -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$
             **
             ****************************************************************************/
-            #ifndef TST_QABSTRACTSERIES_H
+            #ifndef TST_QABSTRACTAXIS_H
-            #define TST_QABSTRACTSERIES_H
+            #define TST_QABSTRACTAXIS_H
             #include <QtTest/QtTest>
             #include <tst_definitions.h>
             #include <qabstractaxis.h>
             #include <qchartview.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class tst_QAbstractAxis : public QObject
             {
                 Q_OBJECT
             public slots:
                 virtual void initTestCase();
                 virtual void cleanupTestCase();
                 virtual void init(QAbstractAxis* axis,QAbstractSeries* series);
                 virtual void cleanup();
             private slots:
                 void axisPen_data();
                 void axisPen();
                 void axisPenColor_data();
                 void axisPenColor();
                 void gridLinePen_data();
                 void gridLinePen();
                 void lineVisible_data();
                 void lineVisible();
                 void gridLineVisible_data();
                 void gridLineVisible();
                 void visible_data();
                 void visible();
                 void labelsAngle_data();
                 void labelsAngle();
                 void labelsBrush_data();
                 void labelsBrush();
                 void labelsColor_data();
                 void labelsColor();
                 void labelsFont_data();
                 void labelsFont();
                 void labelsPen_data();
                 void labelsPen();
                 void labelsVisible_data();
                 void labelsVisible();
                 void orientation_data();
                 void orientation();
                 void setMax_data();
                 void setMax();
                 void setMin_data();
                 void setMin();
                 void setRange_data();
                 void setRange();
                 void shadesBorderColor_data();
                 void shadesBorderColor();
                 void shadesBrush_data();
                 void shadesBrush();
                 void shadesColor_data();
                 void shadesColor();
                 void shadesPen_data();
                 void shadesPen();
                 void shadesVisible_data();
                 void shadesVisible();
                 void show_data();
                 void show();
                 void hide_data();
                 void hide();
             protected:
                 void qabstractaxis();
             protected:
                 QChartView* m_view;
                 QChart* m_chart;
                 QAbstractAxis* m_axis;
                 QAbstractSeries* m_series;
             };
             #endif

tests/chartdesigner/engine.h +3 -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 ENGINE_H_
+            #ifndef ENGINE_H
-            #define ENGINE_H_
+            #define ENGINE_H
             #include <QObject>
             #include <QAbstractSeries>
             #include <QModelIndex>
             class QStandardItemModel;
             class QItemSelectionModel;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QXYSeries;
             class QAbstractBarSeries;
             class QPieSeries;
             class QAreaSeries;
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Engine : public QObject
             {
                 Q_OBJECT
             public:
                 explicit Engine(QObject *parent = 0);
                ~Engine();
                 int modelCount() { return m_count; }
                 QStandardItemModel *model() const { return m_model; }
                 QItemSelectionModel *selectionModel() const { return m_selection; }
                 QChart* chart() const { return m_chart; }
                 void clearModels();
                 QList<QAbstractSeries*> addSeries(QAbstractSeries::SeriesType type);
                 void removeSeries(QAbstractSeries* series);
                 bool save(const QString &filename) const;
                 bool load(const QString &filename);
             signals:
                 void selected();
             private:
                 void createModels();
                 void setupXYSeries(QXYSeries *xyseries, const QList<int>& columns, int column, int minRow, int maxRow);
                 void setupBarSeries(QAbstractBarSeries *series, const QList<int>& columns, int minRow, int maxRow);
                 void setupPieSeries(QPieSeries *pie, const QList<int>& columns, int minRow, int maxRow);
                 void setupAreaSeries(QAreaSeries *series, const QList<int>& columns, int minRow, int maxRow);
             private:
                 int m_count;
                 QChart *m_chart;
                 QStandardItemModel *m_model;
                 QItemSelectionModel *m_selection;
                 QMap<QAbstractSeries*, QList<QModelIndex> > m_seriesModelIndex;
             };
-            #endif /* ENGINE_H_ */
+            #endif /* ENGINE_H */

tests/wavechart/wavechart.cpp 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$
             **
             ****************************************************************************/
             #include "wavechart.h"
             #include <cmath>
             QTCOMMERCIALCHART_USE_NAMESPACE
             #define PI 3.14159265358979
             static const int numPoints =100;
             WaveChart::WaveChart(QChart* chart, QWidget* parent) :
                 QChartView(chart, parent),
                 m_series(new QLineSeries()),
                 m_wave(0),
                 m_step(2 * PI / numPoints)
             {
                 QPen blue(Qt::blue);
                 blue.setWidth(3);
                 m_series->setPen(blue);
                 chart->legend()->setVisible(false);
                 QTime now = QTime::currentTime();
                 qsrand((uint) now.msec());
                 int fluctuate = 100;
                 for (qreal x = 0; x <= 2 * PI; x += m_step) {
                     m_series->append(x, fabs(sin(x) * fluctuate));
                 }
                 chart->addSeries(m_series);
                 chart->createDefaultAxes();
                 QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(update()));
                 m_timer.setInterval(5000);
                 m_timer.start();
             }
             void WaveChart::update()
             {
                 int fluctuate;
                 const QList<QPointF>& points = m_series->points();
                 for (qreal i = 0, x = 0; x <= 2 * PI; x += m_step, i++) {
                     fluctuate = qrand() % 100;
                     m_series->replace(x,points[i].y(),x,fabs(sin(x) * fluctuate));
                 }
             }

tests/wavechart/wavechart.h +5 0

             /****************************************************************************
             **
             ** 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 WAVECHART_H
+            #define WAVECHART_H
             #include <QTimer>
             #include <QTime>
             #include <QObject>
             #include <QLineSeries>
             #include <QChartView>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class WaveChart: public QChartView
             {
                 Q_OBJECT
             public:
                 WaveChart(QChart* chart, QWidget* parent);
             private slots:
                 void update();
             private:
                 QLineSeries* m_series;
                 int m_wave;
                 qreal m_step;
                 QTimer m_timer;
             };
+            #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