HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r115:8cafc623ea10

Adds layout support for charts....

Michal Klocek -

r115:8cafc623ea10

parent child

Context file:

r115:8cafc623ea10

Expand all files

src/axisitem.cpp +1 -1

                 createItems();
             }
-            void AxisItem::setSize(const QSize &size)
+            void AxisItem::setSize(const QSizeF &size)
             {
                 m_rect = QRectF(QPoint(0,0),size);
                 createItems();

src/axisitem_p.h +1 -1

                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
             public: // from ChartItem
-                void setSize(const QSize &size);
+                void setSize(const QSizeF &size);
                 void setPlotDomain(const PlotDomain& data);
             public:

src/barchart/bar.cpp +1 -1

             {
             }
-            void Bar::setSize(const QSize& size)
+            void Bar::setSize(const QSizeF& size)
             {
                 mWidth = size.width();
                 mHeight = size.height();

src/barchart/bar.h +1 -1

                 Bar(QGraphicsItem *parent=0);
             public: // from ChartItem
-                void setSize(const QSize &size);
+                void setSize(const QSizeF &size);
                 void setPlotDomain(const PlotDomain& data);
                 // Layout Stuff

src/barchart/bargroup.cpp +1 -1

                 dataChanged();
             }
-            void BarGroup::setSize(const QSize& size)
+            void BarGroup::setSize(const QSizeF& size)
             {
                 qDebug() << "BarGroup::setSize";
                 mWidth = size.width();

src/barchart/bargroup.h +1 -1

                 explicit BarGroup(BarChartSeries& series, QGraphicsItem *parent = 0);
             public: // from ChartItem
-                void setSize(const QSize &size);
+                void setSize(const QSizeF &size);
                 void setPlotDomain(const PlotDomain& data);
                 // Layout "api"

src/barchart/percentbargroup.cpp +1 -1

             }
-            void PercentBarGroup::setSize(const QSize& size)
+            void PercentBarGroup::setSize(const QSizeF& size)
             {
             //    qDebug() << "PercentBarGroup::setSize";
                 mWidth = size.width();

src/barchart/percentbargroup.h +1 -1

                 PercentBarGroup(PercentBarChartSeries& series, QGraphicsItem *parent = 0);
             public: // From ChartItem
-                void setSize(const QSize &size);
+                void setSize(const QSizeF &size);
                 void setPlotDomain(const PlotDomain& data);
             public:

src/barchart/stackedbargroup.cpp +1 -1

             }
-            void StackedBarGroup::setSize(const QSize& size)
+            void StackedBarGroup::setSize(const QSizeF& size)
             {
             //    qDebug() << "StackedBarGroup::setSize";
                 mWidth = size.width();

src/barchart/stackedbargroup.h +1 -1

                 StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent = 0);
             public: // From ChartItem
-                void setSize(const QSize &size);
+                void setSize(const QSizeF &size);
                 void setPlotDomain(const PlotDomain& data);
                 // From ChartThemeObserver

src/chartitem_p.h +1 -1

             public:
                 ChartItem(QGraphicsItem* parent = 0):QGraphicsItem(parent){};
                 virtual ~ChartItem(){};
-                virtual void setSize(const QSize &size) = 0;
+                virtual void setSize(const QSizeF &size) = 0;
                 virtual void setPlotDomain(const PlotDomain& data) = 0;
             };

src/plotdomain.cpp +1 -1

             	return m_maxY - m_minY;
             }
-            PlotDomain PlotDomain::subDomain(const QRect& rect, qreal maxWidth,qreal maxHeight) const
+            PlotDomain PlotDomain::subDomain(const QRectF& rect, qreal maxWidth,qreal maxHeight) const
             {
               PlotDomain domain;

src/plotdomain_p.h +1 -1

             	qreal spanX() const;
             	qreal spanY() const;
-            	PlotDomain subDomain(const QRect& rect, qreal maxWidth, qreal maxHeight) const;
+            	PlotDomain subDomain(const QRectF& rect, qreal maxWidth, qreal maxHeight) const;
             public:

src/qchart.cpp +38 -34

@@ -19,11 +19,12
19	#include "plotdomain_p.h"	19	#include "plotdomain_p.h"
20	#include "axisitem_p.h"	20	#include "axisitem_p.h"
21	#include <QGraphicsScene>	21	#include <QGraphicsScene>
		22	#include <QGraphicsSceneResizeEvent>
22	#include <QDebug>	23	#include <QDebug>
23		24
24	QTCOMMERCIALCHART_BEGIN_NAMESPACE	25	QTCOMMERCIALCHART_BEGIN_NAMESPACE
25		26
26	QChart::QChart(QGraphics~~Object~~* ~~parent~~) : QGraphics~~Objec~~t(parent),	27	QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
27	m_backgroundItem(0),	28	m_backgroundItem(0),
28	m_titleItem(0),	29	m_titleItem(0),
29	m_axisXItem(new AxisItem(AxisItem::X_AXIS, this)),	30	m_axisXItem(new AxisItem(AxisItem::X_AXIS, this)),
@@ -226,36 +227,6 QChartSeries* QChart::createSeries(QChartSeries::QChartSeriesType type)
226	return series;	227	return series;
227	}	228	}
228		229
229	void QChart::setSize(const QSize& size)
230	{
231	m_rect = QRect(QPoint(0,0),size);
232	QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
233
234	// recalculate title position
235	if (m_titleItem) {
236	QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
237	m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
238	}
239
240	//recalculate background gradient
241	if (m_backgroundItem) {
242	m_backgroundItem->setRect(rect);
243	if (m_bacgroundOrinetation == HorizonatlGradientOrientation)
244	m_backgroundGradient.setFinalStop(m_backgroundItem->rect().width(), 0);
245	else
246	m_backgroundGradient.setFinalStop(0, m_backgroundItem->rect().height());
247	m_backgroundItem->setBrush(m_backgroundGradient);
248	}
249
250	// resize and reposition childs
251	foreach (ChartItem *item, m_chartItems) {
252	item->setPos(rect.topLeft());
253	item->setSize(rect.size());
254	}
255
256	update();
257	}
258
259	void QChart::setBackground(const QColor& startColor, const QColor& endColor, GradientOrientation orientation)	230	void QChart::setBackground(const QColor& startColor, const QColor& endColor, GradientOrientation orientation)
260	{	231	{
261		232
@@ -319,14 +290,14 void QChart::setTheme(QChart::ChartThemeId theme)
319	update();	290	update();
320	}	291	}
321		292
322	void QChart::zoomInToRect(const QRect& rectangle)	293	void QChart::zoomInToRect(const QRectF& rectangle)
323	{	294	{
324		295
325	if(!rectangle.isValid()) return;	296	if(!rectangle.isValid()) return;
326		297
327	qreal margin = this->margin();	298	qreal margin = this->margin();
328		299
329	QRect rect = rectangle.normalized();	300	QRectF rect = rectangle.normalized();
330	rect.translate(-margin, -margin);	301	rect.translate(-margin, -margin);
331		302
332	PlotDomain& oldDomain = m_plotDomainList[m_plotDataIndex];	303	PlotDomain& oldDomain = m_plotDomainList[m_plotDataIndex];
@@ -350,7 +321,7 void QChart::zoomIn()
350	item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);	321	item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
351	update();	322	update();
352	} else {	323	} else {
353	QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());	324	QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
354	rect.setWidth(rect.width()/2);	325	rect.setWidth(rect.width()/2);
355	rect.setHeight(rect.height()/2);	326	rect.setHeight(rect.height()/2);
356	rect.moveCenter(m_rect.center());	327	rect.moveCenter(m_rect.center());
@@ -397,6 +368,39 void QChart::setAxis(AxisItem *item, const QChartAxis& axis)
397	item->setVisible(axis.isAxisVisible());	368	item->setVisible(axis.isAxisVisible());
398	}	369	}
399		370
		371	void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
		372	{
		373
		374	m_rect = QRectF(QPoint(0,0),event->newSize());
		375	QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
		376
		377	// recalculate title position
		378	if (m_titleItem) {
		379	QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
		380	m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
		381	}
		382
		383	//recalculate background gradient
		384	if (m_backgroundItem) {
		385	m_backgroundItem->setRect(rect);
		386	if (m_bacgroundOrinetation == HorizonatlGradientOrientation)
		387	m_backgroundGradient.setFinalStop(m_backgroundItem->rect().width(), 0);
		388	else
		389	m_backgroundGradient.setFinalStop(0, m_backgroundItem->rect().height());
		390	m_backgroundItem->setBrush(m_backgroundGradient);
		391	}
		392
		393	// resize and reposition childs
		394	foreach (ChartItem *item, m_chartItems) {
		395	item->setPos(rect.topLeft());
		396	item->setSize(rect.size());
		397	}
		398
		399	update();
		400	}
		401
		402
		403
400	#include "moc_qchart.cpp"	404	#include "moc_qchart.cpp"
401		405
402	QTCOMMERCIALCHART_END_NAMESPACE	406	QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +10 -6

             #include <qchartglobal.h>
             #include <qchartseries.h>
-            #include <QGraphicsObject>
+            #include <QGraphicsWidget>
             #include <QLinearGradient>
             #include <QFont>
+            class QGraphicsSceneResizeEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisItem;
             /*!
              * TODO: define the responsibilities
              */
-            class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsObject
+            class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                 };
             public:
-                QChart(QGraphicsObject* parent = 0);
+                QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
                 //from QGraphicsItem
                 // TODO: who owns the series now? maybe owned by chart and returned a reference instead...
                 QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
-                void setSize(const QSize& size);
                 void setMargin(int margin);
                 int margin() const;
                 void setTheme(QChart::ChartThemeId theme);
                 void setTitle(const QString& title,const QFont& font = QFont());
                 void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, GradientOrientation orientation = VerticalGradientOrientation);
-                void zoomInToRect(const QRect& rectangle);
+                void zoomInToRect(const QRectF& rectangle);
                 void zoomIn();
                 void zoomOut();
                 void zoomReset();
                 void setAxisY(const QChartAxis& axis);
                 void setAxisY(const QList<QChartAxis>& axis);
+            protected:
+                void resizeEvent(QGraphicsSceneResizeEvent *event);
             private:
                 void setAxis(AxisItem *item, const QChartAxis& axis);
                 QGraphicsTextItem* m_titleItem;
                 AxisItem* m_axisXItem;
                 QList<AxisItem*> m_axisYItem;
-                QRect m_rect;
+                QRectF m_rect;
                 QList<QChartSeries *> m_chartSeries;
                 QList<ChartItem *> m_chartItems;
                 QVector<PlotDomain> m_plotDomainList;

src/qchartview.cpp +1 -1

             void QChartView::resizeEvent(QResizeEvent *event)
             {
                 m_scene->setSceneRect(0,0,size().width(),size().height());
-                m_chart->setSize(size());
+                m_chart->resize(size());
                 QWidget::resizeEvent(event);
             }

src/qchartwidget.cpp +1 -1

             void QChartWidget::resizeEvent(QResizeEvent *event)
             {
                 m_scene->setSceneRect(0,0,size().width(),size().height());
-                m_chart->setSize(size());
+                m_chart->resize(size());
                 QWidget::resizeEvent(event);
             }

src/qpieseries.cpp +1 -1

                 return true;
             }
-            void QPieSeriesPrivate::setSize(const QSize &size)
+            void QPieSeriesPrivate::setSize(const QSizeF &size)
             {
                 // TODO: allow user setting the size?
                 // TODO: allow user defining the margins?

src/qpieseries_p.h +1 -1

                 ~QPieSeriesPrivate();
             public: // from ChartItem
-                void setSize(const QSize &size);
+                void setSize(const QSizeF &size);
                 void setPlotDomain(const PlotDomain& data);
                 // This is a dummy QGraphicsItem; dummy implementation
                 QRectF boundingRect() const { return parentItem()->boundingRect(); }

src/qscatterseries.cpp +1 -1

                 }
             }
-            void QScatterSeriesPrivate::setSize(const QSize &size)
+            void QScatterSeriesPrivate::setSize(const QSizeF &size)
             {
             //    m_boundingRect = QRectF(pos().x(), pos().y(), size.width(), size.height());
                 m_boundingRect = QRectF(0, 0, size.width(), size.height());

src/qscatterseries_p.h +1 -1

                 QScatterSeriesPrivate(QGraphicsItem *parent);
             public: // from ChartObjectInterface
-                void setSize(const QSize &size);
+                void setSize(const QSizeF &size);
                 void setPlotDomain(const PlotDomain& data);
             public: // from ChartThemeObserver

src/xylinechart/xylinechartitem.cpp +1 -1

                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
             }
-            void XYLineChartItem::setSize(const QSize &size)
+            void XYLineChartItem::setSize(const QSizeF &size)
             {
                 m_rect = QRect(0, 0, size.width(), size.height());
                 prepareGeometryChange();

src/xylinechart/xylinechartitem_p.h +1 -1

                // virtual QPainterPath shape() const;
             public: // from ChartItem
-                void setSize(const QSize &size);
+                void setSize(const QSizeF &size);
                 void setPlotDomain(const PlotDomain& data);
             private:

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