##// END OF EJS Templates
Qt5: declarative fix part1...
Qt5: declarative fix part1 - disabled demos examples and tests - disabled error on warning (QVector compilation issue: warning: dereferencing pointer '<anonymous>' does break strict-aliasing rules - disabled designer plugin - fixed the include files in plugins/declarative folder

File last commit:

r1949:39b74020ad7b
r2052:7140e4975cd3
Show More
chart.cpp
101 lines | 3.1 KiB | text/x-c | CppLexer
Tero Ahola
Switched the z-order of axis to be below series...
r1790 /****************************************************************************
**
** 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$
**
****************************************************************************/
Jani Honkonen
Fix include issues
r1949 #include "chart.h"
Marek Rosa
class QValuesAxis renamed to QValueAxis
r1804 #include <QValueAxis>
Tero Ahola
Switched the z-order of axis to be below series...
r1790 #include <QAbstractAxis>
Tero Ahola
Fixed paint and mouse event issues with QLineSeries...
r1791 #include <cmath>
Tero Ahola
Switched the z-order of axis to be below series...
r1790
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)
{
Tero Ahola
Fixed paint and mouse event issues with QLineSeries...
r1791 // 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)) {
Tero Ahola
Switched the z-order of axis to be below series...
r1790 m_movingPoint = p;
m_clicked = true;
}
}
}
Tero Ahola
Fixed paint and mouse event issues with QLineSeries...
r1791 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()));
}
Tero Ahola
Switched the z-order of axis to be below series...
r1790 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();
Marek Rosa
class QValuesAxis renamed to QValueAxis
r1804 QValueAxis* haxis = 0;
Marek Rosa
updated AxisType names
r1818 if (axisx->type() == QAbstractAxis::AxisTypeValue)
Marek Rosa
class QValuesAxis renamed to QValueAxis
r1804 haxis = qobject_cast<QValueAxis*>(axisx);
Tero Ahola
Switched the z-order of axis to be below series...
r1790
QAbstractAxis * axisy = this->axisY();
Marek Rosa
class QValuesAxis renamed to QValueAxis
r1804 QValueAxis* vaxis = 0;
Marek Rosa
updated AxisType names
r1818 if (axisy->type() == QAbstractAxis::AxisTypeValue)
Marek Rosa
class QValuesAxis renamed to QValueAxis
r1804 vaxis = qobject_cast<QValueAxis*>(axisy);
Tero Ahola
Switched the z-order of axis to be below series...
r1790
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);
}
}
}