HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r874:fcf207f30c3f

Increses margins prescision

Michal Klocek -

r874:fcf207f30c3f

parent child

Context file:

r874:fcf207f30c3f

Collapse all files

src/chartpresenter_p.h +3 -3

                 void resetAllElements();
                 void createChartBackgroundItem();
                 void createChartTitleItem();
-                QRect margins() const { return m_chartMargins;}
+                QRectF margins() const { return m_chartMargins;}
             public Q_SLOTS:
                 void handleSeriesAdded(QSeries* series,Domain* domain);
                 int m_marginBig;
                 int m_marginSmall;
                 int m_marginTiny;
-                QRect m_chartMargins;
+                QRectF m_chartMargins;
-                QRect m_legendMargins;
+                QRectF m_legendMargins;
             };

src/qchart.cpp +1 -1

                 return d_ptr->m_legend;
             }
-            QRect QChart::margins() const
+            QRectF QChart::margins() const
             {
                 return d_ptr->m_presenter->margins();
             }

src/qchart.h +2 -1

                 QFont titleFont() const;
                 void setTitleBrush(const QBrush &brush);
                 QBrush titleBrush() const;
                 void setBackgroundBrush(const QBrush &brush);
                 QBrush backgroundBrush() const;
                 void setBackgroundPen(const QPen &pen);
                 QChartAxis* axisY() const;
                 QLegend* legend() const;
-                QRect margins() const;
+                QRectF margins() const;
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);

src/qchartview.cpp +3 -2

             void QChartView::mouseMoveEvent(QMouseEvent *event)
             {
                 if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isVisible()) {
-                    int padding = d_ptr->m_chart->margins().top();
+                    QRectF margins = d_ptr->m_chart->margins();
-                    QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);
+                    QRectF geometry = d_ptr->m_chart->geometry();
+                    QRectF rect =geometry.adjusted(margins.left(),margins.top(),-margins.right(),-margins.bottom());
                     int width = event->pos().x() - d_ptr->m_rubberBandOrigin.x();
                     int height = event->pos().y() - d_ptr->m_rubberBandOrigin.y();
                     if (!d_ptr->m_rubberBandFlags.testFlag(VerticalRubberBand)) {

test/auto/qchartview/tst_qchartview.cpp +9 -6

             #include <QtTest/QtTest>
             #include <qchartview.h>
             #include <qlineseries.h>
+            #include <qlegend.h>
             #include <cmath>
             QTCOMMERCIALCHART_USE_NAMESPACE
             void tst_QChartView::init()
             {
                 m_view = new QChartView(new QChart());
+                m_view->chart()->legend()->setVisible(false);
             }
             void tst_QChartView::cleanup()
                 QFETCH(int, maxY);
                 m_view->setRubberBand(rubberBand);
-                QRect padding = m_view->chart()->margins();
+                QRectF padding = m_view->chart()->margins();
                 QCOMPARE(m_view->rubberBand(), rubberBand);
                 QLineSeries* line = new QLineSeries();
                 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal, qreal)));
                 QTest::qWaitForWindowShown(m_view);
-                QTest::mouseMove(m_view->viewport(),  QPoint(minX, minY) + padding.topLeft());
+                QTest::mouseMove(m_view->viewport(),  QPoint(minX, minY) + padding.topLeft().toPoint());
-                QTest::mousePress(m_view->viewport(), Qt::LeftButton, 0,  QPoint(minX, minY) + padding.topLeft());
+                QTest::mousePress(m_view->viewport(), Qt::LeftButton, 0,  QPoint(minX, minY) + padding.topLeft().toPoint());
-                QTest::mouseMove(m_view->viewport(), QPoint(maxX, maxY) + padding.topLeft());
+                QTest::mouseMove(m_view->viewport(), QPoint(maxX, maxY) + padding.topLeft().toPoint());
-                QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, 0, QPoint(maxX, maxY)+ padding.topLeft());
+                QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, 0, QPoint(maxX, maxY)+ padding.topLeft().toPoint());
                 QCOMPARE(spy0.count(), Xcount);
                 QCOMPARE(spy1.count(), Ycount);
                 QFETCH(int, Xcount);
                 QFETCH(int, Ycount);
-                QRect padding = m_view->chart()->margins();
+                QRectF padding = m_view->chart()->margins();
                 QLineSeries* line = new QLineSeries();
                 *line << QPointF(0, 0) << QPointF(100, 100);

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