##// 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:

r2433:4d17a12f375e
r2569:f4eaee212ddc
Show More
tst_qscatterseries.cpp
131 lines | 3.0 KiB | text/x-c | CppLexer
/****************************************************************************
**
** 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 "../qxyseries/tst_qxyseries.h"
#include <qscatterseries.h>
Q_DECLARE_METATYPE(QList<QPointF>)
class tst_QScatterSeries : public tst_QXYSeries
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
void qscatterseries_data();
void qscatterseries();
void scatterChangedSignals();
protected:
void pointsVisible_data();
};
void tst_QScatterSeries::initTestCase()
{
}
void tst_QScatterSeries::cleanupTestCase()
{
}
void tst_QScatterSeries::init()
{
tst_QXYSeries::init();
m_series = new QScatterSeries();
}
void tst_QScatterSeries::cleanup()
{
delete m_series;
tst_QXYSeries::cleanup();
}
void tst_QScatterSeries::qscatterseries_data()
{
}
void tst_QScatterSeries::qscatterseries()
{
QScatterSeries series;
QCOMPARE(series.count(),0);
QCOMPARE(series.brush(), QBrush());
QCOMPARE(series.points(), QList<QPointF>());
QCOMPARE(series.pen(), QPen());
QCOMPARE(series.pointsVisible(), false);
series.append(QList<QPointF>());
series.append(0.0,0.0);
series.append(QPointF());
series.remove(0.0,0.0);
series.remove(QPointF());
series.clear();
series.replace(QPointF(),QPointF());
series.replace(0,0,0,0);
series.setBrush(QBrush());
series.setPen(QPen());
series.setPointsVisible(false);
m_chart->addSeries(&series);
m_view->show();
QTest::qWaitForWindowShown(m_view);
}
void tst_QScatterSeries::scatterChangedSignals()
{
QScatterSeries *series = qobject_cast<QScatterSeries *>(m_series);
QVERIFY(series);
QSignalSpy colorSpy(series, SIGNAL(colorChanged(QColor)));
QSignalSpy borderColorSpy(series, SIGNAL(borderColorChanged(QColor)));
// Color
series->setColor(QColor("blueviolet"));
TRY_COMPARE(colorSpy.count(), 1);
// Border color
series->setBorderColor(QColor("burlywood"));
TRY_COMPARE(borderColorSpy.count(), 1);
// Pen
QPen p = series->pen();
p.setColor("lightpink");
series->setPen(p);
TRY_COMPARE(borderColorSpy.count(), 2);
// Brush
QBrush b = series->brush();
b.setColor("lime");
series->setBrush(b);
TRY_COMPARE(colorSpy.count(), 2);
}
QTEST_MAIN(tst_QScatterSeries)
#include "tst_qscatterseries.moc"