##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

File last commit:

r2854:46147b040d06
r2893:0464d42b101e merge 5.7.0
Show More
chartview.cpp
88 lines | 3.1 KiB | text/x-c | CppLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Jani Honkonen
Add/modify license headers
r830 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Jani Honkonen
Add/modify license headers
r830 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen
Add/modify license headers
r830 **
Miikka Heikkinen
Updated license...
r2854 ** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala
Updated license headers...
r2845 ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen
Updated license...
r2854 ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 or (at your option) any later version
** approved by the KDE Free Qt Foundation. The licenses are as published by
** the Free Software Foundation and appearing in the file LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Jani Honkonen
Add/modify license headers
r830 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Jani Honkonen
Add/modify license headers
r830
Tero Ahola
Tuned scatterinteractions example
r1026 #include "chartview.h"
Titta Heikkala
Fix include syntax...
r2714 #include <QtCore/QtMath>
#include <QtCore/QDebug>
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_USE_NAMESPACE
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
Tero Ahola
Tuned scatterinteractions example
r1026 ChartView::ChartView(QWidget *parent)
: QChartView(new QChart(), parent),
m_scatter(0),
m_scatter2(0)
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394 {
Tero Ahola
Tuned scatterinteractions example
r1026 setRenderHint(QPainter::Antialiasing);
chart()->setTitle("Click to interact with scatter points");
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
m_scatter = new QScatterSeries();
Tero Ahola
Named all series in example applications
r1226 m_scatter->setName("scatter1");
Jani Honkonen
coding style fixes for examples
r2098 for (qreal x(0.5); x <= 4.0; x += 0.5) {
for (qreal y(0.5); y <= 4.0; y += 0.5) {
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394 *m_scatter << QPointF(x, y);
}
}
Tero Ahola
Tuned scatterinteractions example
r1026 m_scatter2 = new QScatterSeries();
Tero Ahola
Named all series in example applications
r1226 m_scatter2->setName("scatter2");
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
Tero Ahola
Tuned scatterinteractions example
r1026 chart()->addSeries(m_scatter2);
chart()->addSeries(m_scatter);
Marek Rosa
Scatter interactions fixed
r1620 chart()->createDefaultAxes();
Tero Ahola
Tuned scatterinteractions example
r1026 chart()->axisX()->setRange(0, 4.5);
chart()->axisY()->setRange(0, 4.5);
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
Michal Klocek
Normalizes signal slots connections
r967 connect(m_scatter, SIGNAL(clicked(QPointF)), this, SLOT(handleClickedPoint(QPointF)));
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394 }
Tero Ahola
Tuned scatterinteractions example
r1026 ChartView::~ChartView()
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394 {
}
Jani Honkonen
more coding style fixes for examples...
r2102 void ChartView::handleClickedPoint(const QPointF &point)
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394 {
Tero Ahola
Fixed coordinate bug with QScatterSeries::onClicked
r1410 QPointF clickedPoint = point;
// Find the closest point from series 1
Tero Ahola
INT64_MAX -> INT_MAX in scatterinteractions example
r1412 QPointF closest(INT_MAX, INT_MAX);
qreal distance(INT_MAX);
Jani Honkonen
coding style: foreach whitespace fix
r2100 foreach (QPointF currentPoint, m_scatter->points()) {
Titta Heikkala
Fix Chart build on Solaris...
r2613 qreal currentDistance = qSqrt((currentPoint.x() - clickedPoint.x())
* (currentPoint.x() - clickedPoint.x())
+ (currentPoint.y() - clickedPoint.y())
* (currentPoint.y() - clickedPoint.y()));
Tero Ahola
Fixed coordinate bug with QScatterSeries::onClicked
r1410 if (currentDistance < distance) {
distance = currentDistance;
closest = currentPoint;
}
}
// Remove the closes point from series 1 and append it to series 2
m_scatter->remove(closest);
m_scatter2->append(closest);
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394 }