##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix legend markers truncation...
Fix legend markers truncation Geometry calculation was using different font than sizehint calculation. Also, sizehint calculation was still using QFontMetrics instead of textBoundingRect(). Task-number: QTRD-1927 Change-Id: Ibfda7847cbc1f8e22377b01a4fdd946095302aba Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Miikka Heikkinen - - Load All Authors

File last commit:

r2483:f494279b6366
r2544:9f0ff996f528
Show More
polarchartlogvalueaxisradial.cpp
95 lines | 3.3 KiB | text/x-c | CppLexer
/ src / axis / logvalueaxis / polarchartlogvalueaxisradial.cpp
History | Source | Raw |Copy content |Copy permalink
Miikka Heikkinen
Add Polar chart support...
 r2483 /****************************************************************************
**
** Copyright (C) 2013 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 "polarchartlogvalueaxisradial_p.h"
#include "abstractchartlayout_p.h"
#include "chartpresenter_p.h"
#include "qlogvalueaxis.h"
#include <qmath.h>
#include <QDebug>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
PolarChartLogValueAxisRadial::PolarChartLogValueAxisRadial(QLogValueAxis *axis, QGraphicsItem *item)
: PolarChartAxisRadial(axis, item)
{
QObject::connect(axis, SIGNAL(baseChanged(qreal)), this, SLOT(handleBaseChanged(qreal)));
QObject::connect(axis, SIGNAL(labelFormatChanged(QString)), this, SLOT(handleLabelFormatChanged(QString)));
}
PolarChartLogValueAxisRadial::~PolarChartLogValueAxisRadial()
{
}
QVector<qreal> PolarChartLogValueAxisRadial::calculateLayout() const
{
QLogValueAxis *logValueAxis = static_cast<QLogValueAxis *>(axis());
const qreal logMax = log10(logValueAxis->max()) / log10(logValueAxis->base());
const qreal logMin = log10(logValueAxis->min()) / log10(logValueAxis->base());
const qreal innerEdge = logMin < logMax ? logMin : logMax;
const qreal outerEdge = logMin > logMax ? logMin : logMax;
const qreal delta = (axisGeometry().width() / 2.0) / qAbs(logMax - logMin);
const qreal initialSpan = (ceil(innerEdge) - innerEdge) * delta;
int tickCount = qAbs(ceil(logMax) - ceil(logMin));
// Extra tick if outer edge is exactly at the tick
if (outerEdge == ceil(outerEdge))
tickCount++;
QVector<qreal> points;
points.resize(tickCount);
for (int i = 0; i < tickCount; ++i) {
qreal radialCoordinate = initialSpan + (delta * qreal(i));
points[i] = radialCoordinate;
}
return points;
}
void PolarChartLogValueAxisRadial::createAxisLabels(const QVector<qreal> &layout)
{
QLogValueAxis *logValueAxis = static_cast<QLogValueAxis *>(axis());
setLabels(createLogValueLabels(logValueAxis->min(),
logValueAxis->max(),
logValueAxis->base(),
layout.size(),
logValueAxis->labelFormat()));
}
void PolarChartLogValueAxisRadial::handleBaseChanged(qreal base)
{
Q_UNUSED(base);
QGraphicsLayoutItem::updateGeometry();
if (presenter())
presenter()->layout()->invalidate();
}
void PolarChartLogValueAxisRadial::handleLabelFormatChanged(const QString &format)
{
Q_UNUSED(format);
QGraphicsLayoutItem::updateGeometry();
if (presenter())
presenter()->layout()->invalidate();
}
#include "moc_polarchartlogvalueaxisradial_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE