##// END OF EJS Templates
Fix vanishing labels for first and last ticks....
Fix vanishing labels for first and last ticks. Extra space must be reserved by layout for the axes that have wide labels for first or last tick. Changed the logic how axis sizeHint is interpreted to make the previously irrelevant height or width (depending on orientation) of the sizeHint to indicate how far the widest label extends past the first/last tick, and adjust the grid size accordingly in layout. Reviewed-by: Mika Salmela

File last commit:

r2433:4d17a12f375e
r2443:5b27b7b1d72a RC2_1.2.1
Show More
declarativecategoryaxis.h
75 lines | 2.5 KiB | text/x-c | CLexer
/ plugins / declarative / declarativecategoryaxis.h
/****************************************************************************
**
** 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$
**
****************************************************************************/
#ifndef DECLARATIVECATEGORYAXIS_H
#define DECLARATIVECATEGORYAXIS_H
#include "qcategoryaxis.h"
#include <QtDeclarative/QDeclarativeListProperty>
#include <QtDeclarative/QDeclarativeParserStatus>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
class DeclarativeCategoryRange : public QObject
{
Q_OBJECT
Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue)
Q_PROPERTY(QString label READ label WRITE setLabel)
public:
explicit DeclarativeCategoryRange(QObject *parent = 0);
qreal endValue() { return m_endValue; }
void setEndValue(qreal endValue) { m_endValue = endValue; }
QString label() { return m_label; }
void setLabel(QString label) { m_label = label; }
private:
qreal m_endValue;
QString m_label;
};
class DeclarativeCategoryAxis : public QCategoryAxis, public QDeclarativeParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_PROPERTY(QDeclarativeListProperty<QObject> axisChildren READ axisChildren)
Q_CLASSINFO("DefaultProperty", "axisChildren")
public:
explicit DeclarativeCategoryAxis(QObject *parent = 0);
QDeclarativeListProperty<QObject> axisChildren();
public: // from QDeclarativeParserStatus
void classBegin();
void componentComplete();
public Q_SLOTS:
Q_INVOKABLE void append(const QString &label, qreal categoryEndValue);
Q_INVOKABLE void remove(const QString &label);
Q_INVOKABLE void replace(const QString &oldLabel, const QString &newLabel);
static void appendAxisChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
private:
static bool endValueLessThan(const QPair<QString, qreal> &value1, const QPair<QString, qreal> &value2);
};
QTCOMMERCIALCHART_END_NAMESPACE
#endif // DECLARATIVECATEGORYAXIS_H