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

              #include "plotdomain_p.h"
              #include "axisitem_p.h"
              #include <QGraphicsScene>
+             #include <QGraphicsSceneResizeEvent>
              #include <QDebug>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             QChart::QChart(QGraphicsObject* parent) : QGraphicsObject(parent),
+             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
                  m_backgroundItem(0),
                  m_titleItem(0),
                  m_axisXItem(new AxisItem(AxisItem::X_AXIS, this)),
                  return series;
              }
-             void QChart::setSize(const QSize& size)
+             {
-                 m_rect = QRect(QPoint(0,0),size);
-                 QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
-                 // recalculate title position
-                 if (m_titleItem) {
-                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
-                     m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
+                 }
-                 //recalculate background gradient
-                 if (m_backgroundItem) {
-                     m_backgroundItem->setRect(rect);
-                     if (m_bacgroundOrinetation == HorizonatlGradientOrientation)
-                         m_backgroundGradient.setFinalStop(m_backgroundItem->rect().width(), 0);
-                     else
-                         m_backgroundGradient.setFinalStop(0, m_backgroundItem->rect().height());
-                     m_backgroundItem->setBrush(m_backgroundGradient);
+                 }
-                 // resize and reposition childs
-                 foreach (ChartItem *item, m_chartItems) {
-                     item->setPos(rect.topLeft());
-                     item->setSize(rect.size());
+                 }
-                 update();
+             }
              void QChart::setBackground(const QColor& startColor, const QColor& endColor, GradientOrientation orientation)
              {
                  update();
              }
-             void QChart::zoomInToRect(const QRect& rectangle)
+             void QChart::zoomInToRect(const QRectF& rectangle)
              {
                  if(!rectangle.isValid()) return;
                  qreal margin = this->margin();
-                 QRect rect = rectangle.normalized();
+                 QRectF rect = rectangle.normalized();
                  rect.translate(-margin, -margin);
                  PlotDomain& oldDomain = m_plotDomainList[m_plotDataIndex];
                          item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                      update();
                  } else {
-                     QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
+                     QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                      rect.setWidth(rect.width()/2);
                      rect.setHeight(rect.height()/2);
                      rect.moveCenter(m_rect.center());
                  item->setVisible(axis.isAxisVisible());
              }
+             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
+             {
+                 m_rect = QRectF(QPoint(0,0),event->newSize());
+                 QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
+                 // recalculate title position
+                 if (m_titleItem) {
+                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
+                     m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
+                 }
+                 //recalculate background gradient
+                 if (m_backgroundItem) {
+                     m_backgroundItem->setRect(rect);
+                     if (m_bacgroundOrinetation == HorizonatlGradientOrientation)
+                     m_backgroundGradient.setFinalStop(m_backgroundItem->rect().width(), 0);
+                     else
+                     m_backgroundGradient.setFinalStop(0, m_backgroundItem->rect().height());
+                     m_backgroundItem->setBrush(m_backgroundGradient);
+                 }
+                 // resize and reposition childs
+                 foreach (ChartItem *item, m_chartItems) {
+                     item->setPos(rect.topLeft());
+                     item->setSize(rect.size());
+                 }
+                 update();
+             }
              #include "moc_qchart.cpp"
              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