HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/barchart/abstractbarchartitem.cpp

Qt5: declarative fix part1...

Qt5: declarative fix part1 - disabled demos examples and tests - disabled error on warning (QVector compilation issue: warning: dereferencing pointer '<anonymous>' does break strict-aliasing rules - disabled designer plugin - fixed the include files in plugins/declarative folder

Jani Honkonen - - Load All Authors

File last commit:

r1935:beaeb7cee6fe


                r2052:7140e4975cd3

Download file

             abstractbarchartitem.cpp
        
                    204 lines
            
             | 5.9 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / barchart / abstractbarchartitem.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
refactoring internal barchart items

              r1674
            
      /****************************************************************************

      **

      ** Copyright (C) 2012 Digia Plc

      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

      ** This file is part of the Qt Commercial Charts Add-on.

      **

      ** $QT_BEGIN_LICENSE$

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

      ** accordance with the Qt Commercial License Agreement provided with the

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

      ** a written agreement between you and Digia.

      **

      ** If you have questions regarding the use of this file, please use

      ** contact form at http://qt.digia.com

      ** $QT_END_LICENSE$

      **

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

      #include "abstractbarchartitem_p.h"

      #include "bar_p.h"

      #include "qbarset.h"

      #include "qbarset_p.h"

      #include "qabstractbarseries.h"

      #include "qabstractbarseries_p.h"

      #include "qchart.h"

      #include "chartpresenter_p.h"

        Michal Klocek
    
Refactor animator...

              r1735
            
      #include "charttheme_p.h"

        sauimone
    
refactoring internal barchart items

              r1674
            
      #include "abstractbaranimation_p.h"

      #include "chartdataset_p.h"

      #include <QPainter>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) :

          ChartItem(presenter),

          m_animation(0),

          m_series(series)

      {

        sauimone
    
fix: changing barset colors no more triggers layout calculations

              r1917
            
        sauimone
    
refactoring internal barchart items

              r1674
            
          setFlag(ItemClipsChildrenToShape);

        sauimone
    
fix: changing barset colors no more triggers layout calculations

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

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

        sauimone
    
refactoring internal barchart items

              r1674
            
          connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));

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

          connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));

          setZValue(ChartPresenter::BarSeriesZValue);

          handleDataStructureChanged();

      }

      AbstractBarChartItem::~AbstractBarChartItem()

      {

      }

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

      {

          Q_UNUSED(painter);

          Q_UNUSED(option);

          Q_UNUSED(widget);

      }

      QRectF AbstractBarChartItem::boundingRect() const

      {

          return m_rect;

      }

      void AbstractBarChartItem::applyLayout(const QVector<QRectF> &layout)

      {

          if (m_animation) {

              m_animation->setup(m_layout,layout);

              presenter()->startAnimation(m_animation);

          } else {

              setLayout(layout);

              update();

          }

      }

      void AbstractBarChartItem::setAnimation(AbstractBarAnimation *animation)

      {

          m_animation = animation;

      }

      void AbstractBarChartItem::setLayout(const QVector<QRectF> &layout)

      {

          if (layout.count() != m_bars.count())

              return;

        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
          m_layout = layout;

        sauimone
    
refactoring internal barchart items

              r1674
            
          for (int i=0; i < m_bars.count(); i++) {

              m_bars.at(i)->setRect(layout.at(i));

          }

      }

      //handlers

        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
      void AbstractBarChartItem::handleDomainUpdated()

        sauimone
    
refactoring internal barchart items

              r1674
            
      {

        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
          m_domainMinX = domain()->minX();

          m_domainMaxX = domain()->maxX();

          m_domainMinY = domain()->minY();

          m_domainMaxY = domain()->maxY();

        sauimone
    
refactoring internal barchart items

              r1674
            
          handleLayoutChanged();

      }

      void AbstractBarChartItem::handleGeometryChanged(const QRectF &rect)

      {

          prepareGeometryChange();

          m_rect = rect;

          handleLayoutChanged();

      }

      void AbstractBarChartItem::handleLayoutChanged()

      {

          if ((m_rect.width() <= 0) || (m_rect.height() <= 0)) {

              // rect size zero.

              return;

          }

          QVector<QRectF> layout = calculateLayout();

          applyLayout(layout);

      }

      void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)

      {

          foreach (QGraphicsSimpleTextItem* label, m_labels) {

              label->setVisible(visible);

          }

          update();

      }

      void AbstractBarChartItem::handleDataStructureChanged()

      {

          foreach(QGraphicsItem *item, childItems()) {

              delete item;

          }

          m_bars.clear();

          m_labels.clear();

          m_layout.clear();

          bool labelsVisible = m_series->isLabelsVisible();

          // Create new graphic items for bars

          for (int c = 0; c < m_series->d_func()->categoryCount(); c++) {

              for (int s = 0; s < m_series->count(); s++) {

                  QBarSet *set = m_series->d_func()->barsetAt(s);

                  // Bars

                  Bar *bar = new Bar(set,c,this);

                  m_bars.append(bar);

        Jani Honkonen
    
Fix Krazy issues

              r1935
            
                  connect(bar, SIGNAL(clicked(int,QBarSet*)), m_series, SIGNAL(clicked(int,QBarSet*)));

                  connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*)));

                  connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));

                  connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));

        sauimone
    
refactoring internal barchart items

              r1674
            
                  m_layout.append(QRectF(0, 0, 0, 0));

                  // Labels

                  QGraphicsSimpleTextItem *label = new QGraphicsSimpleTextItem(this);

                  label->setVisible(labelsVisible);

                  m_labels.append(label);

              }

          }

          presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));

          handleLayoutChanged();

      }

      void AbstractBarChartItem::handleVisibleChanged()

      {

          bool visible = m_series->isVisible();

          handleLabelsVisibleChanged(visible);

          foreach(QGraphicsItem *item, childItems()) {

              item->setVisible(visible);

          }

      }

        sauimone
    
fix: changing barset colors no more triggers layout calculations

              r1917
            
      void AbstractBarChartItem::handleUpdatedBars()

      {

          // Handle changes in pen, brush, labels etc.

          int categoryCount = m_series->d_func()->categoryCount();

          int setCount = m_series->count();

          int itemIndex(0);

          for (int category = 0; category < categoryCount; category++) {

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

                  QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();

                  Bar* bar = m_bars.at(itemIndex);

                  bar->setPen(barSet->m_pen);

                  bar->setBrush(barSet->m_brush);

                  bar->update();

                  QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);

                  label->setFont(barSet->m_labelFont);

                  label->setBrush(barSet->m_labelBrush);

                  label->update();

                  itemIndex++;

              }

          }

      }

        sauimone
    
refactoring internal barchart items

              r1674
            
      #include "moc_abstractbarchartitem_p.cpp"

      QTCOMMERCIALCHART_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

sauimone refactoring internal barchart items	r1674	/****************************************************************************
		**
		** Copyright (C) 2012 Digia Plc
		** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
		** This file is part of the Qt Commercial Charts Add-on.
		**
		** $QT_BEGIN_LICENSE$
		** Licensees holding valid Qt Commercial licenses may use this file in
		** accordance with the Qt Commercial License Agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and Digia.
		**
		** If you have questions regarding the use of this file, please use
		** contact form at http://qt.digia.com
		** $QT_END_LICENSE$
		**
		****************************************************************************/

		#include "abstractbarchartitem_p.h"
		#include "bar_p.h"
		#include "qbarset.h"
		#include "qbarset_p.h"
		#include "qabstractbarseries.h"
		#include "qabstractbarseries_p.h"
		#include "qchart.h"
		#include "chartpresenter_p.h"
Michal Klocek Refactor animator...	r1735	#include "charttheme_p.h"
sauimone refactoring internal barchart items	r1674	#include "abstractbaranimation_p.h"
		#include "chartdataset_p.h"
		#include <QPainter>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries series, ChartPresenter presenter) :
		ChartItem(presenter),
		m_animation(0),
		m_series(series)
		{
sauimone fix: changing barset colors no more triggers layout calculations	r1917
sauimone refactoring internal barchart items	r1674	setFlag(ItemClipsChildrenToShape);
sauimone fix: changing barset colors no more triggers layout calculations	r1917	connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));
		connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleUpdatedBars()));
sauimone refactoring internal barchart items	r1674	connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(handleLabelsVisibleChanged(bool)));
		connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
		connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));
		setZValue(ChartPresenter::BarSeriesZValue);
		handleDataStructureChanged();
		}

		AbstractBarChartItem::~AbstractBarChartItem()
		{
		}

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

		QRectF AbstractBarChartItem::boundingRect() const
		{
		return m_rect;
		}

		void AbstractBarChartItem::applyLayout(const QVector<QRectF> &layout)
		{
		if (m_animation) {
		m_animation->setup(m_layout,layout);
		presenter()->startAnimation(m_animation);

		} else {
		setLayout(layout);
		update();
		}
		}

		void AbstractBarChartItem::setAnimation(AbstractBarAnimation *animation)
		{
		m_animation = animation;
		}

		void AbstractBarChartItem::setLayout(const QVector<QRectF> &layout)
		{
		if (layout.count() != m_bars.count())
		return;

Michal Klocek Refactors Domain and Axis...	r1698	m_layout = layout;
sauimone refactoring internal barchart items	r1674
		for (int i=0; i < m_bars.count(); i++) {
		m_bars.at(i)->setRect(layout.at(i));
		}
		}
		//handlers

Michal Klocek Refactors Domain and Axis...	r1698	void AbstractBarChartItem::handleDomainUpdated()
sauimone refactoring internal barchart items	r1674	{
Michal Klocek Refactors Domain and Axis...	r1698	m_domainMinX = domain()->minX();
		m_domainMaxX = domain()->maxX();
		m_domainMinY = domain()->minY();
		m_domainMaxY = domain()->maxY();
sauimone refactoring internal barchart items	r1674	handleLayoutChanged();
		}

		void AbstractBarChartItem::handleGeometryChanged(const QRectF &rect)
		{
		prepareGeometryChange();
		m_rect = rect;
		handleLayoutChanged();
		}

		void AbstractBarChartItem::handleLayoutChanged()
		{
		if ((m_rect.width() <= 0) \|\| (m_rect.height() <= 0)) {
		// rect size zero.
		return;
		}
		QVector<QRectF> layout = calculateLayout();
		applyLayout(layout);
		}

		void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)
		{
		foreach (QGraphicsSimpleTextItem* label, m_labels) {
		label->setVisible(visible);
		}
		update();
		}

		void AbstractBarChartItem::handleDataStructureChanged()
		{
		foreach(QGraphicsItem *item, childItems()) {
		delete item;
		}

		m_bars.clear();
		m_labels.clear();
		m_layout.clear();

		bool labelsVisible = m_series->isLabelsVisible();

		// Create new graphic items for bars
		for (int c = 0; c < m_series->d_func()->categoryCount(); c++) {
		for (int s = 0; s < m_series->count(); s++) {
		QBarSet *set = m_series->d_func()->barsetAt(s);

		// Bars
		Bar *bar = new Bar(set,c,this);
		m_bars.append(bar);
Jani Honkonen Fix Krazy issues	r1935	connect(bar, SIGNAL(clicked(int,QBarSet)), m_series, SIGNAL(clicked(int,QBarSet)));
		connect(bar, SIGNAL(hovered(bool,QBarSet)), m_series, SIGNAL(hovered(bool,QBarSet)));
		connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
		connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));
sauimone refactoring internal barchart items	r1674	m_layout.append(QRectF(0, 0, 0, 0));

		// Labels
		QGraphicsSimpleTextItem *label = new QGraphicsSimpleTextItem(this);
		label->setVisible(labelsVisible);
		m_labels.append(label);
		}
		}

		presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
		handleLayoutChanged();
		}

		void AbstractBarChartItem::handleVisibleChanged()
		{
		bool visible = m_series->isVisible();
		handleLabelsVisibleChanged(visible);
		foreach(QGraphicsItem *item, childItems()) {
		item->setVisible(visible);
		}
		}

sauimone fix: changing barset colors no more triggers layout calculations	r1917	void AbstractBarChartItem::handleUpdatedBars()
		{
		// Handle changes in pen, brush, labels etc.
		int categoryCount = m_series->d_func()->categoryCount();
		int setCount = m_series->count();
		int itemIndex(0);

		for (int category = 0; category < categoryCount; category++) {
		for (int set = 0; set < setCount; set++) {
		QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
		Bar* bar = m_bars.at(itemIndex);
		bar->setPen(barSet->m_pen);
		bar->setBrush(barSet->m_brush);
		bar->update();

		QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
		label->setFont(barSet->m_labelFont);
		label->setBrush(barSet->m_labelBrush);
		label->update();
		itemIndex++;
		}
		}
		}

sauimone refactoring internal barchart items	r1674	#include "moc_abstractbarchartitem_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE