HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1890:daeb29af4a46

Adds checkLayout call, when geometry of axis updated

Michal Klocek -

r1890:daeb29af4a46

parent child

Context file:

r1890:daeb29af4a46

src/animations/axisanimation.cpp +1 0

                     Q_ASSERT(vector.count() != 0);
                     m_axis->setLayout(vector);
                     m_axis->updateGeometry();
+                    m_axis->checkLayout();
                 }
             }

src/axis/categoryaxis/chartcategoryaxisx.cpp +1 0

                     lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
                     lineItem->setLine(layout[i],m_rect.bottom(),layout[i], m_rect.bottom() + 5);
                 }
             }
             void ChartCategoryAxisX::handleAxisUpdated()

src/axis/categoryaxis/chartcategoryaxisy.cpp +1 0

                     lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
                     lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);
                 }
             }
             void ChartCategoryAxisY::handleAxisUpdated()

src/axis/chartaxis.cpp +13 0

             #include <qmath.h>
             #include <QDateTime>
             #include <QValueAxis>
+            #include <QGraphicsLayout>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 else {
                     setLayout(layout);
                     updateGeometry();
+                    checkLayout();
                 }
             }
                 }
             }
+            void ChartAxis::checkLayout()
+            {
+                if(m_minWidth > m_rect.width()) {
+                    presenter()->layout()->invalidate();
+                }
+                if(m_minHeight > m_rect.height()) {
+                    presenter()->layout()->invalidate();
+                }
+            }
             #include "moc_chartaxis_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartaxis_p.h +1 0

                 virtual void updateGeometry() = 0;
                 virtual QVector<qreal> calculateLayout() const = 0;
                 void createNumberLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
+                void checkLayout();
             public Q_SLOTS:
                 virtual void handleAxisUpdated();

src/axis/valueaxis/chartvalueaxisx.cpp +1 0

                     lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
                     lineItem->setLine(layout[i],m_rect.bottom(),layout[i],m_rect.bottom()+5);
                 }
             }
             void ChartValueAxisX::handleAxisUpdated()

src/axis/valueaxis/chartvalueaxisy.cpp +1 0

                     lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
                     lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);
                 }
             }
             void ChartValueAxisY::handleAxisUpdated()

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