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

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

Fix long labels visibility for QBarChart...
Fix long labels visibility for QBarChart Long labels are truncated vertically and horizontally so that they fit into the space available. There's no need to hide the labels explicitly as they are already truncated to the space available. The truncatedText() method now takes into account also the height of the space available. Task-number: QTRD-1929 Change-Id: Ibe2b996e514ddb44c96ce040fc729a605d24c8ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Miikka Heikkinen - - Load All Authors

File last commit:

r2574:599370d0561c
r2604:776457a845dd
Show More
qbarlegendmarker.cpp
145 lines | 3.7 KiB | text/x-c | CppLexer
/ src / legend / qbarlegendmarker.cpp
History | Source | Raw |Copy content |Copy permalink
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 /****************************************************************************
**
Miikka Heikkinen
Fixed the copyright year 2012 -> 2013
 r2432 ** Copyright (C) 2013 Digia Plc
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** This file is part of the Qt Enterprise Charts Add-on.
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 **
** $QT_BEGIN_LICENSE$
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** Licensees holding valid Qt Enterprise licenses may use this file in
** accordance with the Qt Enterprise License Agreement provided with the
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 ** 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 "qbarlegendmarker.h"
#include "qbarlegendmarker_p.h"
#include <QAbstractBarSeries>
#include <QBarSet>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
sauimone
documentation of legendmarkers
 r2216 /*!
\class QBarLegendMarker
Miikka Heikkinen
Fix some documentation issues...
 r2520 \brief QBarLegendMarker object.
sauimone
documentation of legendmarkers
 r2216 \mainclass
QBarLegendMarker is related to QAbstractBarSeries derived classes. With bar series, each marker is related to one QBarSet.
\sa QLegend QAbstractBarSeries QBarSet
*/
/*!
\fn virtual LegendMarkerType QBarLegendMarker::type()
Returns QLegendMarker::LegendMarkerTypeBar
*/
/*!
Tero Ahola
Fixed several documentation issues
 r2265 \internal
sauimone
documentation of legendmarkers
 r2216 Constructor
*/
sauimone
optional series parameter to markers function. code style fixes
 r2193 QBarLegendMarker::QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent) :
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 QLegendMarker(*new QBarLegendMarkerPrivate(this,series,barset,legend), parent)
{
sauimone
fixed crash in legendmarker when calling update from private constructor
 r2227 d_ptr->updated();
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 }
sauimone
documentation of legendmarkers
 r2216 /*!
Desturctor
*/
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 QBarLegendMarker::~QBarLegendMarker()
{
}
/*!
\internal
*/
QBarLegendMarker::QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent) :
QLegendMarker(d, parent)
{
}
sauimone
documentation of legendmarkers
 r2216 /*!
Returns the related series of marker
*/
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 QAbstractBarSeries *QBarLegendMarker::series()
{
Q_D(QBarLegendMarker);
return d->m_series;
}
sauimone
documentation of legendmarkers
 r2216 /*!
Returns the related barset of marker
*/
sauimone
removed peer object solution. Introduced marker type solution
 r2179 QBarSet* QBarLegendMarker::barset()
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 {
Q_D(QBarLegendMarker);
return d->m_barset;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QBarLegendMarkerPrivate::QBarLegendMarkerPrivate(QBarLegendMarker *q, QAbstractBarSeries *series, QBarSet *barset, QLegend *legend) :
QLegendMarkerPrivate(q,legend),
sauimone
fixed crash in legendmarker when calling update from private constructor
 r2227 q_ptr(q),
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 m_series(series),
m_barset(barset)
{
QObject::connect(m_barset, SIGNAL(penChanged()), this, SLOT(updated()));
QObject::connect(m_barset, SIGNAL(labelChanged()), this, SLOT(updated()));
QObject::connect(m_barset, SIGNAL(brushChanged()), this, SLOT(updated()));
}
QBarLegendMarkerPrivate::~QBarLegendMarkerPrivate()
{
}
sauimone
Better handling for new or removed markers
 r2182 QAbstractBarSeries* QBarLegendMarkerPrivate::series()
{
return m_series;
}
QObject* QBarLegendMarkerPrivate::relatedObject()
{
return m_barset;
}
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 void QBarLegendMarkerPrivate::updated()
{
sauimone
signals for properties in legendmarker
 r2225 bool labelChanged = false;
bool brushChanged = false;
bool penChanged = false;
Mika Salmela
Fix for not overriding user settings for legend markers....
 r2429 if (!m_customPen && (m_item->pen() != m_barset->pen())) {
sauimone
signals for properties in legendmarker
 r2225 m_item->setPen(m_barset->pen());
penChanged = true;
}
Mika Salmela
Fix for not overriding user settings for legend markers....
 r2429 if (!m_customBrush && (m_item->brush() != m_barset->brush())) {
sauimone
signals for properties in legendmarker
 r2225 m_item->setBrush(m_barset->brush());
brushChanged = true;
}
Mika Salmela
Fix for not overriding user settings for legend markers....
 r2429 if (!m_customLabel && (m_item->label() != m_barset->label())) {
sauimone
signals for properties in legendmarker
 r2225 m_item->setLabel(m_barset->label());
labelChanged = true;
}
sauimone
fix to QTRD-1674: layout is not calculated correctly after the change in the text of legend marker
 r2194 invalidateLegend();
sauimone
signals for properties in legendmarker
 r2225
if (labelChanged)
emit q_ptr->labelChanged();
if (brushChanged)
emit q_ptr->brushChanged();
if (penChanged)
emit q_ptr->penChanged();
sauimone
tidying up legend marker code. Added QBarLegendMarker
 r2174 }
#include "moc_qbarlegendmarker.cpp"
#include "moc_qbarlegendmarker_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE