HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2749:197a8f828a1f

Update license headers...

Titta Heikkala -

r2749:197a8f828a1f

parent child

Context file:

r2749:197a8f828a1f

Collapse all files

plugins/designer/qchartsplugin.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qchartsplugin.h"
             #include <QtCharts/QChartView>
             #include <QtCore/QtPlugin>
             QT_CHARTS_USE_NAMESPACE
             QChartsPlugin::QChartsPlugin(QObject *parent) :
                 QObject(parent)
             {
             }
             QChartsPlugin::~QChartsPlugin()
             {
             }
             QString QChartsPlugin::name() const
             {
                 return QStringLiteral("QtCharts::QChartView");
             }
             QString QChartsPlugin::includeFile() const
             {
             #ifdef linux
                 QString myNewLine = QStringLiteral("\n");
             #endif
             #ifdef WIN32
                 QString myNewLine = QStringLiteral("\n\r");
             #endif
             #ifdef __APPLE__
                 QString myNewLine = QStringLiteral("\n");
             #endif
                 return QStringLiteral("<QtCharts/QChartView>") + myNewLine
                         + QStringLiteral("#include <chartsnamespace.h>");
             }
             QString QChartsPlugin::group() const
             {
                 return tr("Qt Charts Widgets");
             }
             QIcon QChartsPlugin::icon() const
             {
                 return QIcon(QStringLiteral(":/images/qcharts.png"));
             }
             QString QChartsPlugin::toolTip() const
             {
                 return tr("A Qt Charts view widget");
             }
             QString QChartsPlugin::whatsThis() const
             {
                 return tr("This widget is presents QChartView widget");
             }
             bool QChartsPlugin::isContainer() const
             {
                 return false;
             }
             QWidget *QChartsPlugin::createWidget(QWidget *parent)
             {
                 return new QChartView(new QChart(), parent);
             }
             QString QChartsPlugin::domXml() const
             {
                 return QStringLiteral("\
                 <ui language=\"c++\">\
                     <widget class=\"QtCharts::QChartView\" name=\"chartview\">\
                         <property name=\"geometry\">\
                             <rect>\
                                 <x>0</x>\
                                 <y>0</y>\
                                 <width>200</width>\
                                 <height>200</height>\
                             </rect>\
                         </property>\
                     </widget>\
                 </ui>");
             }

plugins/designer/qchartsplugin.h +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QCHARTSPLUGIN_H
             #define QCHARTSPLUGIN_H
             #include <QtDesigner/QDesignerCustomWidgetInterface>
             class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface
             {
                 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
                 Q_OBJECT
                 Q_INTERFACES(QDesignerCustomWidgetInterface)
             public:
                 QChartsPlugin(QObject *parent = 0);
                 ~QChartsPlugin();
                 QString name() const;
                 QString includeFile() const;
                 QString group() const;
                 QIcon icon() const;
                 QString toolTip() const;
                 QString whatsThis() const;
                 bool isContainer() const;
                 QWidget *createWidget(QWidget *parent);
                 QString domXml() const;
             };
             #endif /* QCHARTSPLUGIN_H */

tests/manual/chartdesigner/brushwidget.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "brushwidget.h"
             BrushWidget::BrushWidget(QWidget *parent):QWidget(parent)
             {
             }
             BrushWidget::~BrushWidget()
             {
             }

tests/manual/chartdesigner/brushwidget.h +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef BRUSHWIDGET_H
             #define BRUSHWIDGET_H
             #include <QtWidgets/QWidget>
             class BrushWidget: public QWidget
             {
             public:
                 explicit BrushWidget(QWidget *parent = 0);
                 ~BrushWidget();
                 QBrush brush() const { return m_brush; }
                 void setBrush(const QBrush &brush);
             private:
                 QBrush m_brush;
             };
             #endif /* BRUSHWIDGET_H */

tests/manual/chartdesigner/engine.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-             ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-             ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-             ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-             ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-             ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-             ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-             ** 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
+            ** contact form at http://qt.io
-             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "engine.h"
             #include <QtCore/QItemSelectionModel>
             #include <QtGui/QStandardItemModel>
             #include <QtCharts/QVXYModelMapper>
             #include <QtCharts/QHBarModelMapper>
             #include <QtCharts/QVPieModelMapper>
             #include <QtCharts/QLineSeries>
             #include <QtCharts/QSplineSeries>
             #include <QtCharts/QScatterSeries>
             #include <QtCharts/QBarSeries>
             #include <QtCharts/QPercentBarSeries>
             #include <QtCharts/QStackedBarSeries>
             #include <QtCharts/QAreaSeries>
             #include <QtCharts/QPieSeries>
             #include <QtCharts/QChart>
             #include <QtCharts/QBarSet>
             const qint32 MAGIC_NUMBER = 0x66666666;
             Engine::Engine(QObject* parent) :
                 QObject(parent), m_count(10), m_chart(new QChart()), m_model(0), m_selection(0)
             {
                 createModels();
             }
             Engine::~Engine()
             {
                 delete m_chart;
                 delete m_selection;
                 delete m_model;
             }
             void Engine::createModels()
             {
                 m_model = new QStandardItemModel(m_count, m_count);
                 m_model->setHorizontalHeaderLabels(
                     QStringList() << "A" << "B" << "C" << "D" << "E" << "F" << "G" << "H" << "I" << "J");
                 m_model->setVerticalHeaderLabels(
                     QStringList() << "1" << "2" << "3" << "4" << "5" << "6" << "7" << "8" << "9" << "10");
                 m_selection = new QItemSelectionModel(m_model);
             }
             QList<QAbstractSeries*> Engine::addSeries(QAbstractSeries::SeriesType type)
             {
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 QMap<int, QModelIndex> columns;
                 foreach (const QModelIndex& index, list) {
                     columns.insertMulti(index.column(), index);
                 }
                 QList<int> keys = columns.uniqueKeys();
                 QModelIndexList rows = columns.values(keys.first());
                 int minRow = m_count + 1;
                 int maxRow = -1;
                 foreach (const QModelIndex& index, rows) {
                     minRow = qMin(index.row(), minRow);
                     maxRow = qMax(index.row(), maxRow);
                 }
                 QList<QAbstractSeries*> result;
                 QColor color;
                 switch (type) {
                 case QAbstractSeries::SeriesTypeLine:
                 {
                     for (int i = 1; i < keys.count(); ++i) {
                         QLineSeries *line = new QLineSeries();
                         setupXYSeries(line, keys, i, minRow, maxRow);
                         result << line;
                     }
                     break;
                 }
                 case QAbstractSeries::SeriesTypeSpline:
                 {
                     for (int i = 1; i < keys.count(); ++i) {
                         QSplineSeries *line = new QSplineSeries();
                         setupXYSeries(line, keys, i, minRow, maxRow);
                         result << line;
                     }
                     break;
                 }
                 case QAbstractSeries::SeriesTypeScatter:
                 {
                     for (int i = 1; i < keys.count(); ++i) {
                         QScatterSeries *line = new QScatterSeries();
                         setupXYSeries(line, keys, i, minRow, maxRow);
                         result << line;
                     }
                     break;
                 }
                 case QAbstractSeries::SeriesTypeBar:
                 {
                     QBarSeries *bar = new QBarSeries();
                     setupBarSeries(bar,keys,minRow,maxRow);
                     result << bar;
                     break;
                 }
                 case QAbstractSeries::SeriesTypePercentBar:
                 {
                     QPercentBarSeries *bar = new QPercentBarSeries();
                     setupBarSeries(bar,keys,minRow,maxRow);
                     result << bar;
                     break;
                 }
                 case QAbstractSeries::SeriesTypeStackedBar:
                 {
                     QStackedBarSeries *bar = new QStackedBarSeries();
                     setupBarSeries(bar,keys,minRow,maxRow);
                     result << bar;
                     break;
                 }
                 case QAbstractSeries::SeriesTypePie:
                 {
                     QPieSeries *pie = new QPieSeries();
                     setupPieSeries(pie,keys,minRow,maxRow);
                     result << pie;
                     break;
                 }
                 case QAbstractSeries::SeriesTypeArea:
                 {
                      QAreaSeries *area = new QAreaSeries( new QLineSeries(), new QLineSeries());
                      setupAreaSeries(area,keys,minRow,maxRow);
                      result << area;
                      break;
                 }
                 }
                 m_chart->createDefaultAxes();
                 return result;
             }
             void Engine::removeSeries(QAbstractSeries* series)
             {
                 m_chart->removeSeries(series);
                 foreach (const QModelIndex& index, m_seriesModelIndex.value(series)) {
                     m_model->setData(index, QColor(Qt::white), Qt::BackgroundRole);
                 }
             }
             void Engine::clearModels()
             {
                 delete m_selection;
                 m_selection = 0;
                 delete m_model;
                 m_model = 0;
                 createModels();
             }
             bool Engine::save(const QString &filename) const
             {
                 if (filename.isEmpty())
                     return false;
                 QFile file(filename);
                 if (!file.open(QIODevice::WriteOnly)) {
                     return false;
                 }
                 QDataStream out(&file);
                 out << MAGIC_NUMBER;
                 out.setVersion(QDataStream::Qt_4_8);
                 out << m_model->rowCount();
                 out << m_model->columnCount();
                 for (int row = 0; row < m_model->rowCount(); ++row) {
                     for (int column = 0; column < m_model->columnCount(); ++column) {
                         QStandardItem *item = m_model->item(row, column);
                         if (item) {
                                 out << row;
                                 out << column;
                                 out << item->data(Qt::EditRole).toString();
                         }
                     }
                 }
                 return true;
             }
             bool Engine::load(const QString &filename)
             {
                 clearModels();
                 if (filename.isEmpty())
                     return false;
                 QFile file(filename);
                 if (!file.open(QIODevice::ReadOnly)) {
                     return false;
                 }
                 QDataStream in(&file);
                 qint32 magicNumber;
                 in >> magicNumber;
                 if (magicNumber != MAGIC_NUMBER)
                     return false;
                 in.setVersion(QDataStream::Qt_4_8);
                 int rowCount;
                 in >> rowCount;
                 int columnCount;
                 in >> columnCount;
                 while (!in.atEnd()) {
                     int row;
                     int column;
                     QString value;
                     in >> row >> column >> value;
                     QStandardItem *item = new QStandardItem();
                     bool ok;
                     double result = value.toDouble(&ok);
                     if(ok)
                         item->setData(result, Qt::EditRole);
                     else
                         item->setData(value, Qt::EditRole);
                     m_model->setItem(row, column, item);
                 }
                 return true;
             }
             void Engine::setupXYSeries(QXYSeries *xyseries, const QList<int>& columns, int column, int minRow, int maxRow)
             {
                 QVXYModelMapper* mapper = new QVXYModelMapper(xyseries);
                 mapper->setSeries(xyseries);
                 mapper->setModel(m_model);
                 mapper->setXColumn(columns.first());
                 mapper->setYColumn(columns.at(column));
                 mapper->setFirstRow(minRow);
                 mapper->setRowCount(maxRow - minRow + 1);
                 m_chart->addSeries(xyseries);
                 xyseries->setName(QString("Series %1").arg(m_chart->series().count()));
                 QObject::connect(xyseries,SIGNAL(clicked(QPointF)),this,SIGNAL(selected()));
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 QModelIndexList result;
                 foreach (const QModelIndex& index, list) {
                     if (index.column() ==columns.at(column)){
                         m_model->setData(index, xyseries->pen().color(), Qt::BackgroundRole);
                         result << index;
                     }
                 }
                 m_seriesModelIndex.insert(xyseries,result);
             }
             void Engine::setupBarSeries(QAbstractBarSeries *bar, const QList<int>& columns, int minRow, int maxRow)
             {
                 QHBarModelMapper* mapper = new QHBarModelMapper(bar);
                 mapper->setSeries(bar);
                 mapper->setModel(m_model);
                 mapper->setFirstColumn(minRow);
                 mapper->setColumnCount(maxRow - minRow + 1);
                 mapper->setFirstBarSetRow(columns.at(1));
                 mapper->setLastBarSetRow(columns.last());
                 m_chart->addSeries(bar);
                 bar->setName(QString("Series %1").arg(m_chart->series().count()));
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 foreach (const QModelIndex& index, list) {
                     if (index.column() >= columns.at(1) && index.column()<= columns.last()) {
                         //m_model->setData(index, bar->barSets().at(index.column())->brush().color(), Qt::BackgroundRole);
                     }
                 }
             }
             void Engine::setupPieSeries(QPieSeries *pie, const QList<int>& columns, int minRow, int maxRow)
             {
                 QVPieModelMapper* mapper = new QVPieModelMapper(pie);
                 mapper->setSeries(pie);
                 mapper->setModel(m_model);
                 mapper->setValuesColumn(columns.at(1));
                 mapper->setLabelsColumn(columns.first());
                 mapper->setFirstRow(minRow);
                 mapper->setRowCount(maxRow - minRow + 1);
                 m_chart->addSeries(pie);
                 pie->setName(QString("Series %1").arg(m_chart->series().count()));
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 foreach (const QModelIndex& index, list) {
                    // m_model->setData(index, bar->barSets()pen().color(), Qt::BackgroundRole);
                 }
             }
             void Engine::setupAreaSeries(QAreaSeries *series, const QList<int>& columns, int minRow, int maxRow)
             {
                 QVXYModelMapper* umapper = new QVXYModelMapper(series);
                 umapper->setSeries(series->upperSeries());
                 umapper->setModel(m_model);
                 umapper->setXColumn(columns.first());
                 umapper->setYColumn(columns.at(1));
                 umapper->setFirstRow(minRow);
                 umapper->setRowCount(maxRow - minRow + 1);
                 QVXYModelMapper* lmapper = new QVXYModelMapper(series);
                 lmapper->setSeries(series->lowerSeries());
                 lmapper->setModel(m_model);
                 lmapper->setXColumn(columns.first());
                 lmapper->setYColumn(columns.at(2));
                 lmapper->setFirstRow(minRow);
                 lmapper->setRowCount(maxRow - minRow + 1);
                 m_chart->addSeries(series);
                 series->setName(QString("Series %1").arg(m_chart->series().count()));
                 const QModelIndexList& list = m_selection->selectedIndexes();
                 foreach (const QModelIndex& index, list) {
                     //if (index.column() ==columns.at(column))
                       //  m_model->setData(index, xyseries->pen().color(), Qt::BackgroundRole);
                 }
             }

tests/manual/chartdesigner/engine.h +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-             ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-             ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-             ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-             ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-             ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-             ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-             ** 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
+            ** contact form at http://qt.io
-             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef ENGINE_H
             #define ENGINE_H
             #include <QtCore/QObject>
             #include <QtCharts/QAbstractSeries>
             #include <QtCore/QModelIndex>
             class QStandardItemModel;
             class QItemSelectionModel;
             QT_CHARTS_BEGIN_NAMESPACE
             class QChart;
             class QXYSeries;
             class QAbstractBarSeries;
             class QPieSeries;
             class QAreaSeries;
             QT_CHARTS_END_NAMESPACE
             QT_CHARTS_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 */

tests/manual/chartdesigner/main.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "mainwindow.h"
             #include <QtWidgets/QApplication>
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 MainWindow window;
                 window.resize(1000,600);
                 window.show();
                 return a.exec();
             }

tests/manual/chartdesigner/mainwindow.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-             ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-             ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-             ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-             ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-             ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-             ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-             ** 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
+            ** contact form at http://qt.io
-             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "mainwindow.h"
             #include "objectinspectorwidget.h"
             #include "penwidget.h"
             #include "brushwidget.h"
             #include "engine.h"
             #include <QtCore/QSettings>
             #include <QtCharts/QChartView>
             #include <QtWidgets/QDockWidget>
             #include <QtWidgets/QMenuBar>
             #include <QtWidgets/QTableWidget>
             #include <QtWidgets/QSplitter>
             #include <QtCore/QMetaEnum>
             #include <QtGui/QStandardItemModel>
             #include <QtWidgets/QHeaderView>
             #include <QtCore/QDebug>
             #include <QtWidgets/QMessageBox>
             static const QString FILENAME_SETTING("filename");
             static const QString GEOMETRY_SETTING("geometry");
             MainWindow::MainWindow() :
                 m_engine(new Engine(this)),
                 m_view(new QChartView(m_engine->chart())),
                 m_scene(m_view->scene()),
                 m_table(new QTableView()),
                 m_addSeriesMenu(0),
                 m_seriesMenu(0),
                 m_chartMenu(0),
                 m_themeMenu(0),
                 m_animationMenu(0),
                 m_zoomMenu(0),
                 m_removeAllAction(0),
                 m_legendAction(0),
                 m_antialiasingAction(0)
             {
                 createMenus();
                 createDockWidgets();
                 createTable();
                 createLayout();
                 QSettings settings;
                 restoreGeometry(settings.value(GEOMETRY_SETTING).toByteArray());
                 m_filename = settings.value(FILENAME_SETTING).toString();
                 if (m_filename.isEmpty())
                     m_filename = "untitled";
                 setWindowTitle(m_filename);
                 updateUI();
             }
             MainWindow::~MainWindow()
             {
                 delete m_engine;
             }
             void MainWindow::createMenus()
             {
                 QMenu *file = menuBar()->addMenu(tr("File"));
                 QMenu *edit = menuBar()->addMenu(tr("Edit"));
                 m_seriesMenu = menuBar()->addMenu(tr("Series"));
                 m_chartMenu = menuBar()->addMenu(tr("Chart"));
                 m_addSeriesMenu = new QMenu(tr("Add series"));
                 m_themeMenu = new QMenu(tr("Apply theme"));
                 m_animationMenu = new QMenu(tr("Animations"));
                 m_zoomMenu = new QMenu(tr("Zoom"));
                 file->addAction(tr("New"), this, SLOT(handleNewAction()));
                 file->addAction(tr("Load"), this, SLOT(handleLoadAction()));
                 file->addAction(tr("Save"), this, SLOT(handleSaveAction()));
                 file->addAction(tr("Save As"), this, SLOT(handleSaveAsAction()));
                 //seriesMenu
                 m_seriesMenu->addMenu(m_addSeriesMenu);
                 m_removeAllAction = new QAction(tr("Remove all series"), this);
                 QObject::connect(m_removeAllAction, SIGNAL(triggered()), this, SLOT(handleRemoveAllSeriesAction()));
                 m_seriesMenu->addAction(m_removeAllAction);
                 m_seriesMenu->addSeparator();
                 //seriesMenu /addSeriesMenu
                 {
                     int index = QAbstractSeries::staticMetaObject.indexOfEnumerator("SeriesType");
                     QMetaEnum metaEnum = QAbstractSeries::staticMetaObject.enumerator(index);
                     int count = metaEnum.keyCount();
                     for (int i = 0; i < count; ++i) {
                         QAction* action = new QAction(metaEnum.key(i), this);
                         action->setData(metaEnum.value(i));
                         m_addSeriesMenu->addAction(action);
                         QObject::connect(action, SIGNAL(triggered()), this, SLOT(handleAddSeriesMenu()));
                     }
                 }
                 //chartMenu / themeMenu
                 {
                     m_chartMenu->addMenu(m_themeMenu);
                     int index = QChart::staticMetaObject.indexOfEnumerator("ChartTheme");
                     QMetaEnum metaEnum = QChart::staticMetaObject.enumerator(index);
                     int count = metaEnum.keyCount();
                     for (int i = 0; i < count; ++i) {
                         QAction* action = new QAction(metaEnum.key(i), this);
                         action->setData(metaEnum.value(i));
                         action->setCheckable(true);
                         m_themeMenu->addAction(action);
                         QObject::connect(action, SIGNAL(triggered()), this, SLOT(handleThemeMenu()));
                     }
                 }
                 //chartMenu / animationMenu
                 {
                     m_chartMenu->addMenu(m_animationMenu);
                     int index = QChart::staticMetaObject.indexOfEnumerator("AnimationOption");
                     QMetaEnum metaEnum = QChart::staticMetaObject.enumerator(index);
                     int count = metaEnum.keyCount();
                     for (int i = 0; i < count; ++i) {
                         QAction* action = new QAction(metaEnum.key(i), this);
                         action->setData(metaEnum.value(i));
                         action->setCheckable(true);
                         m_animationMenu->addAction(action);
                         QObject::connect(action, SIGNAL(triggered()), this, SLOT(handleAnimationMenu()));
                     }
                 }
                 //chartMenu / zoomMenu
                 {
                     m_chartMenu->addMenu(m_zoomMenu);
                     int index = QChartView::staticMetaObject.indexOfEnumerator("RubberBand");
                     QMetaEnum metaEnum = QChartView::staticMetaObject.enumerator(index);
                     int count = metaEnum.keyCount();
                     for (int i = 0; i < count; ++i) {
                         QAction* action = new QAction(metaEnum.key(i), this);
                         action->setData(metaEnum.value(i));
                         action->setCheckable(true);
                         m_zoomMenu->addAction(action);
                         QObject::connect(action, SIGNAL(triggered()), this, SLOT(handleZoomMenu()));
                     }
                 }
                 //chartMenu / legend
                 m_legendAction = new QAction(tr("Legend"), this);
                 m_legendAction->setCheckable(true);
                 m_chartMenu->addAction(m_legendAction);
                 QObject::connect(m_legendAction, SIGNAL(triggered()), this, SLOT(handleLegendAction()));
                 //chartMenu / Anti-aliasing
                 m_antialiasingAction = new QAction(tr("Anti-aliasing"), this);
                 m_antialiasingAction->setCheckable(true);
                 m_chartMenu->addAction(m_antialiasingAction);
                 QObject::connect(m_antialiasingAction, SIGNAL(triggered()), this, SLOT(handleAntialiasingAction()));
             }
             void MainWindow::createDockWidgets()
             {
                 m_brushWidget = new BrushWidget();
                 QDockWidget *brushDockWidget = new QDockWidget(tr("Brush"), this);
                 brushDockWidget->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
                 brushDockWidget->setWidget(m_brushWidget);
                 addDockWidget(Qt::RightDockWidgetArea, brushDockWidget);
                 m_penWidget = new PenWidget();
                 QDockWidget *penDockWidget = new QDockWidget(tr("Pen"), this);
                 penDockWidget->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
                 penDockWidget->setWidget(m_penWidget);
                 addDockWidget(Qt::RightDockWidgetArea, penDockWidget);
                 m_inspectorWidget = new InspectorWidget();
                 QDockWidget *inspectorDockWidget = new QDockWidget(tr("Object Inspector"), this);
                 inspectorDockWidget->setFeatures(
                     QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
                 inspectorDockWidget->setWidget(m_inspectorWidget);
                 addDockWidget(Qt::RightDockWidgetArea, inspectorDockWidget);
                 setDockOptions(QMainWindow::AnimatedDocks);
             }
             void MainWindow::createLayout()
             {
                 m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
                 int rowHeight = m_table->rowHeight(0);
                 int tableHeight = (m_engine->modelCount() * rowHeight) + m_table->horizontalHeader()->height() + 2 * m_table->frameWidth();
                 m_table->setMinimumHeight(tableHeight);
                 m_table->setMaximumHeight(tableHeight);
                 QSplitter *splitter = new QSplitter(this);
                 splitter->setOrientation(Qt::Vertical);
                 splitter->addWidget(m_table);
                 splitter->addWidget(m_view);
                 setCentralWidget(splitter);
                 m_view->hide();
             }
             void MainWindow::createTable()
             {
                 m_table->setModel(m_engine->model());
                 m_table->setSelectionModel(m_engine->selectionModel());
                 QObject::connect(m_table->selectionModel(),SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this,SLOT(updateUI()));
             }
             void MainWindow::updateUI()
             {
                 QItemSelectionModel* selection = m_table->selectionModel();
                 const QModelIndexList& list = selection->selectedIndexes();
                 QMap<int, QModelIndex> columns;
                 foreach (const QModelIndex& index, list) {
                     columns.insertMulti(index.column(), index);
                 }
                 QList<int> keys = columns.uniqueKeys();
                 bool seriesEnabled = false;
                 foreach (QAction* action, m_addSeriesMenu->actions()) {
                     switch (action->data().toInt()) {
                     case QAbstractSeries::SeriesTypeLine:
                     case QAbstractSeries::SeriesTypeSpline:
                     case QAbstractSeries::SeriesTypeScatter:
                         action->setEnabled(list.count() > 0 && keys.count() >= 2);
                         seriesEnabled |= action->isEnabled();
                         break;
                     case QAbstractSeries::SeriesTypeBar:
                     case QAbstractSeries::SeriesTypePercentBar:
                     case QAbstractSeries::SeriesTypeStackedBar:
                         action->setEnabled(list.count() > 0 && keys.count() >= 2);
                         seriesEnabled |= action->isEnabled();
                         break;
                     case QAbstractSeries::SeriesTypePie:
                         action->setEnabled(list.count() > 0 && keys.count() == 2);
                         seriesEnabled |= action->isEnabled();
                         break;
                     case QAbstractSeries::SeriesTypeArea:
                         action->setEnabled(list.count() > 0 && keys.count() == 3);
                         seriesEnabled |= action->isEnabled();
                         break;
                     }
                 }
                 m_chartMenu->setEnabled(m_engine->chart()->series().count() > 0);
                 m_seriesMenu->setEnabled(seriesEnabled || m_engine->chart()->series().count() > 0);
                 m_removeAllAction->setEnabled(m_engine->chart()->series().count() > 0);
                 int theme = m_engine->chart()->theme();
                 foreach (QAction* action, m_themeMenu->actions()) {
                     action->setChecked(action->data().toInt() == theme);
                 }
                 int animation = m_engine->chart()->animationOptions();
                 foreach (QAction* action, m_animationMenu->actions()) {
                     action->setChecked(action->data().toInt() == animation);
                 }
                 int zoom = m_view->rubberBand();
                 foreach (QAction* action, m_zoomMenu->actions()) {
                     action->setChecked(action->data().toInt() == zoom);
                 }
                 m_legendAction->setChecked(m_engine->chart()->legend()->isVisible());
                 m_antialiasingAction->setChecked(m_view->renderHints().testFlag(QPainter::Antialiasing));
                 foreach (QAction *action, m_seriesMenu->actions()) {
                     //TODO: visibility handling
                     //if (m_series.value(action->text()))
                     //    ;
                     //action->setChecked(false);
                 }
             }
             void MainWindow::closeEvent(QCloseEvent *event)
             {
                 QSettings settings;
                 settings.setValue(GEOMETRY_SETTING, saveGeometry());
                 settings.setValue(FILENAME_SETTING, m_filename);
                 QMainWindow::closeEvent(event);
             }
             //handlers
             void MainWindow::handleNewAction()
             {
                 m_engine->chart()->removeAllSeries();
                 m_view->hide();
                 m_engine->clearModels();
                 createTable();
                 m_filename = "untitled";
                 setWindowTitle(m_filename);
                 updateUI();
             }
             void MainWindow::handleAddSeriesMenu()
             {
                 m_view->show();
                 QAction* action = qobject_cast<QAction*>(sender());
                 QList<QAbstractSeries*> series = m_engine->addSeries(QAbstractSeries::SeriesType(action->data().toInt()));
                 foreach (QAbstractSeries* s , series)
                 {
                     QAction *newAction = new QAction(s->name(),this);
                     //newAction->setCheckable(true);
                     m_series.insert(s->name(),s);
                     m_seriesMenu->addAction(newAction);
                 }
                 updateUI();
             }
             void MainWindow::handleRemoveAllSeriesAction()
             {
                 foreach (QAction* action, m_seriesMenu->actions()){
                     if(m_series.contains(action->text())){
                         m_seriesMenu->removeAction(action);
                         m_engine->removeSeries(m_series.value(action->text()));
                         delete action;
                     }
                 }
                 m_series.clear();
                 m_view->hide();
                 updateUI();
             }
             void MainWindow::handleThemeMenu()
             {
                 QAction* action = qobject_cast<QAction*>(sender());
                 m_engine->chart()->setTheme(QChart::ChartTheme(action->data().toInt()));
                 updateUI();
             }
             void MainWindow::handleAnimationMenu()
             {
                 QAction* action = qobject_cast<QAction*>(sender());
                 m_engine->chart()->setAnimationOptions(QChart::AnimationOption(action->data().toInt()));
                 updateUI();
             }
             void MainWindow::handleZoomMenu()
             {
                 QAction* action = qobject_cast<QAction*>(sender());
                 m_view->setRubberBand(QChartView::RubberBand(action->data().toInt()));
                 updateUI();
             }
             void MainWindow::handleAntialiasingAction()
             {
                 QAction* action = qobject_cast<QAction*>(sender());
                 if (action->isChecked()) {
                     m_view->setRenderHint(QPainter::Antialiasing, true);
                 }
                 else {
                     m_view->setRenderHint(QPainter::Antialiasing, false);
                 }
             }
             void MainWindow::handleLegendAction()
             {
                 QAction* action = qobject_cast<QAction*>(sender());
                 if (action->isChecked()) {
                     m_engine->chart()->legend()->setVisible(true);
                 }
                 else {
                     m_engine->chart()->legend()->setVisible(false);
                 }
             }
             void MainWindow::handleSaveAction()
             {
                 if(!m_engine->save(m_filename)) {
                 QScopedPointer<QMessageBox> messageBox(new QMessageBox(this));
                 messageBox->setIcon(QMessageBox::Warning);
                 messageBox->setWindowModality(Qt::WindowModal);
                 messageBox->setWindowTitle(QString(tr("Error")));
                 messageBox->setText(tr("Could not write to ") + m_filename);
                 messageBox->exec();
                 }
             }
             void MainWindow::handleLoadAction()
             {
                 if(!m_engine->load(m_filename)) {
                 QScopedPointer<QMessageBox> messageBox(new QMessageBox(this));
                 messageBox->setIcon(QMessageBox::Warning);
                 messageBox->setWindowModality(Qt::WindowModal);
                 messageBox->setWindowTitle(QString(tr("Error")));
                 messageBox->setText(tr("Could not open ") + m_filename);
                 messageBox->exec();
                 }else createTable();
             }

tests/manual/chartdesigner/mainwindow.h +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef MAINWINDOW_H
             #define MAINWINDOW_H
             #include <QtWidgets/QMainWindow>
             #include <QtCharts/QChartGlobal>
             #include <QtCore/QMap>
             QT_CHARTS_BEGIN_NAMESPACE
             class QChartView;
             class QAbstractSeries;
             QT_CHARTS_END_NAMESPACE
             class QGraphicsScene;
             class InspectorWidget;
             class BrushWidget;
             class PenWidget;
             class QTableView;
             class Engine;
             QT_CHARTS_USE_NAMESPACE
             class MainWindow : public QMainWindow
             {
                 Q_OBJECT
             public:
                 MainWindow();
                 ~MainWindow();
             private slots:
                 void handleNewAction();
                 void handleAddSeriesMenu();
                 void handleRemoveAllSeriesAction();
                 void updateUI();
                 void handleThemeMenu();
                 void handleAnimationMenu();
                 void handleZoomMenu();
                 void handleAntialiasingAction();
                 void handleLegendAction();
                 void handleSaveAction();
                 void handleLoadAction();
             protected:
                 void closeEvent(QCloseEvent *event);
             private:
                 void createMenus();
                 void createDockWidgets();
                 void createModel();
                 void createLayout();
                 void createTable();
             private:
                 Engine *m_engine;
                 QChartView *m_view;
                 QGraphicsScene *m_scene;
                 QTableView *m_table;
                 InspectorWidget *m_inspectorWidget;
                 PenWidget *m_penWidget;
                 BrushWidget *m_brushWidget;
                 QMenu *m_addSeriesMenu;
                 QMenu *m_seriesMenu;
                 QMenu *m_chartMenu;
                 QMenu *m_themeMenu;
                 QMenu *m_animationMenu;
                 QMenu *m_zoomMenu;
                 QAction *m_removeAllAction;
                 QAction *m_legendAction;
                 QAction *m_antialiasingAction;
                 QString m_filename;
                 QMap<QString,QAbstractSeries*> m_series;
             };
             #endif /* MAINWINDOW_H */

tests/manual/chartdesigner/objectinspectorwidget.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "objectinspectorwidget.h"
             #include <QtGui/QIcon>
             #include <QtGui/QPainter>
             #include <QtGui/QPixmapCache>
             InspectorWidget::InspectorWidget()
             {
             }
             InspectorWidget::~InspectorWidget()
             {
             }
             QIcon InspectorWidget::getColorIcon(const QColor& color,const QSize &size) const
             {
                 QString key = QString("COLOR_ICON=%1:%2x%3").arg(color.name()).arg(size.width()).arg(size.height());
                 QPixmap pixmap(size);
                 if (!QPixmapCache::find(key, &pixmap)) {
                     pixmap.fill(Qt::white);
                     QPainter painter(&pixmap);
                     painter.fillRect(2, 2, 46, 46, color);
                     QPixmapCache::insert(key, pixmap);
                 }
                 return QIcon(pixmap);
             }

tests/manual/chartdesigner/objectinspectorwidget.h +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef INSPECTORWIDGET_H
             #define INSPECTORWIDGET_H
             #include <QtWidgets/QWidget>
             class InspectorWidget : public QWidget
             {
             public:
                 InspectorWidget();
                 ~InspectorWidget();
             private:
                 QIcon getColorIcon(const QColor& color,const QSize &size) const;
             };
             #endif

tests/manual/chartdesigner/penwidget.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "penwidget.h"
             #include <QtWidgets/QFormLayout>
             #include <QtWidgets/QComboBox>
             #include <QtWidgets/QSpinBox>
             PenWidget::PenWidget(QWidget *parent):QWidget(parent),
             m_colorComboBox(0),
             m_lineStyleComboBox(0),
             m_widthSpinBox(0)
             {
                 createContent();
                 createLayout();
                 setFixedSize(minimumSizeHint());
             }
             PenWidget::~PenWidget()
             {
             }
             void PenWidget::createContent()
             {
                 m_colorComboBox = new QComboBox(this);
                 m_lineStyleComboBox = new QComboBox(this);
                 m_widthSpinBox = new QSpinBox(this);
             }
             void PenWidget::createLayout()
             {
                 QFormLayout *layout = new QFormLayout();
                 layout->addRow(tr("Color"), m_colorComboBox);
                 layout->addRow(tr("Style"), m_lineStyleComboBox);
                 layout->addRow(tr("Width"), m_widthSpinBox);
                 setLayout(layout);
             }

tests/manual/chartdesigner/penwidget.h +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef PENWIDGET_H
             #define PENWIDGET_H
             #include <QtWidgets/QWidget>
             #include <QtWidgets/QPen>
             class QComboBox;
             class QSpinBox;
             class PenWidget : public QWidget
             {
             public:
                 explicit PenWidget(QWidget* parent = 0);
                 ~PenWidget();
                 QPen pen() const { return m_pen; }
             private:
                 void createContent();
                 void createLayout();
             private:
                 QPen m_pen;
                 QComboBox *m_colorComboBox;
                 QComboBox *m_lineStyleComboBox;
                 QSpinBox *m_widthSpinBox;
             };
             #endif /* PENWIDGET_H */

tools/demoLauncher/graphicsbutton.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "graphicsbutton.h"
             #include <QPainter>
             #include <QProcess>
             #include <QMouseEvent>
             GraphicsButton::GraphicsButton(const QString &path,  QDir appFolder, const QString &app, QWidget *parent) :
                 QWidget(parent),
                 m_path(path),
                 m_appFolder(appFolder),
                 m_app(app),
                 m_demoApp(0)
             {
                 m_pixmap = QPixmap(path);
             }
             GraphicsButton::~GraphicsButton()
             {
                 if (m_demoApp)
                     m_demoApp->close();
             }
             void GraphicsButton::mousePressEvent(QMouseEvent *event)
             {
                 QString program = m_appFolder.absolutePath() + QDir::separator() + m_app;
                 if (m_demoApp) {
                     m_demoApp->close();
                     delete m_demoApp;
                 }
                 m_demoApp = new QProcess(this);
                 m_demoApp->start(program);
                 event->accept();
             }
             void GraphicsButton::paintEvent(QPaintEvent *event)
             {
                 QPainter painter(this);
                 painter.drawPixmap(0, 0, this->width(), this->height(), m_pixmap);
                 QWidget::paintEvent(event);
             }

tools/demoLauncher/graphicsbutton.h +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef GRAPHICSBUTTON_H
             #define GRAPHICSBUTTON_H
             #include <QWidget>
             #include <QDir>
             class QProcess;
             class GraphicsButton : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit GraphicsButton(const QString &path, QDir appFolder, const QString &app, QWidget *parent = 0);
                 ~GraphicsButton();
             protected:
                 void mousePressEvent(QMouseEvent *event);
                 void paintEvent(QPaintEvent *event);
             private:
                 QPixmap m_pixmap;
                 QString m_path;
                 QDir m_appFolder;
                 QString m_app;
                 QProcess *m_demoApp;
             };
             #endif // GRAPHICSBUTTON_H

tools/demoLauncher/main.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QApplication>
             #include "widget.h"
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 Widget w;
                 w.show();
                 return a.exec();
             }

tools/demoLauncher/widget.cpp +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "widget.h"
             #include <QDir>
             #include <QGridLayout>
             #include <QApplication>
             #include "graphicsbutton.h"
             Widget::Widget(QWidget *parent)
                 : QWidget(parent)
             {
                 setMinimumSize(800, 600);
                 m_appFolder = QDir(QApplication::applicationDirPath());
             #ifdef Q_OS_MAC
                 // The executable is inside an application bundle (a folder) on OSX
                 m_appFolder.cdUp();
                 m_appFolder.cdUp();
                 m_appFolder.cdUp();
             #endif
                 QDir imageFolder = m_appFolder;
                 imageFolder.cdUp();
                 imageFolder.cdUp();
                 imageFolder.cd("doc");
                 imageFolder.cd("images");
                 // Create push buttons for starting the executables
                 QGridLayout* demosLayout = new QGridLayout;
                 GraphicsButton *button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() + "examples_audio.png", m_appFolder, "audio", this);
                 demosLayout->addWidget(button, 0, 0);
                 button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() +"examples_callout.png", m_appFolder, "callout", this);
                 demosLayout->addWidget(button, 0, 1);
                 button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() +"demo_chartthemes_blue_cerulean.png", m_appFolder, "chartthemes", this);
                 demosLayout->addWidget(button, 0, 2);
                 button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() +"examples_nesteddonuts.png", m_appFolder, "nesteddonuts", this);
                 demosLayout->addWidget(button, 1, 0);
                 button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() +"examples_zoomlinechart1.png", m_appFolder, "zoomlinechart", this);
                 demosLayout->addWidget(button, 1, 1);
                 button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() +"examples_stackedbarchartdrilldown1.png", m_appFolder, "stackedbarchartdrilldown", this);
                 demosLayout->addWidget(button, 1, 2);
                 button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() +"piechart_customization.png", m_appFolder, "piechartcustomization", this);
                 demosLayout->addWidget(button, 2, 0);
                 button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() +"examples_datetimeaxis.png", m_appFolder, "datetimeaxis", this);
                 demosLayout->addWidget(button, 2, 1);
                 button = new GraphicsButton(imageFolder.absolutePath() + QDir::separator() +"examples_donutbreakdown.png", m_appFolder, "donutbreakdown", this);
                 demosLayout->addWidget(button, 2, 2);
                 setLayout(demosLayout);
             }
             Widget::~Widget()
             {
             }

tools/demoLauncher/widget.h +7 -9

             /****************************************************************************
             **
             ** Copyright (C) 2014 Digia Plc
             ** All rights reserved.
-            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            ** For any questions to Digia, please use contact form at http://qt.io
             **
-            ** This file is part of the Qt Enterprise Charts Add-on.
+            ** This file is part of the Qt Charts module.
             **
-            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid commercial license for Qt may use this file in
-            ** Licensees holding valid Qt Enterprise licenses may use this file in
+            ** accordance with the Qt License Agreement provided with the Software
-            ** accordance with the Qt Enterprise License Agreement provided with the
+            ** or, alternatively, in accordance with the terms contained in a written
-            ** Software or, alternatively, in accordance with the terms contained in
+            ** agreement between you and Digia.
-            ** 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
+            ** contact form at http://qt.io
-            ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef WIDGET_H
             #define WIDGET_H
             #include <QWidget>
             #include <QDir>
             class Widget : public QWidget
             {
                 Q_OBJECT
             public:
                 Widget(QWidget *parent = 0);
                 ~Widget();
             private:
                 QDir m_appFolder;
             };
             #endif // WIDGET_H

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