##// END OF EJS Templates
Fix axis geometry when there is no axis title...
Fix axis geometry when there is no axis title SizeHint won't include title padding when there is no title, yet updateGeometry() always assumed it was there when determining space for labels, causing truncated labels when title was missing. Also made missing/empty/hidden axis title work consistently. Now axis geometries should be updated correctly always when title text or visibility status changes. Task-number: QTRD-1903 Reviewed-by: Mika Salmela

File last commit:

r2044:76eebf503401
r2415:65ea14fdb747
Show More
qpieslice.h
147 lines | 4.6 KiB | text/x-c | CLexer
/****************************************************************************
**
** 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$
**
****************************************************************************/
#ifndef QPIESLICE_H
#define QPIESLICE_H
#include <qchartglobal.h>
#include <QObject>
#include <QPen>
#include <QBrush>
#include <QFont>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
class QPieSlicePrivate;
class QPieSeries;
class QTCOMMERCIALCHART_EXPORT QPieSlice : public QObject
{
Q_OBJECT
Q_ENUMS(LabelPosition)
Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
Q_PROPERTY(bool labelVisible READ isLabelVisible WRITE setLabelVisible NOTIFY labelVisibleChanged)
Q_PROPERTY(LabelPosition labelPosition READ labelPosition WRITE setLabelPosition)
Q_PROPERTY(bool exploded READ isExploded WRITE setExploded)
Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged)
Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
Q_PROPERTY(int borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged)
Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)
Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont NOTIFY labelFontChanged)
Q_PROPERTY(qreal labelArmLengthFactor READ labelArmLengthFactor WRITE setLabelArmLengthFactor)
Q_PROPERTY(qreal explodeDistanceFactor READ explodeDistanceFactor WRITE setExplodeDistanceFactor)
Q_PROPERTY(qreal percentage READ percentage NOTIFY percentageChanged)
Q_PROPERTY(qreal startAngle READ startAngle NOTIFY startAngleChanged)
Q_PROPERTY(qreal angleSpan READ angleSpan NOTIFY angleSpanChanged)
public:
enum LabelPosition {
LabelOutside,
LabelInsideHorizontal,
LabelInsideTangential,
LabelInsideNormal
};
public:
explicit QPieSlice(QObject *parent = 0);
QPieSlice(QString label, qreal value, QObject *parent = 0);
virtual ~QPieSlice();
void setLabel(QString label);
QString label() const;
void setValue(qreal value);
qreal value() const;
void setLabelVisible(bool visible = true);
bool isLabelVisible() const;
LabelPosition labelPosition();
void setLabelPosition(LabelPosition position);
void setExploded(bool exploded = true);
bool isExploded() const;
void setPen(const QPen &pen);
QPen pen() const;
QColor borderColor();
void setBorderColor(QColor color);
int borderWidth();
void setBorderWidth(int width);
void setBrush(const QBrush &brush);
QBrush brush() const;
QColor color();
void setColor(QColor color);
void setLabelBrush(const QBrush &brush);
QBrush labelBrush() const;
QColor labelColor();
void setLabelColor(QColor color);
void setLabelFont(const QFont &font);
QFont labelFont() const;
void setLabelArmLengthFactor(qreal factor);
qreal labelArmLengthFactor() const;
void setExplodeDistanceFactor(qreal factor);
qreal explodeDistanceFactor() const;
qreal percentage() const;
qreal startAngle() const;
qreal angleSpan() const;
QPieSeries *series() const;
Q_SIGNALS:
void clicked();
void hovered(bool state);
void labelChanged();
void valueChanged();
void labelVisibleChanged();
void penChanged();
void brushChanged();
void labelBrushChanged();
void labelFontChanged();
void percentageChanged();
void startAngleChanged();
void angleSpanChanged();
void colorChanged();
void borderColorChanged();
void borderWidthChanged();
void labelColorChanged();
private:
QPieSlicePrivate * const d_ptr;
Q_DECLARE_PRIVATE(QPieSlice)
Q_DISABLE_COPY(QPieSlice)
};
QTCOMMERCIALCHART_END_NAMESPACE
#endif // QPIESLICE_H