HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r976:727d6e49349d

barchart: layout calculation fix

sauimone -

r976:727d6e49349d

parent child

Context file:

r976:727d6e49349d

src/barchart/barchartitem.cpp +3 -5

             QRectF BarChartItem::boundingRect() const
             {
-                return m_rect.translated(-m_rect.topLeft());
+                return m_rect;
             }
             void BarChartItem::dataChanged()
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {
-                    qreal xPos = categoryWidth * category + barWidth / 2;
+                    qreal xPos = categoryWidth * category + barWidth / 2 + geometry().topLeft().x();
-                    qreal yPos = height + scale * m_domainMinY;
+                    qreal yPos = height + scale * m_domainMinY + geometry().topLeft().y();
                     for (int set = 0; set < setCount; set++) {
                         QBarSet* barSet = m_series->d_func()->barsetAt(set);
             void BarChartItem::handleGeometryChanged(const QRectF &rect)
             {
                 prepareGeometryChange();
-                m_clipRect = rect.translated(-rect.topLeft());
                 m_rect = rect;
                 handleLayoutChanged();
                 m_layoutSet = true;
-                setPos(rect.topLeft());
             }
             void BarChartItem::handleLayoutChanged()

src/barchart/barchartitem_p.h 0 -1

                 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 -2

                 qreal categoryCount = m_series->categoryCount();
                 qreal barWidth = width / (m_series->categoryCount() * 2);
                 qreal xStep = width / categoryCount;
-                qreal xPos =  xStep / 2 - barWidth / 2;
+                qreal xPos =  xStep / 2 - barWidth / 2 + geometry().topLeft().x();
                 qreal range = m_domainMaxY - m_domainMinY;
                 qreal domainScale = (height / range);
                 for (int category = 0; category < categoryCount; category++) {
                     qreal colSum = m_series->d_func()->categorySum(category);
                     qreal percentage = (100 / colSum);
-                    qreal yPos = height + domainScale * m_domainMinY;
+                    qreal yPos = height + domainScale * m_domainMinY + geometry().topLeft().y();
                     for (int set=0; set < m_series->barsetCount(); set++) {
                         QBarSet* barSet = m_series->d_func()->barsetAt(set);
                         qreal barHeight = barSet->valueAt(category) * percentage * domainScale;

src/barchart/stackedbarchartitem.cpp +2 -2

                 qreal categotyCount = m_series->categoryCount();
                 qreal barWidth = width / (categotyCount * 2);
                 qreal xStep = width / categotyCount;
-                qreal xPos = xStep / 2 - barWidth / 2;
+                qreal xPos = xStep / 2 - barWidth / 2 + geometry().topLeft().x();
                 int itemIndex(0);
                 for (int category = 0; category < categotyCount; category++) {
-                    qreal yPos = height + scale * m_domainMinY;
+                    qreal yPos = height + scale * m_domainMinY + geometry().topLeft().y();
                     for (int set=0; set < m_series->barsetCount(); set++) {
                         QBarSet* barSet = m_series->d_func()->barsetAt(set);

General Comments 0

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

No TODOs yet

	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