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

Adjust various margins and paddings....

Adjust various margins and paddings. The text items have been changed to use QGraphicsTextItem bounding rects instead of calculating dimensions using QFontMetrics. It seems that QGraphicsTextItem boundingRect involves a lot more of a margin than QFontMetrics provided. To compensate, various margins and paddings have been adjusted lower. Change-Id: Idebf939f5dd804fb96daeaea4bbf1b45f4f02908 Reviewed-by: Mika Salmela <mika.salmela@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2565:d442525f5441


                r2569:f4eaee212ddc

Download file

             boxwhiskers.cpp
        
                    174 lines
            
             | 4.9 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / boxplotchart / boxwhiskers.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r2548
            
      /****************************************************************************

       **

       ** Copyright (C) 2013 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 "boxwhiskers_p.h"

      #include <QPainter>

      #include <QWidget>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      BoxWhiskers::BoxWhiskers(QBoxSet *set, AbstractDomain *domain, QGraphicsObject *parent) :

          QGraphicsObject(parent),

          m_boxSet(set),

          m_domain(domain)

      {

          setAcceptHoverEvents(true);

          setAcceptedMouseButtons(Qt::MouseButtonMask);

      }

      BoxWhiskers::~BoxWhiskers()

      {

      }

      void BoxWhiskers::mousePressEvent(QGraphicsSceneMouseEvent *event)

      {

          Q_UNUSED(event)

          emit clicked(m_boxSet);

      }

      void BoxWhiskers::hoverEnterEvent(QGraphicsSceneHoverEvent *event)

      {

          Q_UNUSED(event)

          emit hovered(true, m_boxSet);

      }

      void BoxWhiskers::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)

      {

          Q_UNUSED(event)

          emit hovered(false, m_boxSet);

      }

      void BoxWhiskers::setBrush(const QBrush &brush)

      {

          m_brush = brush;

          update();

      }

      void BoxWhiskers::setPen(const QPen &pen)

      {

          m_pen = pen;

          update();

      }

      void BoxWhiskers::setLayout(const BoxWhiskersData &data)

      {

          m_data = data;

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

              r2554
            
          updateGeometry(m_domain);

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

              r2548
            
          update();

      }

      QSizeF BoxWhiskers::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const

      {

          Q_UNUSED(which)

          Q_UNUSED(constraint)

          return QSizeF();

      }

      void BoxWhiskers::setGeometry(const QRectF &rect)

      {

          Q_UNUSED(rect)

      }

      QRectF BoxWhiskers::boundingRect() const

      {

          return m_boundingRect;

      }

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

      {

          Q_UNUSED(option)

          Q_UNUSED(widget)

          painter->setPen(m_pen);

          painter->setBrush(m_brush);

          painter->setClipRect(parentItem()->boundingRect());

          painter->drawPath(m_boxPath);

      }

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

              r2554
            
      void BoxWhiskers::updateGeometry(AbstractDomain *domain)

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

              r2548
            
      {

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

              r2554
            
          m_domain = domain;

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

              r2548
            
          prepareGeometryChange();

          QPainterPath path;

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

              r2554
            
          m_boxPath = path;

          m_boundingRect = m_boxPath.boundingRect();

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

              r2548
            
          qreal columnWidth = 1.0 / m_data.m_seriesCount;

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

              r2554
            
          qreal left = 0.25 * columnWidth + columnWidth * m_data.m_seriesIndex + m_data.m_index - 0.5;

          qreal barWidth = columnWidth / 2.0;

          QPointF geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_upperExtreme), m_validData);

          if (!m_validData)

              return;

          qreal geometryLeft = geometryPoint.x();

          qreal geometryUpperExtreme = geometryPoint.y();

          geometryPoint = m_domain->calculateGeometryPoint(QPointF(left + barWidth, m_data.m_upperQuartile), m_validData);

          if (!m_validData)

              return;

          qreal geometryRight = geometryPoint.x();

          qreal geometryUpperQuartile = geometryPoint.y();

          geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_lowerQuartile), m_validData);

          if (!m_validData)

              return;

          qreal geometryLowerQuartile = geometryPoint.y();

          geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_lowerExtreme), m_validData);

          if (!m_validData)

              return;

          qreal geometryLowerExtreme = geometryPoint.y();

          geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_median), m_validData);

          if (!m_validData)

              return;

          qreal geometryMedian = geometryPoint.y();

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

              r2548
            
          // Upper whisker

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

              r2554
            
          path.moveTo(geometryLeft, geometryUpperExtreme);

          path.lineTo(geometryRight, geometryUpperExtreme);

          path.moveTo((geometryLeft + geometryRight) / 2.0, geometryUpperExtreme);

          path.lineTo((geometryLeft + geometryRight) / 2.0, geometryUpperQuartile);

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

              r2548
            
          // Middle Box

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

              r2554
            
          path.addRect(geometryLeft, geometryUpperQuartile, geometryRight - geometryLeft, geometryLowerQuartile - geometryUpperQuartile);

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

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

              r2554
            
          // Median line

          path.moveTo(geometryLeft, geometryMedian);

          path.lineTo(geometryRight, geometryMedian);

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

              r2548
            
          // Lower whisker

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

              r2554
            
          path.moveTo(geometryLeft, geometryLowerExtreme);

          path.lineTo(geometryRight, geometryLowerExtreme);

          path.moveTo((geometryLeft + geometryRight) / 2.0, geometryLowerQuartile);

          path.lineTo((geometryLeft + geometryRight) / 2.0, geometryLowerExtreme);

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

              r2548
            
          path.closeSubpath();

          m_boxPath = path;

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

              r2554
            
          m_boundingRect = m_boxPath.boundingRect();

        Miikka Heikkinen
    
Fix boxplot drawing artifacts with thick pen...

              r2565
            
          qreal extra = (m_pen.width() / 2.0);

          m_boundingRect.adjust(-extra, -extra, extra, extra);

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

              r2548
            
      }

      #include "moc_boxwhiskers_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

Mika Salmela A new box-and-whiskers series type added to charts....	r2548	/****************************************************************************
		**
		** Copyright (C) 2013 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 "boxwhiskers_p.h"
		#include <QPainter>
		#include <QWidget>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		BoxWhiskers::BoxWhiskers(QBoxSet set, AbstractDomain domain, QGraphicsObject *parent) :
		QGraphicsObject(parent),
		m_boxSet(set),
		m_domain(domain)
		{
		setAcceptHoverEvents(true);
		setAcceptedMouseButtons(Qt::MouseButtonMask);
		}

		BoxWhiskers::~BoxWhiskers()
		{
		}

		void BoxWhiskers::mousePressEvent(QGraphicsSceneMouseEvent *event)
		{
		Q_UNUSED(event)
		emit clicked(m_boxSet);
		}

		void BoxWhiskers::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
		{
		Q_UNUSED(event)
		emit hovered(true, m_boxSet);
		}

		void BoxWhiskers::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
		{
		Q_UNUSED(event)
		emit hovered(false, m_boxSet);
		}

		void BoxWhiskers::setBrush(const QBrush &brush)
		{
		m_brush = brush;
		update();
		}

		void BoxWhiskers::setPen(const QPen &pen)
		{
		m_pen = pen;
		update();
		}

		void BoxWhiskers::setLayout(const BoxWhiskersData &data)
		{
		m_data = data;

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

		QSizeF BoxWhiskers::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
		{
		Q_UNUSED(which)
		Q_UNUSED(constraint)

		return QSizeF();
		}

		void BoxWhiskers::setGeometry(const QRectF &rect)
		{
		Q_UNUSED(rect)
		}

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

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

		painter->setPen(m_pen);
		painter->setBrush(m_brush);
		painter->setClipRect(parentItem()->boundingRect());
		painter->drawPath(m_boxPath);
		}

Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	void BoxWhiskers::updateGeometry(AbstractDomain *domain)
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	{
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	m_domain = domain;

Mika Salmela A new box-and-whiskers series type added to charts....	r2548	prepareGeometryChange();

		QPainterPath path;
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	m_boxPath = path;
		m_boundingRect = m_boxPath.boundingRect();
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		qreal columnWidth = 1.0 / m_data.m_seriesCount;
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	qreal left = 0.25 * columnWidth + columnWidth * m_data.m_seriesIndex + m_data.m_index - 0.5;
		qreal barWidth = columnWidth / 2.0;

		QPointF geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_upperExtreme), m_validData);
		if (!m_validData)
		return;
		qreal geometryLeft = geometryPoint.x();
		qreal geometryUpperExtreme = geometryPoint.y();
		geometryPoint = m_domain->calculateGeometryPoint(QPointF(left + barWidth, m_data.m_upperQuartile), m_validData);
		if (!m_validData)
		return;
		qreal geometryRight = geometryPoint.x();
		qreal geometryUpperQuartile = geometryPoint.y();
		geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_lowerQuartile), m_validData);
		if (!m_validData)
		return;
		qreal geometryLowerQuartile = geometryPoint.y();
		geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_lowerExtreme), m_validData);
		if (!m_validData)
		return;
		qreal geometryLowerExtreme = geometryPoint.y();
		geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_median), m_validData);
		if (!m_validData)
		return;
		qreal geometryMedian = geometryPoint.y();
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		// Upper whisker
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	path.moveTo(geometryLeft, geometryUpperExtreme);
		path.lineTo(geometryRight, geometryUpperExtreme);
		path.moveTo((geometryLeft + geometryRight) / 2.0, geometryUpperExtreme);
		path.lineTo((geometryLeft + geometryRight) / 2.0, geometryUpperQuartile);
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		// Middle Box
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	path.addRect(geometryLeft, geometryUpperQuartile, geometryRight - geometryLeft, geometryLowerQuartile - geometryUpperQuartile);
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	// Median line
		path.moveTo(geometryLeft, geometryMedian);
		path.lineTo(geometryRight, geometryMedian);
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		// Lower whisker
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	path.moveTo(geometryLeft, geometryLowerExtreme);
		path.lineTo(geometryRight, geometryLowerExtreme);
		path.moveTo((geometryLeft + geometryRight) / 2.0, geometryLowerQuartile);
		path.lineTo((geometryLeft + geometryRight) / 2.0, geometryLowerExtreme);
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		path.closeSubpath();

		m_boxPath = path;
Mika Salmela Changed BoxPlot to use domain for calculating geometry points....	r2554	m_boundingRect = m_boxPath.boundingRect();
Miikka Heikkinen Fix boxplot drawing artifacts with thick pen...	r2565
		qreal extra = (m_pen.width() / 2.0);
		m_boundingRect.adjust(-extra, -extra, extra, extra);
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	}

		#include "moc_boxwhiskers_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE