HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r811:04debc5ee52b

simple text item for barvalue

sauimone -

r811:04debc5ee52b

parent child

Context file:

r811:04debc5ee52b

Collapse all files

src/barchart/barchartitem.cpp +3 -4

                         BarValue* value = m_floatingValues.at(itemIndex);
                         QBarSet* barSet = m_series->barsetAt(set);
-                        value->resize(100, 50);  // TODO: proper layout for this.
-                        value->setPos(xPos, yPos-barHeight / 2);
-                        value->setPen(barSet->floatingValuePen());
                         if (!qFuzzyIsNull(m_series->valueAt(set,category))) {
                             value->setText(QString::number(m_series->valueAt(set, category)));
                             value->setText(QString(""));
                         }
+                        value->setPos(xPos, yPos-barHeight / 2);
+                        value->setPen(barSet->floatingValuePen());
                         itemIndex++;
                         xPos += barWidth;
                     }
                 update();
             }
             void BarChartItem::showToolTip(QPoint pos, QString tip)
             {
                 // TODO: cool tooltip instead of default

src/barchart/barchartitem_p.h 0 -1

             #include "qbarseries.h"
             #include <QPen>
             #include <QBrush>
-            #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/barchart/barvalue.cpp +17 -22

             #include "barvalue_p.h"
             #include <QPainter>
             #include <QPen>
+            #include <QGraphicsSimpleTextItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarValue::BarValue(QBarSet &set, QGraphicsItem *parent)
+            BarValue::BarValue(QBarSet &set, QGraphicsItem *parent) : QGraphicsObject(parent),
-                : QGraphicsObject(parent),
                 m_barSet(set),
-                m_xPos(0),
+                m_textItem(new QGraphicsSimpleTextItem(this))
-                m_yPos(0),
-                m_width(0),
-                m_height(0)
             {
                 setVisible(false);
             }
             void BarValue::setText(QString str)
             {
-                m_valueString = str;
+                m_textItem->setText(str);
             }
             QString BarValue::text() const
             {
-                return m_valueString;
+                return m_textItem->text();
             }
             void BarValue::setPen(const QPen &pen)
             {
-                m_pen = pen;
+                m_textItem->setPen(pen);
             }
             QPen BarValue::pen() const
             {
-                return m_pen;
+                return m_textItem->pen();
             }
-            void BarValue::resize(qreal w, qreal h)
+            void BarValue::setFont(const QFont &font)
             {
-                m_width = w;
+                m_textItem->setFont(font);
-                m_height = h;
+            QFont BarValue::font() const
+            {
+                return m_textItem->font();
             }
             void BarValue::setPos(qreal x, qreal y)
             {
-                m_xPos = x;
+                m_textItem->setPos(x,y);
-                m_yPos = y;
             }
             void BarValue::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
-                if (isVisible()) {
-                    painter->setPen(m_pen);
-                    painter->drawText(boundingRect(), m_valueString);
             }
             QRectF BarValue::boundingRect() const
             {
-                QRectF r(m_xPos, m_yPos, m_width, m_height);
+                return m_textItem->boundingRect();
-                return r;
             }
             void BarValue::toggleVisible()
             {
+                qDebug() << "toggle visible";
                 setVisible(!isVisible());
             }

src/barchart/barvalue_p.h +5 -8

             #include "qchartglobal.h"
             #include <QGraphicsObject>
             #include <QPen>
+            class QGraphicsSimpleTextItem;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 void setPen(const QPen &pen);
                 QPen pen() const;
-                void resize(qreal w, qreal h);
+                void setFont(const QFont &font);
+                QFont font() const;
                 void setPos(qreal x, qreal y);
                 // From QGraphicsItem
             private:
                 QBarSet &m_barSet;
-                QPen m_pen;
+                QGraphicsSimpleTextItem *m_textItem;
-                QString m_valueString;
-                qreal m_xPos;
-                qreal m_yPos;
-                qreal m_width;
-                qreal m_height;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarchartitem.cpp +3 -3

                         BarValue* value = m_floatingValues.at(itemIndex);
                         QBarSet* barSet = m_series->barsetAt(set);
-                        value->resize(100, 50);  // TODO: proper layout for this.
-                        value->setPos(xPos, yPos-barHeight / 2);
-                        value->setPen(barSet->floatingValuePen());
                         if (!qFuzzyIsNull(m_series->valueAt(set,category))) {
                             int p = m_series->percentageAt(set,category) * 100;
                             value->setText(QString(""));
                         }
+                        value->setPos(xPos, yPos-barHeight / 2);
+                        value->setPen(barSet->floatingValuePen());
                         itemIndex++;
                         yPos -= barHeight;
                     }

src/barchart/stackedbarchartitem.cpp +3 -3

                         BarValue* value = m_floatingValues.at(itemIndex);
                         QBarSet* barSet = m_series->barsetAt(set);
-                        value->resize(100, 50);  // TODO: proper layout for this.
-                        value->setPos(xPos, yPos-barHeight / 2);
-                        value->setPen(barSet->floatingValuePen());
                         if (!qFuzzyIsNull(m_series->valueAt(set, category))) {
                             value->setText(QString::number(m_series->valueAt(set,category)));
                             value->setText(QString(""));
                         }
+                        value->setPos(xPos, yPos-barHeight / 2);
+                        value->setPen(barSet->floatingValuePen());
                         itemIndex++;
                         yPos -= barHeight;
                     }

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