HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1246:5512aa7e284d

removed barlabel. label visibility control is now per series instead of per set

sauimone -

r1246:5512aa7e284d

parent child

Context file:

r1246:5512aa7e284d

Collapse all files

src/barchart/barchart.pri 0 -2

                 $$PWD/qstackedbarseries.cpp \
                 $$PWD/qgroupedbarseries.cpp \
                 $$PWD/stackedbarchartitem.cpp \
-                $$PWD/barlabel.cpp \
                 $$PWD/qbarmodelmapper.cpp
             PRIVATE_HEADERS += \
                 $$PWD/percentbarchartitem_p.h \
                 $$PWD/stackedbarchartitem_p.h \
                 $$PWD/groupedbarchartitem_p.h \
-                $$PWD/barlabel_p.h \
                 $$PWD/qbarset_p.h \
                 $$PWD/qbarseries_p.h \
                 $$PWD/qstackedbarseries_p.h\

src/barchart/barchartitem.cpp +18 -11

             #include "barchartitem_p.h"
             #include "bar_p.h"
-            #include "barlabel_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "qbarseries.h"
                 setFlag(ItemClipsChildrenToShape);
                 connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
                 connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleModelChanged()));
+                connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(labelsVisibleChanged(bool)));
                 setZValue(ChartPresenter::BarSeriesZValue);
                 dataChanged();
             }
                 m_labels.clear();
                 m_layout.clear();
+                bool labelsVisible = m_series->isLabelsVisible();
                 // Create new graphic items for bars
                 for (int c = 0; c < m_series->categoryCount(); c++) {
                     QString category = m_series->d_func()->categoryName(c);
                     for (int s = 0; s < m_series->barsetCount(); s++) {
                         QBarSet *set = m_series->d_func()->barsetAt(s);
+                        // Bars
                         Bar *bar = new Bar(set,category,this);
                         m_bars.append(bar);
                         connect(bar, SIGNAL(clicked(QString)), set, SIGNAL(clicked(QString)));
                         connect(bar, SIGNAL(hovered(bool)), set, SIGNAL(hovered(bool)));
                         connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool)));
                         m_layout.append(QRectF(0, 0, 0, 0));
-                // Create labels
+                        // Labels
-                for (int category = 0; category < m_series->categoryCount(); category++) {
+                        QGraphicsSimpleTextItem *label = new QGraphicsSimpleTextItem(this);
-                    for (int s = 0; s < m_series->barsetCount(); s++) {
+                        label->setVisible(labelsVisible);
-                        QBarSet *set = m_series->d_func()->barsetAt(s);
+                        m_labels.append(label);
-                        BarLabel *value = new BarLabel(*set, this);
-                        m_labels.append(value);
-                        connect(set->d_ptr.data(),SIGNAL(labelsVisibleChanged(bool)),value,SLOT(labelsVisibleChanged(bool)));
                     }
                 }
                         bar->setPen(barSet->pen());
                         bar->setBrush(barSet->brush());
-                        BarLabel* label = m_labels.at(itemIndex);
+                        QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
                         if (!qFuzzyIsNull(barSet->at(category).y())) {
                             label->setText(QString::number(barSet->at(category).y()));
                 update();
             }
+            void BarChartItem::labelsVisibleChanged(bool visible)
+            {
+                foreach (QGraphicsSimpleTextItem* label, m_labels) {
+                    label->setVisible(visible);
+                }
+                update();
+            }
             #include "moc_barchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartitem_p.h +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Bar;
-            class BarLabel;
             class QAxisCategories;
             class QChart;
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF &size);
                 void handleLayoutChanged();
+                void labelsVisibleChanged(bool visible);
             protected:
                 // Not owned.
                 QBarSeries *m_series;
                 QList<Bar *> m_bars;
-                QList<BarLabel *> m_labels;
+                QList<QGraphicsSimpleTextItem *> m_labels;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/groupedbarchartitem.cpp +1 -2

             #include "groupedbarchartitem_p.h"
             #include "bar_p.h"
-            #include "barlabel_p.h"
             #include "qbarset_p.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
                         bar->setPen(barSet->pen());
                         bar->setBrush(barSet->brush());
-                        BarLabel* label = m_labels.at(itemIndex);
+                        QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
                         if (!qFuzzyIsNull(barSet->at(category).y())) {
                             label->setText(QString::number(barSet->at(category).y()));

src/barchart/percentbarchartitem.cpp +1 -2

             #include "percentbarchartitem_p.h"
             #include "bar_p.h"
-            #include "barlabel_p.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
             #include <QDebug>
                         QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
                         layout.append(rect);
-                        BarLabel* label = m_labels.at(itemIndex);
+                        QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
                         if (!qFuzzyIsNull(m_series->d_func()->valueAt(set,category))) {
                             int p = m_series->d_func()->percentageAt(set,category) * 100;

src/barchart/qbarseries.cpp +12 -3

             */
             void QBarSeries::setLabelsVisible(bool visible)
             {
-                foreach (QBarSet* s, barSets()) {
+                Q_D(QBarSeries);
-                    s->setLabelsVisible(visible);
+                if (d->m_labelsVisible != visible) {
+                    d->m_labelsVisible = visible;
+                    emit d->updatedBars();
+                }
             }
+            bool QBarSeries::isLabelsVisible() const
+            {
+                Q_D(const QBarSeries);
+                return d->m_labelsVisible;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) :
                 QAbstractSeriesPrivate(q),
-                m_barMargin(0.05)  // Default value is 5% of category width
+                m_barMargin(0.05),  // Default value is 5% of category width
+                m_labelsVisible(false)
             {
             }

src/barchart/qbarseries.h +1 0

                 QBarCategories categories() const;
                 void setLabelsVisible(bool visible = true);
+                bool isLabelsVisible() const;
             protected:
                 explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0);

src/barchart/qbarseries_p.h +3 0

                 void updatedBars();
                 void restructuredBars();
                 void categoriesUpdated();
+                void labelsVisibleChanged(bool visible);
             private Q_SLOTS:
                 void barsetChanged();
                 QList<QBarSet *> m_barSets;
                 QBarCategories m_categories;
                 qreal m_barMargin;
+                bool m_labelsVisible;
             private:
                 Q_DECLARE_PUBLIC(QBarSeries)
             };

src/barchart/qbarset.cpp +1 -22

@@ -324,32 +324,11 QFont QBarSet::labelFont() const
324	return d_ptr->m_labelFont;	324	return d_ptr->m_labelFont;
325	}	325	}
326		326
327	/*!
328	Sets visibility of bar labels. If \a visible is true, labels are drawn on top of barsets.
329	*/
330
331	void QBarSet::setLabelsVisible(bool visible)
332	{
333	if(d_ptr->m_labelsVisible!=visible) {
334	d_ptr->m_labelsVisible = visible;
335	emit d_ptr->labelsVisibleChanged(visible);
336	}
337	}
338
339	/*!
340	Returns the visibility of values
341	*/
342	bool QBarSet::labelsVisible() const
343	{
344	return d_ptr->m_labelsVisible;
345	}
346
347	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	327	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
348		328
349	QBarSetPrivate::QBarSetPrivate(const QString name, QBarSet *parent) : QObject(parent),	329	QBarSetPrivate::QBarSetPrivate(const QString name, QBarSet *parent) : QObject(parent),
350	q_ptr(parent),	330	q_ptr(parent),
351	m_name(name),	331	m_name(name)
352	m_labelsVisible(false)
353	{	332	{
354	}	333	}
355		334

src/barchart/qbarset.h +8 -11

                 void setName(const QString name);
                 QString name() const;
-                void append(const QPointF value);           // Appends bar with x-value
+                void append(const QPointF value);
-                void append(const QList<QPointF> values);   // Same with list
+                void append(const QList<QPointF> values);
-                void append(const qreal value);             // TODO: change so, that count becomes x-value
+                void append(const qreal value);
-                void append(const QList<qreal> values);     // Append list of values. Using index as x-value
+                void append(const QList<qreal> values);
-                QBarSet& operator << (const qreal &value);      // TODO: change implementations so, that count becomes x-value
+                QBarSet& operator << (const qreal &value);
-                QBarSet& operator << (const QPointF &value);    // Appends bar with x-value
+                QBarSet& operator << (const QPointF &value);
-                void insert(const int index, const qreal value); // TODO: internal reindexing (what happens, if there are points with real x values?)
+                void insert(const int index, const qreal value);
-                void remove(const int index);                    // TODO: internal reindexing (what happens, if there are points with real x values?)
+                void remove(const int index);
                 void replace(const int index, const qreal value);
                 QPointF at(const int index) const;
                 QPointF operator [] (const int index) const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
-                void setLabelsVisible(bool visible = true);
-                bool labelsVisible() const;
             Q_SIGNALS:
                 void clicked(QString category);
                 void hovered(bool status);

src/barchart/qbarset_p.h +3 -2

             #include "qbarset.h"
             #include <QMap>
+            #include <QPen>
+            #include <QBrush>
+            #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 void clicked(QString category);
                 void restructuredBars();
                 void updatedBars();
-                void labelsVisibleChanged(bool visible);
             public:
                 QBarSet * const q_ptr;
                 QPen m_labelPen;
                 QBrush m_labelBrush;
                 QFont m_labelFont;
-                bool m_labelsVisible;
                 friend class QBarSet;
             };

src/barchart/stackedbarchartitem.cpp +1 -2

             #include "stackedbarchartitem_p.h"
             #include "bar_p.h"
-            #include "barlabel_p.h"
             #include "qbarset_p.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
                         QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
                         layout.append(rect);
-                        BarLabel* label = m_labels.at(itemIndex);
+                        QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
                         if (!qFuzzyIsNull(barSet->at(category).y())) {
                             label->setText(QString::number(barSet->at(category).y()));

tests/auto/qbarseries/tst_qbarseries.cpp +8 -12

             void tst_QBarSeries::setLabelsVisible()
             {
                 // labels should be invisible by default
-                foreach (QBarSet* s, m_testSets) {
+                QVERIFY(m_barseries->isLabelsVisible() == false);
-                    QVERIFY(s->labelsVisible() == false);
+                QVERIFY(m_barseries_with_sets->isLabelsVisible() == false);
                 // turn labels to visible
                 m_barseries_with_sets->setLabelsVisible(true);
-                foreach (QBarSet* s, m_testSets) {
+                // TODO: test the signal
-                    QVERIFY(s->labelsVisible() == true);
+                QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
                 // turn labels to invisible
                 m_barseries_with_sets->setLabelsVisible(false);
-                foreach (QBarSet* s, m_testSets) {
+                // TODO: test the signal
-                    QVERIFY(s->labelsVisible() == false);
+                QVERIFY(m_barseries_with_sets->isLabelsVisible() == false);
                 // without parameter, should turn labels to visible
                 m_barseries_with_sets->setLabelsVisible();
-                foreach (QBarSet* s, m_testSets) {
+                // TODO: test the signal
-                    QVERIFY(s->labelsVisible() == true);
+                QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
             }
             void tst_QBarSeries::mouseclicked_data()

src/barchart/barlabel.cpp removed 0 -104

NO CONTENT: file was removed

src/barchart/barlabel_p.h removed 0 -70

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages