HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2344:bf21d64b0d3d

Mapping functions added to QChart. Callout example updated

Marek Rosa -

r2344:bf21d64b0d3d

parent child

Context file:

r2344:bf21d64b0d3d

Collapse all files

examples/callout/callout.cpp +3 -3

                 QPointF anchor = mapFromParent(m_anchor);
                 QRectF rect;
                 rect.setLeft(qMin(m_textRect.left(), anchor.x()));
-                rect.setRight(qMax(m_textRect.right() + 4, anchor.x()));
+                rect.setRight(qMax(m_textRect.right() + 8, anchor.x()));
                 rect.setTop(qMin(m_textRect.top(), anchor.y()));
-                rect.setBottom(qMax(m_textRect.bottom() + 4, anchor.y()));
+                rect.setBottom(qMax(m_textRect.bottom() + 8, anchor.y()));
                 return rect;
             }
                 }
                 painter->setBrush(QColor(255, 255, 255));
                 painter->drawPath(path);
-                painter->drawText(m_textRect.adjusted(2, 2, 0, 0), m_text);
+                painter->drawText(m_textRect.adjusted(4, 4, 0, 0), m_text);
             }
             void Callout::mousePressEvent(QGraphicsSceneMouseEvent *event)

examples/callout/widget.cpp +4 -3

                     m_tooltip = new Callout(m_chart);
                 if (state) {
-                    m_tooltip->setText(QString("X: %1\nY: %2").arg(point.x()).arg(point.y()));
+                    m_tooltip->setText(QString("X: %1 \nY: %2 ").arg(point.x()).arg(point.y()));
-                    m_tooltip->setAnchor(m_chart->mapFromParent(m_view->mapToScene(m_view->mapFromGlobal(QCursor::pos()))));
+                    QXYSeries *series = qobject_cast<QXYSeries *>(sender());
-                    m_tooltip->setPos(m_chart->mapFromParent(m_view->mapToScene(m_view->mapFromGlobal(QCursor::pos() + QPoint(10, -50)))));
+                    m_tooltip->setAnchor(m_chart->mapToPosition(point, series));
+                    m_tooltip->setPos(m_chart->mapToPosition(point, series) + QPoint(10, -50));
                     m_tooltip->setZValue(11);
                     m_tooltip->show();
                 } else {

src/chartdataset.cpp +22 0

@@ -385,6 +385,28 void ChartDataSet::scrollDomain(qreal dx, qreal dy)
385	domain->blockRangeSignals(false);	385	domain->blockRangeSignals(false);
386	}	386	}
387		387
		388	QPointF ChartDataSet::mapToValue(const QPointF &position, QAbstractSeries *series)
		389	{
		390	QPointF point;
		391	if (series == 0 && !m_seriesList.isEmpty())
		392	series = m_seriesList.first();
		393
		394	if (series && m_seriesList.contains(series))
		395	point = series->d_ptr->m_domain->calculateDomainPoint(position);
		396	return point;
		397	}
		398
		399	QPointF ChartDataSet::mapToPosition(const QPointF &value, QAbstractSeries *series)
		400	{
		401	QPointF point = m_chart->plotArea().topLeft();
		402	if (series == 0 && !m_seriesList.isEmpty())
		403	series = m_seriesList.first();
		404
		405	if (series && m_seriesList.contains(series))
		406	point += series->d_ptr->m_domain->calculateGeometryPoint(value);
		407	return point;
		408	}
		409
388	QList<QAbstractAxis*> ChartDataSet::axes() const	410	QList<QAbstractAxis*> ChartDataSet::axes() const
389	{	411	{
390	return m_axisList;	412	return m_axisList;

src/chartdataset_p.h +3 0

                 void zoomOutDomain(const QRectF &rect);
                 void scrollDomain(qreal dx, qreal dy);
+                QPointF mapToValue(const QPointF &position, QAbstractSeries *series = 0);
+                QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = 0);
             Q_SIGNALS:
                 void axisAdded(QAbstractAxis* axis);
                 void axisRemoved(QAbstractAxis* axis);

src/qchart.cpp +23 -13

              */
             void QChart::zoomIn(const QRectF &rect)
             {
-            	d_ptr->zoomIn(rect);
+                d_ptr->zoomIn(rect);
             }
             /*!
                 foreach(QAbstractAxis* axis, axes){
                     if(axis->alignment()==Qt::AlignLeft){
-                       left=axis;
+                        left=axis;
                     }
                     if(axis->alignment()==Qt::AlignRight){
-                       right=axis;
+                        right=axis;
                     }
                 }
             */
             void QChart::setAxisX(QAbstractAxis *axis , QAbstractSeries *series)
             {
-               QList<QAbstractAxis*> list = axes(Qt::Horizontal,series);
+                QList<QAbstractAxis*> list = axes(Qt::Horizontal,series);
-               foreach(QAbstractAxis* a, list){
+                foreach(QAbstractAxis* a, list){
                     d_ptr->m_dataset->removeAxis(a);
                     delete a;
+                }
-               if(!d_ptr->m_dataset->axes().contains(axis))
+                if(!d_ptr->m_dataset->axes().contains(axis))
-                   d_ptr->m_dataset->addAxis(axis,Qt::AlignBottom);
+                    d_ptr->m_dataset->addAxis(axis,Qt::AlignBottom);
-               d_ptr->m_dataset->attachAxis(series,axis);
+                d_ptr->m_dataset->attachAxis(series,axis);
             }
             /*!
                 }
                 if(!d_ptr->m_dataset->axes().contains(axis))
-                      d_ptr->m_dataset->addAxis(axis,Qt::AlignLeft);
+                    d_ptr->m_dataset->addAxis(axis,Qt::AlignLeft);
                 d_ptr->m_dataset->attachAxis(series,axis);
             }
             void QChart::addAxis(QAbstractAxis *axis,Qt::Alignment aligment)
             {
-            	d_ptr->m_dataset->addAxis(axis,aligment);
+                d_ptr->m_dataset->addAxis(axis,aligment);
             }
             void QChart::removeAxis(QAbstractAxis *axis)
             {
-            	d_ptr->m_dataset->removeAxis(axis);
+                d_ptr->m_dataset->removeAxis(axis);
+            }
+            QPointF QChart::mapToValue(const QPointF &position, QAbstractSeries *series)
+            {
+                return d_ptr->m_dataset->mapToValue(position, series);
+            }
+            QPointF QChart::mapToPosition(const QPointF &value, QAbstractSeries *series)
+            {
+                return d_ptr->m_dataset->mapToPosition(value, series);
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             void QChartPrivate::zoomIn(const QRectF &rect)
             {
                 if (!rect.isValid())
-                return;
+                    return;
                 QRectF r = rect.normalized();
                 const QRectF geometry = m_presenter->geometry();

src/qchart.h +3 0

                 QRectF plotArea() const;
+                QPointF mapToValue(const QPointF &position, QAbstractSeries *series = 0);
+                QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = 0);
             protected:
                 QScopedPointer<QChartPrivate> d_ptr;
                 friend class QLegend;

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