##// END OF EJS Templates
Adjust various margins and paddings....
Adjust various margins and paddings. The text items have been changed to use QGraphicsTextItem bounding rects instead of calculating dimensions using QFontMetrics. It seems that QGraphicsTextItem boundingRect involves a lot more of a margin than QFontMetrics provided. To compensate, various margins and paddings have been adjusted lower. Change-Id: Idebf939f5dd804fb96daeaea4bbf1b45f4f02908 Reviewed-by: Mika Salmela <mika.salmela@digia.com>

File last commit:

r2504:54fd83ddb7ed
r2569:f4eaee212ddc
Show More
polarchartaxis.cpp
126 lines | 3.6 KiB | text/x-c | CppLexer
/ src / axis / polarchartaxis.cpp
/****************************************************************************
**
** 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 "polarchartaxis_p.h"
#include "qabstractaxis_p.h"
#include "chartpresenter_p.h"
QTCOMMERCIALCHART_BEGIN_NAMESPACE
PolarChartAxis::PolarChartAxis(QAbstractAxis *axis, QGraphicsItem *item, bool intervalAxis)
: ChartAxisElement(axis, item, intervalAxis)
{
}
PolarChartAxis::~PolarChartAxis()
{
}
void PolarChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
{
Q_UNUSED(grid);
setAxisGeometry(axis);
if (isEmpty())
return;
QVector<qreal> layout = calculateLayout();
updateLayout(layout);
}
QRectF PolarChartAxis::gridGeometry() const
{
return QRectF();
}
void PolarChartAxis::updateLayout(QVector<qreal> &layout)
{
int diff = ChartAxisElement::layout().size() - layout.size();
if (animation()) {
switch (presenter()->state()) {
case ChartPresenter::ZoomInState:
case ChartPresenter::ZoomOutState:
case ChartPresenter::ScrollUpState:
case ChartPresenter::ScrollLeftState:
case ChartPresenter::ScrollDownState:
case ChartPresenter::ScrollRightState:
case ChartPresenter::ShowState:
animation()->setAnimationType(AxisAnimation::DefaultAnimation);
break;
}
// Update to "old" geometry before starting animation to avoid incorrectly sized
// axes lingering in wrong position compared to series plot before animation can kick in.
// Note that the position mismatch still exists even with this update, but it will be
// far less ugly.
updateGeometry();
}
if (diff > 0)
deleteItems(diff);
else if (diff < 0)
createItems(-diff);
if (animation()) {
animation()->setValues(ChartAxisElement::layout(), layout);
presenter()->startAnimation(animation());
} else {
setLayout(layout);
updateGeometry();
}
}
bool PolarChartAxis::isEmpty()
{
return !axisGeometry().isValid() || qFuzzyIsNull(min() - max());
}
void PolarChartAxis::deleteItems(int count)
{
QList<QGraphicsItem *> gridLines = gridItems();
QList<QGraphicsItem *> labels = labelItems();
QList<QGraphicsItem *> shades = shadeItems();
QList<QGraphicsItem *> axis = arrowItems();
for (int i = 0; i < count; ++i) {
if (gridItems().size() == 1 || (((gridLines.size() + 1) % 2) && gridLines.size() > 0))
delete(shades.takeLast());
delete(gridLines.takeLast());
delete(labels.takeLast());
delete(axis.takeLast());
}
}
void PolarChartAxis::handleShadesBrushChanged(const QBrush &brush)
{
foreach (QGraphicsItem *item, shadeItems())
static_cast<QGraphicsPathItem *>(item)->setBrush(brush);
}
void PolarChartAxis::handleShadesPenChanged(const QPen &pen)
{
foreach (QGraphicsItem *item, shadeItems())
static_cast<QGraphicsPathItem *>(item)->setPen(pen);
}
#include "moc_polarchartaxis_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE