HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r839:27902acc0ab1

fixed clipping in barcharts

sauimone -

r839:27902acc0ab1

parent child

Context file:

r839:27902acc0ab1

Collapse all files

src/barchart/barchartitem.cpp +24 -12

              #include "chartpresenter_p.h"
              #include "chartanimator_p.h"
              #include "chartdataset_p.h"
-             #include <QDebug>
              #include <QToolTip>
+             #include <QPainter>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              BarChartItem::~BarChartItem()
              {
                  disconnect(this,SLOT(showToolTip(QPoint,QString)));
+                 deleteItems();
              }
              void BarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
                      return;
                  }
-                 foreach(QGraphicsItem* i, childItems())
-                     i->paint(painter,option,widget);
+                 painter->save();
+                 painter->setClipRect(m_clipRect);
+                 foreach (Bar *bar, m_bars)
+                     bar->paint(painter,option,widget);
+                 foreach (BarLabel* label, m_labels)
+                     label->paint(painter,option,widget);
+                 painter->restore();
              }
              QRectF BarChartItem::boundingRect() const
              {
-                 return m_rect;
+                 return m_rect.translated(-m_rect.topLeft());
+             //    return m_rect;
              }
              void BarChartItem::dataChanged()
              {
                  // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
-                 // Delete old bars
-                 foreach (QGraphicsItem *item, childItems())
-                     delete item;
+                 deleteItems();
                  m_bars.clear();
                  m_labels.clear();
                      QString category = m_series->categoryName(c);
                      for (int s = 0; s < m_series->barsetCount(); s++) {
                          QBarSet *set = m_series->barsetAt(s);
-                         Bar *bar = new Bar(category,this);
-                         childItems().append(bar);
+                         Bar *bar = new Bar(category,0);     // Null parent is best :)
                          m_bars.append(bar);
                          connect(bar, SIGNAL(clicked(QString,Qt::MouseButtons)), set, SIGNAL(clicked(QString,Qt::MouseButtons)));
                          connect(bar, SIGNAL(hoverEntered(QPoint)), set, SLOT(barHoverEnterEvent(QPoint)));
                  for (int category = 0; category < m_series->categoryCount(); category++) {
                      for (int s = 0; s < m_series->barsetCount(); s++) {
                          QBarSet *set = m_series->barsetAt(s);
-                         BarLabel *value = new BarLabel(*set, this);
-                         childItems().append(value);
+                         BarLabel *value = new BarLabel(*set, 0);
                          m_labels.append(value);
                          connect(set,SIGNAL(labelsVisibleChanged(bool)),value,SLOT(labelsVisibleChanged(bool)));
                      }
                          label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                        ,yPos - barHeight/2 - label->boundingRect().height()/2);
-             //            value->setFont(barSet->valueFont());
+                         label->setFont(barSet->labelFont());
                          itemIndex++;
                          xPos += barWidth;
                  update();
              }
+             void BarChartItem::deleteItems()
+             {
+                 foreach (Bar *bar, m_bars)
+                     delete bar;
+                 foreach (BarLabel* label, m_labels)
+                     delete label;
+             }
              //handlers
              void BarChartItem::handleModelChanged(int index)
              void BarChartItem::handleGeometryChanged(const QRectF &rect)
              {
+                 m_clipRect = rect.translated(-rect.topLeft());
                  m_rect = rect;
                  handleLayoutChanged();
                  m_layoutSet = true;

src/barchart/barchartitem_p.h +4 0

                  QRectF geometry() const { return m_rect;}
+             private:
+                 void deleteItems();
              public Q_SLOTS:
                  void handleModelChanged(int index);
                  void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                  qreal m_domainMaxY;
                  QRectF m_rect;
+                 QRectF m_clipRect;
                  bool m_layoutSet;    // True, if component has been laid out.
                  QVector<QRectF> m_layout;

src/barchart/percentbarchartitem.cpp +2 -3

              #include "bar_p.h"
              #include "barlabel_p.h"
              #include "qbarset.h"
-             #include <QDebug>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              {
                  QVector<QRectF> layout;
-                 // Use temporary qreals for accurancy (we might get some compiler warnings... :)
+                 // Use temporary qreals for accurancy
                  qreal width = geometry().width();
                  qreal height = geometry().height();
                          label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                        ,yPos - barHeight/2 - label->boundingRect().height()/2);
-             //            value->setFont(barSet->valueFont());
+                         label->setFont(barSet->labelFont());
                          itemIndex++;
                          yPos -= barHeight;
                      }

src/barchart/qbarseries.cpp +3 0

                  return categories;
              }
+             /*!
+                 Sets the visibility of labels in series to \a visible
+             */
              void QBarSeries::setLabelsVisible(bool visible)
              {
                  foreach (QBarSet* s, barSets()) {

src/barchart/qbarset.cpp +3 -3

              }
              /*!
-                 Sets pen of the values that are drawn on top of this barset
+                 Sets \a pen of the values that are drawn on top of this barset
              */
              void QBarSet::setLabelPen(const QPen &pen)
              {
              }
              /*!
-                 Sets brush of the values that are drawn on top of this barset
+                 Sets \a brush of the values that are drawn on top of this barset
              */
              void QBarSet::setLabelBrush(const QBrush &brush)
              {
              }
              /*!
-                 Sets the pen for values that are drawn on top of this barset
+                 Sets the \a font for values that are drawn on top of this barset
              */
              void QBarSet::setLabelFont(const QFont &font)
              {

src/barchart/stackedbarchartitem.cpp +5 -14

              #include "bar_p.h"
              #include "barlabel_p.h"
              #include "qbarset.h"
-             #include <QDebug>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              {
              }
-             StackedBarChartItem::~StackedBarChartItem()
+             {
+             }
              QVector<QRectF> StackedBarChartItem::calculateLayout()
              {
                  QVector<QRectF> layout;
-                 // Use temporary qreals for accurancy (we might get some compiler warnings... :)
+                 // Use temporary qreals for accurancy
-                 qreal maxSum = m_series->maxCategorySum();
                  // Domain:
-                 if (m_domainMaxY > maxSum) {
-                     maxSum = m_domainMaxY;
+                 }
+                 qreal range = m_domainMaxY - m_domainMinY;
                  qreal height = geometry().height();
                  qreal width = geometry().width();
-                 qreal scale = (height /  m_series->maxCategorySum());
+                 qreal scale = (height / range);
                  qreal categotyCount = m_series->categoryCount();
                  qreal barWidth = width / (categotyCount * 2);
                  qreal xStep = width / categotyCount;
                  int itemIndex(0);
                  for (int category = 0; category < categotyCount; category++) {
-                     qreal yPos = height;
+                     qreal yPos = height + scale * m_domainMinY;
                      for (int set=0; set < m_series->barsetCount(); set++) {
                          QBarSet* barSet = m_series->barsetAt(set);
                          label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                        ,yPos - barHeight/2 - label->boundingRect().height()/2);
-             //            value->setFont(barSet->valueFont());
+                         label->setFont(barSet->labelFont());
                          itemIndex++;
                          yPos -= barHeight;
                      }

src/barchart/stackedbarchartitem_p.h 0 -1

                  Q_OBJECT
              public:
                  StackedBarChartItem(QBarSeries *series, ChartPresenter *presenter);
-                 ~StackedBarChartItem();
              private:
                  // From BarChartItem

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