HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/boxplotchart/boxplotchartitem.cpp

clean up INCLUDEPATH handling...

clean up INCLUDEPATH handling in the c++ module, the .pri files add their directories, so there is no point in a centralized common.pri doing it again. the qml plugin doesn't need to add any paths from the c++ module explicitly, as the QT+=charts-private implies that already. Change-Id: I263dd702e9874e4d6188ca7251a482d0df4e570b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2845:ae12522d475c


                r2886:4c015da23a8e

Download file

             boxplotchartitem.cpp
        
                    223 lines
            
             | 7.5 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / boxplotchart / boxplotchartitem.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Titta Heikkala
    
Updated license headers...

              r2845
            
      /******************************************************************************

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Copyright (C) 2015 The Qt Company Ltd.

      ** Contact: http://www.qt.io/licensing/

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** This file is part of the Qt Charts module.

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_BEGIN_LICENSE:COMM$

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

      ** and conditions see http://www.qt.io/terms-conditions. For further

      ** information use the contact form at http://www.qt.io/contact-us.

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

      ******************************************************************************/

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/boxplotchartitem_p.h>

      #include <private/qboxplotseries_p.h>

      #include <private/bar_p.h>

      #include <private/qboxset_p.h>

      #include <private/qabstractbarseries_p.h>

      #include <QtCharts/QBoxSet>

      #include <private/boxwhiskers_p.h>

      #include <QtGui/QPainter>

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      BoxPlotChartItem::BoxPlotChartItem(QBoxPlotSeries *series, QGraphicsItem *item) :

          ChartItem(series->d_func(), item),

          m_series(series),

        Miikka Heikkinen
    
Fix box-and-whiskers animations...

              r2560
            
          m_animation(0)

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      {

          connect(series, SIGNAL(boxsetsRemoved(QList<QBoxSet *>)), this, SLOT(handleBoxsetRemove(QList<QBoxSet *>)));

          connect(series->d_func(), SIGNAL(restructuredBoxes()), this, SLOT(handleDataStructureChanged()));

          connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));

          connect(series->d_func(), SIGNAL(updatedBoxes()), this, SLOT(handleUpdatedBars()));

          connect(series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdatedBars()));

          // QBoxPlotSeriesPrivate calls handleDataStructureChanged(), don't do it here

          setZValue(ChartPresenter::BoxPlotSeriesZValue);

      }

      BoxPlotChartItem::~BoxPlotChartItem()

      {

      }

      void BoxPlotChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)

      {

          Q_UNUSED(painter);

          Q_UNUSED(option);

          Q_UNUSED(widget);

      }

      void BoxPlotChartItem::setAnimation(BoxPlotAnimation *animation)

      {

          m_animation = animation;

          if (m_animation) {

              foreach (BoxWhiskers *item, m_boxTable.values())

                  m_animation->addBox(item);

              handleDomainUpdated();

          }

      }

      void BoxPlotChartItem::handleDataStructureChanged()

      {

          int setCount = m_series->count();

          for (int s = 0; s < setCount; s++) {

              QBoxSet *set = m_series->d_func()->boxSetAt(s);

              BoxWhiskers *box = m_boxTable.value(set);

              if (!box) {

                  // Item is not yet created, make a box and add it to hash table

                  box = new BoxWhiskers(set, domain(), this);

                  m_boxTable.insert(set, box);

                  connect(box, SIGNAL(clicked(QBoxSet *)), m_series, SIGNAL(clicked(QBoxSet *)));

                  connect(box, SIGNAL(hovered(bool, QBoxSet *)), m_series, SIGNAL(hovered(bool, QBoxSet *)));

        Titta Heikkala
    
Add pressed, released and doubleClicked signals...

              r2739
            
                  connect(box, SIGNAL(pressed(QBoxSet *)), m_series, SIGNAL(pressed(QBoxSet *)));

                  connect(box, SIGNAL(released(QBoxSet *)), m_series, SIGNAL(released(QBoxSet *)));

                  connect(box, SIGNAL(doubleClicked(QBoxSet *)),

                          m_series, SIGNAL(doubleClicked(QBoxSet *)));

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
                  connect(box, SIGNAL(clicked(QBoxSet *)), set, SIGNAL(clicked()));

                  connect(box, SIGNAL(hovered(bool, QBoxSet *)), set, SIGNAL(hovered(bool)));

        Titta Heikkala
    
Add pressed, released and doubleClicked signals...

              r2739
            
                  connect(box, SIGNAL(pressed(QBoxSet *)), set, SIGNAL(pressed()));

                  connect(box, SIGNAL(released(QBoxSet *)), set, SIGNAL(released()));

                  connect(box, SIGNAL(doubleClicked(QBoxSet *)), set, SIGNAL(doubleClicked()));

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
                  // Set the decorative issues for the newly created box

        Titta Heikkala
    
Fix QBoxSet color setting...

              r2675
            
                  // so that the brush and pen already defined for the set are kept.

                  if (set->brush() == Qt::NoBrush)

                      box->setBrush(m_series->brush());

                  else

                      box->setBrush(set->brush());

                  if (set->pen() == Qt::NoPen)

                      box->setPen(m_series->pen());

                  else

                      box->setPen(set->pen());

        Mika Salmela
    
Selectable outlines for box...

              r2573
            
                  box->setBoxOutlined(m_series->boxOutlineVisible());

        Mika Salmela
    
Property to control box width...

              r2584
            
                  box->setBoxWidth(m_series->boxWidth());

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
              }

              updateBoxGeometry(box, s);

        Mika Salmela
    
Changed BoxPlot to use domain for calculating geometry points....

              r2554
            
              box->updateGeometry(domain());

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
              if (m_animation)

                  m_animation->addBox(box);

          }

          handleDomainUpdated();

      }

      void BoxPlotChartItem::handleUpdatedBars()

      {

          foreach (BoxWhiskers *item, m_boxTable.values()) {

              item->setBrush(m_series->brush());

              item->setPen(m_series->pen());

        Mika Salmela
    
Selectable outlines for box...

              r2573
            
              item->setBoxOutlined(m_series->boxOutlineVisible());

        Mika Salmela
    
Property to control box width...

              r2584
            
              item->setBoxWidth(m_series->boxWidth());

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
          }

          // Override with QBoxSet specific settings

          foreach (QBoxSet *set, m_boxTable.keys()) {

              if (set->brush().style() != Qt::NoBrush)

                  m_boxTable.value(set)->setBrush(set->brush());

              if (set->pen().style() != Qt::NoPen)

                  m_boxTable.value(set)->setPen(set->pen());

          }

      }

      void BoxPlotChartItem::handleBoxsetRemove(QList<QBoxSet*> barSets)

      {

          foreach (QBoxSet *set, barSets) {

              BoxWhiskers *boxItem = m_boxTable.value(set);

              m_boxTable.remove(set);

              delete boxItem;

          }

      }

      void BoxPlotChartItem::handleDomainUpdated()

      {

          if ((domain()->size().width() <= 0) || (domain()->size().height() <= 0))

              return;

        Mika Salmela
    
Changed BoxPlot to use domain for calculating geometry points....

              r2554
            
          // Set my bounding rect to same as domain size. Add one pixel at the top (-1.0) and the bottom as 0.0 would

          // snip a bit off from the whisker at the grid line

          m_boundingRect.setRect(0.0, -1.0, domain()->size().width(), domain()->size().height() + 1.0);

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
          foreach (BoxWhiskers *item, m_boxTable.values()) {

        Mika Salmela
    
Changed BoxPlot to use domain for calculating geometry points....

              r2554
            
              item->updateGeometry(domain());

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
              // If the animation is set, start the animation for each BoxWhisker item

              if (m_animation)

                  presenter()->startAnimation(m_animation->boxAnimation(item));

          }

      }

      void BoxPlotChartItem::handleLayoutChanged()

      {

          foreach (BoxWhiskers *item, m_boxTable.values()) {

              if (m_animation)

                  m_animation->setAnimationStart(item);

        Mika Salmela
    
Property to control box width...

              r2584
            
              item->setBoxWidth(m_series->boxWidth());

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
              bool dirty = updateBoxGeometry(item, item->m_data.m_index);

              if (dirty && m_animation)

                  presenter()->startAnimation(m_animation->boxChangeAnimation(item));

              else

        Mika Salmela
    
Changed BoxPlot to use domain for calculating geometry points....

              r2554
            
                  item->updateGeometry(domain());

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
          }

      }

      QRectF BoxPlotChartItem::boundingRect() const

      {

          return m_boundingRect;

      }

      void BoxPlotChartItem::initializeLayout()

      {

      }

      QVector<QRectF> BoxPlotChartItem::calculateLayout()

      {

          return QVector<QRectF>();

      }

      bool BoxPlotChartItem::updateBoxGeometry(BoxWhiskers *box, int index)

      {

          bool changed = false;

          QBoxSet *set = m_series->d_func()->boxSetAt(index);

          BoxWhiskersData &data = box->m_data;

          if ((data.m_lowerExtreme != set->at(0)) || (data.m_lowerQuartile != set->at(1)) ||

              (data.m_median != set->at(2)) || (data.m_upperQuartile != set->at(3)) || (data.m_upperExtreme != set->at(4))) {

              changed = true;

          }

          data.m_lowerExtreme = set->at(0);

          data.m_lowerQuartile = set->at(1);

          data.m_median = set->at(2);

          data.m_upperQuartile = set->at(3);

          data.m_upperExtreme = set->at(4);

          data.m_index = index;

          data.m_boxItems = m_series->count();

          data.m_maxX = domain()->maxX();

          data.m_minX = domain()->minX();

          data.m_maxY = domain()->maxY();

          data.m_minY = domain()->minY();

          data.m_seriesIndex = m_seriesIndex;

          data.m_seriesCount = m_seriesCount;

          return changed;

      }

      #include "moc_boxplotchartitem_p.cpp"

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

	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

Titta Heikkala Updated license headers...	r2845	/******************************************************************************
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
Titta Heikkala Updated license headers...	r2845	** Copyright (C) 2015 The Qt Company Ltd.
		** Contact: http://www.qt.io/licensing/
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
Titta Heikkala Updated license headers...	r2845	** $QT_BEGIN_LICENSE:COMM$
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
		** and conditions see http://www.qt.io/terms-conditions. For further
		** information use the contact form at http://www.qt.io/contact-us.
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
		******************************************************************************/
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
Titta Heikkala Fix include syntax...	r2714	#include <private/boxplotchartitem_p.h>
		#include <private/qboxplotseries_p.h>
		#include <private/bar_p.h>
		#include <private/qboxset_p.h>
		#include <private/qabstractbarseries_p.h>
		#include <QtCharts/QBoxSet>
		#include <private/boxwhiskers_p.h>
		#include <QtGui/QPainter>
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		BoxPlotChartItem::BoxPlotChartItem(QBoxPlotSeries series, QGraphicsItem item) :
		ChartItem(series->d_func(), item),
		m_series(series),
Miikka Heikkinen Fix box-and-whiskers animations...	r2560	m_animation(0)
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	{
		connect(series, SIGNAL(boxsetsRemoved(QList<QBoxSet >)), this, SLOT(handleBoxsetRemove(QList<QBoxSet >)));
		connect(series->d_func(), SIGNAL(restructuredBoxes()), this, SLOT(handleDataStructureChanged()));
		connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));
		connect(series->d_func(), SIGNAL(updatedBoxes()), this, SLOT(handleUpdatedBars()));
		connect(series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdatedBars()));
		// QBoxPlotSeriesPrivate calls handleDataStructureChanged(), don't do it here
		setZValue(ChartPresenter::BoxPlotSeriesZValue);
		}

		BoxPlotChartItem::~BoxPlotChartItem()
		{
		}

		void BoxPlotChartItem::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
		{
		Q_UNUSED(painter);
		Q_UNUSED(option);
		Q_UNUSED(widget);
		}

		void BoxPlotChartItem::setAnimation(BoxPlotAnimation *animation)
		{
		m_animation = animation;
		if (m_animation) {
		foreach (BoxWhiskers *item, m_boxTable.values())
		m_animation->addBox(item);
		handleDomainUpdated();
		}
		}

		void BoxPlotChartItem::handleDataStructureChanged()
		{
		int setCount = m_series->count();

		for (int s = 0; s < setCount; s++) {
		QBoxSet *set = m_series->d_func()->boxSetAt(s);

		BoxWhiskers *box = m_boxTable.value(set);
		if (!box) {
		// Item is not yet created, make a box and add it to hash table
		box = new BoxWhiskers(set, domain(), this);
		m_boxTable.insert(set, box);
		connect(box, SIGNAL(clicked(QBoxSet )), m_series, SIGNAL(clicked(QBoxSet )));
		connect(box, SIGNAL(hovered(bool, QBoxSet )), m_series, SIGNAL(hovered(bool, QBoxSet )));
Titta Heikkala Add pressed, released and doubleClicked signals...	r2739	connect(box, SIGNAL(pressed(QBoxSet )), m_series, SIGNAL(pressed(QBoxSet )));
		connect(box, SIGNAL(released(QBoxSet )), m_series, SIGNAL(released(QBoxSet )));
		connect(box, SIGNAL(doubleClicked(QBoxSet *)),
		m_series, SIGNAL(doubleClicked(QBoxSet *)));
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	connect(box, SIGNAL(clicked(QBoxSet *)), set, SIGNAL(clicked()));
		connect(box, SIGNAL(hovered(bool, QBoxSet *)), set, SIGNAL(hovered(bool)));
Titta Heikkala Add pressed, released and doubleClicked signals...	r2739	connect(box, SIGNAL(pressed(QBoxSet *)), set, SIGNAL(pressed()));
		connect(box, SIGNAL(released(QBoxSet *)), set, SIGNAL(released()));
		connect(box, SIGNAL(doubleClicked(QBoxSet *)), set, SIGNAL(doubleClicked()));
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		// Set the decorative issues for the newly created box
Titta Heikkala Fix QBoxSet color setting...	r2675	// so that the brush and pen already defined for the set are kept.
		if (set->brush() == Qt::NoBrush)
		box->setBrush(m_series->brush());
		else
		box->setBrush(set->brush());
		if (set->pen() == Qt::NoPen)
		box->setPen(m_series->pen());
		else
		box->setPen(set->pen());
Mika Salmela Selectable outlines for box...	r2573	box->setBoxOutlined(m_series->boxOutlineVisible());
Mika Salmela Property to control box width...	r2584	box->setBoxWidth(m_series->boxWidth());
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	}
		updateBoxGeometry(box, s);

Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	box->updateGeometry(domain());
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		if (m_animation)
		m_animation->addBox(box);
		}

		handleDomainUpdated();
		}

		void BoxPlotChartItem::handleUpdatedBars()
		{
		foreach (BoxWhiskers *item, m_boxTable.values()) {
		item->setBrush(m_series->brush());
		item->setPen(m_series->pen());
Mika Salmela Selectable outlines for box...	r2573	item->setBoxOutlined(m_series->boxOutlineVisible());
Mika Salmela Property to control box width...	r2584	item->setBoxWidth(m_series->boxWidth());
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	}
		// Override with QBoxSet specific settings
		foreach (QBoxSet *set, m_boxTable.keys()) {
		if (set->brush().style() != Qt::NoBrush)
		m_boxTable.value(set)->setBrush(set->brush());
		if (set->pen().style() != Qt::NoPen)
		m_boxTable.value(set)->setPen(set->pen());
		}
		}

		void BoxPlotChartItem::handleBoxsetRemove(QList<QBoxSet*> barSets)
		{
		foreach (QBoxSet *set, barSets) {
		BoxWhiskers *boxItem = m_boxTable.value(set);
		m_boxTable.remove(set);
		delete boxItem;
		}
		}

		void BoxPlotChartItem::handleDomainUpdated()
		{
		if ((domain()->size().width() <= 0) \|\| (domain()->size().height() <= 0))
		return;

Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	// Set my bounding rect to same as domain size. Add one pixel at the top (-1.0) and the bottom as 0.0 would
		// snip a bit off from the whisker at the grid line
		m_boundingRect.setRect(0.0, -1.0, domain()->size().width(), domain()->size().height() + 1.0);
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		foreach (BoxWhiskers *item, m_boxTable.values()) {
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	item->updateGeometry(domain());
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		// If the animation is set, start the animation for each BoxWhisker item
		if (m_animation)
		presenter()->startAnimation(m_animation->boxAnimation(item));
		}
		}

		void BoxPlotChartItem::handleLayoutChanged()
		{
		foreach (BoxWhiskers *item, m_boxTable.values()) {
		if (m_animation)
		m_animation->setAnimationStart(item);

Mika Salmela Property to control box width...	r2584	item->setBoxWidth(m_series->boxWidth());

Mika Salmela A new box-and-whiskers series type added to charts....	r2548	bool dirty = updateBoxGeometry(item, item->m_data.m_index);
		if (dirty && m_animation)
		presenter()->startAnimation(m_animation->boxChangeAnimation(item));
		else
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	item->updateGeometry(domain());
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	}
		}

		QRectF BoxPlotChartItem::boundingRect() const
		{
		return m_boundingRect;
		}

		void BoxPlotChartItem::initializeLayout()
		{
		}

		QVector<QRectF> BoxPlotChartItem::calculateLayout()
		{
		return QVector<QRectF>();
		}

		bool BoxPlotChartItem::updateBoxGeometry(BoxWhiskers *box, int index)
		{
		bool changed = false;

		QBoxSet *set = m_series->d_func()->boxSetAt(index);
		BoxWhiskersData &data = box->m_data;

		if ((data.m_lowerExtreme != set->at(0)) \|\| (data.m_lowerQuartile != set->at(1)) \|\|
		(data.m_median != set->at(2)) \|\| (data.m_upperQuartile != set->at(3)) \|\| (data.m_upperExtreme != set->at(4))) {
		changed = true;
		}

		data.m_lowerExtreme = set->at(0);
		data.m_lowerQuartile = set->at(1);
		data.m_median = set->at(2);
		data.m_upperQuartile = set->at(3);
		data.m_upperExtreme = set->at(4);
		data.m_index = index;
		data.m_boxItems = m_series->count();

		data.m_maxX = domain()->maxX();
		data.m_minX = domain()->minX();
		data.m_maxY = domain()->maxY();
		data.m_minY = domain()->minY();

		data.m_seriesIndex = m_seriesIndex;
		data.m_seriesCount = m_seriesCount;

		return changed;
		}

		#include "moc_boxplotchartitem_p.cpp"

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE