HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/areachart/areachartitem.cpp

build fix.

sauimone - - Load All Authors

File last commit:

r743:e20e9148b1b0


                r744:4a4cc4b22b41

Download file

             areachartitem.cpp
        
                    122 lines
            
             | 3.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / areachart / areachartitem.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Michal Klocek
    
Adds area chart...

              r421
            
      #include "areachartitem_p.h"

      #include "qareaseries.h"

      #include "qlineseries.h"

        Michal Klocek
    
Fixes missing chart area z value intialization

              r564
            
      #include "chartpresenter_p.h"

        Michal Klocek
    
Adds area chart...

              r421
            
      #include <QPainter>

        Michal Klocek
    
Refactors click signal to line,area,spline,scatter charts

              r571
            
      #include <QGraphicsSceneMouseEvent>

        Michal Klocek
    
Adds area chart...

              r421
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      //TODO: optimize : remove points which are not visible

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
      AreaChartItem::AreaChartItem(QAreaSeries *areaSeries,ChartPresenter *presenter) : ChartItem(presenter),

          m_series(areaSeries),

          m_upper(0),

          m_lower(0),

          m_pointsVisible(false)

        Michal Klocek
    
Adds area chart...

              r421
            
      {

        Michal Klocek
    
Fixes missing chart area z value intialization

              r564
            
          setZValue(ChartPresenter::LineChartZValue);

        Michal Klocek
    
Bugfix : black line drawn during areachart paint

              r690
            
          m_upper = new AreaBoundItem(this,m_series->upperSeries());

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (m_series->lowerSeries()) {

              m_lower = new AreaBoundItem(this,m_series->lowerSeries());

        Michal Klocek
    
Adds area chart...

              r421
            
          }

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          connect(areaSeries,SIGNAL(updated()),this,SLOT(handleUpdated()));

          connect(this,SIGNAL(clicked(const QPointF&)),areaSeries,SIGNAL(clicked(const QPointF&)));

        Michal Klocek
    
Adds area chart...

              r421
            
          handleUpdated();

      }

      AreaChartItem::~AreaChartItem()

      {

          delete m_upper;

          delete m_lower;

      };

      QRectF AreaChartItem::boundingRect() const

      {

          return m_rect;

      }

      QPainterPath AreaChartItem::shape() const

      {

          return m_path;

      }

      void AreaChartItem::updatePath()

      {

          QPainterPath path;

        Michal Klocek
    
Bugfix : black line drawn during areachart paint

              r690
            
          path = m_upper->shape();

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (m_lower) {

              path.connectPath(m_lower->shape().toReversed());

          } else {

        Michal Klocek
    
Adds area chart...

              r421
            
              QPointF first = path.pointAtPercent(0);

              QPointF last =  path.pointAtPercent(1);

              path.lineTo(last.x(),m_clipRect.bottom());

              path.lineTo(first.x(),m_clipRect.bottom());

          }

          path.closeSubpath();

          prepareGeometryChange();

          m_path=path;

          m_rect=path.boundingRect();

          update();

      }

      void AreaChartItem::handleUpdated()

      {

        Michal Klocek
    
Adds visiblePoints handling to area chart

              r563
            
          m_pointsVisible = m_series->pointsVisible();

          m_linePen = m_series->pen();

        Michal Klocek
    
Unify naming setGeometry -> setLayout

              r557
            
          m_brush = m_series->brush();

        Michal Klocek
    
Adds visiblePoints handling to area chart

              r563
            
          m_pointPen = m_series->pen();

          m_pointPen.setWidthF(2*m_pointPen.width());

        Michal Klocek
    
Adds area chart...

              r421
            
          update();

      }

        Michal Klocek
    
Refactor domain model...

              r439
            
      void AreaChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)

        Michal Klocek
    
Adds area chart...

              r421
            
      {

        Michal Klocek
    
Refactor domain model...

              r439
            
          m_upper->handleDomainChanged(minX,maxX,minY,maxY);

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (m_lower)

              m_lower->handleDomainChanged(minX,maxX,minY,maxY);

        Michal Klocek
    
Adds area chart...

              r421
            
      }

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
      void AreaChartItem::handleGeometryChanged(const QRectF &rect)

        Michal Klocek
    
Adds area chart...

              r421
            
      {

          m_clipRect=rect.translated(-rect.topLeft());

          setPos(rect.topLeft());

          m_upper->handleGeometryChanged(rect);

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (m_lower)

              m_lower->handleGeometryChanged(rect);

        Michal Klocek
    
Adds area chart...

              r421
            
      }

      //painter

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

      {

        Tero Ahola
    
Squashed bunch of warnings

              r611
            
          Q_UNUSED(widget)

          Q_UNUSED(option)

        Michal Klocek
    
Adds area chart...

              r421
            
          painter->save();

        Michal Klocek
    
Bugfix : black line drawn during areachart paint

              r690
            
          painter->setPen(m_linePen);

          painter->setBrush(m_brush);

        Michal Klocek
    
Adds area chart...

              r421
            
          painter->setClipRect(m_clipRect);

          painter->drawPath(m_path);

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (m_pointsVisible) {

        Michal Klocek
    
Adds visiblePoints handling to area chart

              r563
            
                 painter->setPen(m_pointPen);

                 painter->drawPoints(m_upper->points());

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
                 if (m_lower)

                     painter->drawPoints(m_lower->points());

        Michal Klocek
    
Adds visiblePoints handling to area chart

              r563
            
          }

        Michal Klocek
    
Adds area chart...

              r421
            
          painter->restore();

      }

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
      void AreaChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

        Michal Klocek
    
Refactors click signal to line,area,spline,scatter charts

              r571
            
      {

          emit clicked(m_upper->calculateDomainPoint(event->pos()));

      }

        Michal Klocek
    
Adds area chart...

              r421
            
      #include "moc_areachartitem_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

Michal Klocek Adds area chart...	r421	#include "areachartitem_p.h"
		#include "qareaseries.h"
		#include "qlineseries.h"
Michal Klocek Fixes missing chart area z value intialization	r564	#include "chartpresenter_p.h"
Michal Klocek Adds area chart...	r421	#include <QPainter>
Michal Klocek Refactors click signal to line,area,spline,scatter charts	r571	#include <QGraphicsSceneMouseEvent>
Michal Klocek Adds area chart...	r421

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		//TODO: optimize : remove points which are not visible

sauimone minor code review issues. indent, spaces, brackets etc.	r743	AreaChartItem::AreaChartItem(QAreaSeries areaSeries,ChartPresenter presenter) : ChartItem(presenter),
		m_series(areaSeries),
		m_upper(0),
		m_lower(0),
		m_pointsVisible(false)
Michal Klocek Adds area chart...	r421	{
Michal Klocek Fixes missing chart area z value intialization	r564	setZValue(ChartPresenter::LineChartZValue);
Michal Klocek Bugfix : black line drawn during areachart paint	r690	m_upper = new AreaBoundItem(this,m_series->upperSeries());
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_series->lowerSeries()) {
		m_lower = new AreaBoundItem(this,m_series->lowerSeries());
Michal Klocek Adds area chart...	r421	}

sauimone minor code review issues. indent, spaces, brackets etc.	r743	connect(areaSeries,SIGNAL(updated()),this,SLOT(handleUpdated()));
		connect(this,SIGNAL(clicked(const QPointF&)),areaSeries,SIGNAL(clicked(const QPointF&)));
Michal Klocek Adds area chart...	r421
		handleUpdated();
		}

		AreaChartItem::~AreaChartItem()
		{
		delete m_upper;
		delete m_lower;
		};

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

		QPainterPath AreaChartItem::shape() const
		{
		return m_path;
		}

		void AreaChartItem::updatePath()
		{
		QPainterPath path;

Michal Klocek Bugfix : black line drawn during areachart paint	r690	path = m_upper->shape();

sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_lower) {
		path.connectPath(m_lower->shape().toReversed());
		} else {
Michal Klocek Adds area chart...	r421	QPointF first = path.pointAtPercent(0);
		QPointF last = path.pointAtPercent(1);
		path.lineTo(last.x(),m_clipRect.bottom());
		path.lineTo(first.x(),m_clipRect.bottom());
		}
		path.closeSubpath();
		prepareGeometryChange();
		m_path=path;
		m_rect=path.boundingRect();
		update();
		}

		void AreaChartItem::handleUpdated()
		{
Michal Klocek Adds visiblePoints handling to area chart	r563	m_pointsVisible = m_series->pointsVisible();
		m_linePen = m_series->pen();
Michal Klocek Unify naming setGeometry -> setLayout	r557	m_brush = m_series->brush();
Michal Klocek Adds visiblePoints handling to area chart	r563	m_pointPen = m_series->pen();
		m_pointPen.setWidthF(2*m_pointPen.width());

Michal Klocek Adds area chart...	r421	update();
		}

Michal Klocek Refactor domain model...	r439	void AreaChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
Michal Klocek Adds area chart...	r421	{
Michal Klocek Refactor domain model...	r439	m_upper->handleDomainChanged(minX,maxX,minY,maxY);
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_lower)
		m_lower->handleDomainChanged(minX,maxX,minY,maxY);
Michal Klocek Adds area chart...	r421	}

sauimone minor code review issues. indent, spaces, brackets etc.	r743	void AreaChartItem::handleGeometryChanged(const QRectF &rect)
Michal Klocek Adds area chart...	r421	{
		m_clipRect=rect.translated(-rect.topLeft());
		setPos(rect.topLeft());
		m_upper->handleGeometryChanged(rect);
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_lower)
		m_lower->handleGeometryChanged(rect);
Michal Klocek Adds area chart...	r421	}
		//painter

		void AreaChartItem::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
		{
Tero Ahola Squashed bunch of warnings	r611	Q_UNUSED(widget)
		Q_UNUSED(option)

Michal Klocek Adds area chart...	r421	painter->save();
Michal Klocek Bugfix : black line drawn during areachart paint	r690	painter->setPen(m_linePen);
		painter->setBrush(m_brush);
Michal Klocek Adds area chart...	r421	painter->setClipRect(m_clipRect);
		painter->drawPath(m_path);
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_pointsVisible) {
Michal Klocek Adds visiblePoints handling to area chart	r563	painter->setPen(m_pointPen);
		painter->drawPoints(m_upper->points());
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (m_lower)
		painter->drawPoints(m_lower->points());
Michal Klocek Adds visiblePoints handling to area chart	r563	}
Michal Klocek Adds area chart...	r421	painter->restore();
		}

sauimone minor code review issues. indent, spaces, brackets etc.	r743	void AreaChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
Michal Klocek Refactors click signal to line,area,spline,scatter charts	r571	{
		emit clicked(m_upper->calculateDomainPoint(event->pos()));
		}

Michal Klocek Adds area chart...	r421	#include "moc_areachartitem_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE