HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/layout/abstractchartlayout.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>

Miikka Heikkinen - - Load All Authors

File last commit:

r2876:df9206658a1d


                r2886:4c015da23a8e

Download file

             abstractchartlayout.cpp
        
                    210 lines
            
             | 7.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / layout / abstractchartlayout.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Titta Heikkala
    
Updated license headers...

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

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Titta Heikkala
    
Updated license headers...

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

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

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Titta Heikkala
    
Updated license headers...

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

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_BEGIN_LICENSE:COMM$

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        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.

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

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

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/abstractchartlayout_p.h>

      #include <private/chartpresenter_p.h>

      #include <private/qlegend_p.h>

      #include <private/chartaxiselement_p.h>

      #include <private/charttitle_p.h>

      #include <private/chartbackground_p.h>

      #include <QtCore/QDebug>

        Miikka Heikkinen
    
Add Polar chart support...

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

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      static const qreal golden_ratio = 0.4;

      AbstractChartLayout::AbstractChartLayout(ChartPresenter *presenter)

          : m_presenter(presenter),

            m_margins(20, 20, 20, 20),

            m_minChartRect(0, 0, 200, 200)

      {

      }

      AbstractChartLayout::~AbstractChartLayout()

      {

      }

      void AbstractChartLayout::setGeometry(const QRectF &rect)

      {

          if (!rect.isValid())

              return;

        Titta Heikkala
    
Fix ChartView visibility change drawing...

              r2605
            
          if (m_presenter->chart()->isVisible()) {

              QList<ChartAxisElement *> axes = m_presenter->axisItems();

              ChartTitle *title = m_presenter->titleElement();

              QLegend *legend = m_presenter->legend();

              ChartBackground *background = m_presenter->backgroundElement();

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Titta Heikkala
    
Fix ChartView visibility change drawing...

              r2605
            
              QRectF contentGeometry = calculateBackgroundGeometry(rect, background);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Titta Heikkala
    
Fix ChartView visibility change drawing...

              r2605
            
              contentGeometry = calculateContentGeometry(contentGeometry);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Miikka Heikkinen
    
Fix clearing the chart title...

              r2876
            
              if (title && title->isVisible())

        Titta Heikkala
    
Fix ChartView visibility change drawing...

              r2605
            
                  contentGeometry = calculateTitleGeometry(contentGeometry, title);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Titta Heikkala
    
Fix ChartView visibility change drawing...

              r2605
            
              if (legend->isAttachedToChart() && legend->isVisible())

                  contentGeometry = calculateLegendGeometry(contentGeometry, legend);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Titta Heikkala
    
Fix ChartView visibility change drawing...

              r2605
            
              contentGeometry = calculateAxisGeometry(contentGeometry, axes);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Titta Heikkala
    
Fix ChartView visibility change drawing...

              r2605
            
              m_presenter->setGeometry(contentGeometry);

              if (m_presenter->chart()->chartType() == QChart::ChartTypeCartesian)

                  static_cast<QGraphicsRectItem *>(m_presenter->plotAreaElement())->setRect(contentGeometry);

              else

                  static_cast<QGraphicsEllipseItem *>(m_presenter->plotAreaElement())->setRect(contentGeometry);

          }

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
          QGraphicsLayout::setGeometry(rect);

      }

      QRectF AbstractChartLayout::calculateContentGeometry(const QRectF &geometry) const

      {

          return geometry.adjusted(m_margins.left(), m_margins.top(), -m_margins.right(), -m_margins.bottom());

      }

      QRectF AbstractChartLayout::calculateContentMinimum(const QRectF &minimum) const

      {

          return  minimum.adjusted(0, 0, m_margins.left() + m_margins.right(), m_margins.top() + m_margins.bottom());

      }

      QRectF AbstractChartLayout::calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background) const

      {

          qreal left;

          qreal top;

          qreal right;

          qreal bottom;

          getContentsMargins(&left, &top, &right, &bottom);

          QRectF backgroundGeometry = geometry.adjusted(left, top, -right, -bottom);

          if (background)

              background->setRect(backgroundGeometry);

          return backgroundGeometry;

      }

      QRectF AbstractChartLayout::calculateBackgroundMinimum(const QRectF &minimum) const

      {

          qreal left;

          qreal top;

          qreal right;

          qreal bottom;

          getContentsMargins(&left, &top, &right, &bottom);

          return minimum.adjusted(0, 0, left + right, top + bottom);

      }

      QRectF AbstractChartLayout::calculateLegendGeometry(const QRectF &geometry, QLegend *legend) const

      {

          QSizeF size = legend->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1));

          QRectF legendRect;

          QRectF result;

          switch (legend->alignment()) {

          case Qt::AlignTop: {

              legendRect = QRectF(geometry.topLeft(), QSizeF(geometry.width(), size.height()));

              result = geometry.adjusted(0, legendRect.height(), 0, 0);

              break;

          }

          case Qt::AlignBottom: {

              legendRect = QRectF(QPointF(geometry.left(), geometry.bottom() - size.height()), QSizeF(geometry.width(), size.height()));

              result = geometry.adjusted(0, 0, 0, -legendRect.height());

              break;

          }

          case Qt::AlignLeft: {

              qreal width = qMin(size.width(), geometry.width() * golden_ratio);

              legendRect = QRectF(geometry.topLeft(), QSizeF(width, geometry.height()));

              result = geometry.adjusted(width, 0, 0, 0);

              break;

          }

          case Qt::AlignRight: {

              qreal width = qMin(size.width(), geometry.width() * golden_ratio);

              legendRect = QRectF(QPointF(geometry.right() - width, geometry.top()), QSizeF(width, geometry.height()));

              result = geometry.adjusted(0, 0, -width, 0);

              break;

          }

          default: {

              legendRect = QRectF(0, 0, 0, 0);

              result = geometry;

              break;

          }

          }

          legend->setGeometry(legendRect);

          return result;

      }

      QRectF AbstractChartLayout::calculateLegendMinimum(const QRectF &geometry, QLegend *legend) const

      {

          QSizeF minSize = legend->effectiveSizeHint(Qt::MinimumSize, QSizeF(-1, -1));

          return geometry.adjusted(0, 0, minSize.width(), minSize.height());

      }

      QRectF AbstractChartLayout::calculateTitleGeometry(const QRectF &geometry, ChartTitle *title) const

      {

          title->setGeometry(geometry);

        Miikka Heikkinen
    
Fix clearing the chart title...

              r2876
            
          if (title->text().isEmpty()) {

              return geometry;

          } else {

              // Round to full pixel via QPoint to avoid one pixel clipping on the edge in some cases

              QPointF center((geometry.center() - title->boundingRect().center()).toPoint());

              title->setPos(center.x(), title->pos().y());

              return geometry.adjusted(0, title->boundingRect().height() + 1, 0, 0);

          }

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      }

      QRectF AbstractChartLayout::calculateTitleMinimum(const QRectF &minimum, ChartTitle *title) const

      {

          QSizeF min = title->sizeHint(Qt::MinimumSize);

          return  minimum.adjusted(0, 0, min.width(), min.height());

      }

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

      {

          Q_UNUSED(constraint);

          if (which == Qt::MinimumSize) {

              QList<ChartAxisElement *> axes = m_presenter->axisItems();

              ChartTitle *title = m_presenter->titleElement();

              QLegend *legend = m_presenter->legend();

              QRectF minimumRect(0, 0, 0, 0);

              minimumRect = calculateBackgroundMinimum(minimumRect);

              minimumRect = calculateContentMinimum(minimumRect);

              minimumRect = calculateTitleMinimum(minimumRect, title);

              minimumRect = calculateLegendMinimum(minimumRect, legend);

              minimumRect = calculateAxisMinimum(minimumRect, axes);

              return  minimumRect.united(m_minChartRect).size().toSize();

          }

          return QSize(-1, -1);

      }

      void AbstractChartLayout::setMargins(const QMargins &margins)

      {

          if (m_margins != margins) {

              m_margins = margins;

              updateGeometry();

          }

      }

      QMargins AbstractChartLayout::margins() const

      {

          return m_margins;

      }

        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	/******************************************************************************
Miikka Heikkinen Add Polar chart support...	r2483	**
Titta Heikkala Updated license headers...	r2845	** Copyright (C) 2015 The Qt Company Ltd.
		** Contact: http://www.qt.io/licensing/
Miikka Heikkinen Add Polar chart support...	r2483	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Miikka Heikkinen Add Polar chart support...	r2483	**
Titta Heikkala Updated license headers...	r2845	** $QT_BEGIN_LICENSE:COMM$
Miikka Heikkinen Add Polar chart support...	r2483	**
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.
Miikka Heikkinen Add Polar chart support...	r2483	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
		******************************************************************************/
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Fix include syntax...	r2714	#include <private/abstractchartlayout_p.h>
		#include <private/chartpresenter_p.h>
		#include <private/qlegend_p.h>
		#include <private/chartaxiselement_p.h>
		#include <private/charttitle_p.h>
		#include <private/chartbackground_p.h>
		#include <QtCore/QDebug>
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Miikka Heikkinen Add Polar chart support...	r2483
		static const qreal golden_ratio = 0.4;

		AbstractChartLayout::AbstractChartLayout(ChartPresenter *presenter)
		: m_presenter(presenter),
		m_margins(20, 20, 20, 20),
		m_minChartRect(0, 0, 200, 200)
		{
		}

		AbstractChartLayout::~AbstractChartLayout()
		{
		}

		void AbstractChartLayout::setGeometry(const QRectF &rect)
		{
		if (!rect.isValid())
		return;

Titta Heikkala Fix ChartView visibility change drawing...	r2605	if (m_presenter->chart()->isVisible()) {
		QList<ChartAxisElement *> axes = m_presenter->axisItems();
		ChartTitle *title = m_presenter->titleElement();
		QLegend *legend = m_presenter->legend();
		ChartBackground *background = m_presenter->backgroundElement();
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Fix ChartView visibility change drawing...	r2605	QRectF contentGeometry = calculateBackgroundGeometry(rect, background);
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Fix ChartView visibility change drawing...	r2605	contentGeometry = calculateContentGeometry(contentGeometry);
Miikka Heikkinen Add Polar chart support...	r2483
Miikka Heikkinen Fix clearing the chart title...	r2876	if (title && title->isVisible())
Titta Heikkala Fix ChartView visibility change drawing...	r2605	contentGeometry = calculateTitleGeometry(contentGeometry, title);
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Fix ChartView visibility change drawing...	r2605	if (legend->isAttachedToChart() && legend->isVisible())
		contentGeometry = calculateLegendGeometry(contentGeometry, legend);
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Fix ChartView visibility change drawing...	r2605	contentGeometry = calculateAxisGeometry(contentGeometry, axes);
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Fix ChartView visibility change drawing...	r2605	m_presenter->setGeometry(contentGeometry);
		if (m_presenter->chart()->chartType() == QChart::ChartTypeCartesian)
		static_cast<QGraphicsRectItem *>(m_presenter->plotAreaElement())->setRect(contentGeometry);
		else
		static_cast<QGraphicsEllipseItem *>(m_presenter->plotAreaElement())->setRect(contentGeometry);
		}
Miikka Heikkinen Add Polar chart support...	r2483
		QGraphicsLayout::setGeometry(rect);
		}

		QRectF AbstractChartLayout::calculateContentGeometry(const QRectF &geometry) const
		{
		return geometry.adjusted(m_margins.left(), m_margins.top(), -m_margins.right(), -m_margins.bottom());
		}

		QRectF AbstractChartLayout::calculateContentMinimum(const QRectF &minimum) const
		{
		return minimum.adjusted(0, 0, m_margins.left() + m_margins.right(), m_margins.top() + m_margins.bottom());
		}


		QRectF AbstractChartLayout::calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background) const
		{
		qreal left;
		qreal top;
		qreal right;
		qreal bottom;
		getContentsMargins(&left, &top, &right, &bottom);
		QRectF backgroundGeometry = geometry.adjusted(left, top, -right, -bottom);
		if (background)
		background->setRect(backgroundGeometry);
		return backgroundGeometry;
		}

		QRectF AbstractChartLayout::calculateBackgroundMinimum(const QRectF &minimum) const
		{
		qreal left;
		qreal top;
		qreal right;
		qreal bottom;
		getContentsMargins(&left, &top, &right, &bottom);
		return minimum.adjusted(0, 0, left + right, top + bottom);
		}

		QRectF AbstractChartLayout::calculateLegendGeometry(const QRectF &geometry, QLegend *legend) const
		{
		QSizeF size = legend->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1));
		QRectF legendRect;
		QRectF result;

		switch (legend->alignment()) {
		case Qt::AlignTop: {
		legendRect = QRectF(geometry.topLeft(), QSizeF(geometry.width(), size.height()));
		result = geometry.adjusted(0, legendRect.height(), 0, 0);
		break;
		}
		case Qt::AlignBottom: {
		legendRect = QRectF(QPointF(geometry.left(), geometry.bottom() - size.height()), QSizeF(geometry.width(), size.height()));
		result = geometry.adjusted(0, 0, 0, -legendRect.height());
		break;
		}
		case Qt::AlignLeft: {
		qreal width = qMin(size.width(), geometry.width() * golden_ratio);
		legendRect = QRectF(geometry.topLeft(), QSizeF(width, geometry.height()));
		result = geometry.adjusted(width, 0, 0, 0);
		break;
		}
		case Qt::AlignRight: {
		qreal width = qMin(size.width(), geometry.width() * golden_ratio);
		legendRect = QRectF(QPointF(geometry.right() - width, geometry.top()), QSizeF(width, geometry.height()));
		result = geometry.adjusted(0, 0, -width, 0);
		break;
		}
		default: {
		legendRect = QRectF(0, 0, 0, 0);
		result = geometry;
		break;
		}
		}

		legend->setGeometry(legendRect);

		return result;
		}

		QRectF AbstractChartLayout::calculateLegendMinimum(const QRectF &geometry, QLegend *legend) const
		{
		QSizeF minSize = legend->effectiveSizeHint(Qt::MinimumSize, QSizeF(-1, -1));
		return geometry.adjusted(0, 0, minSize.width(), minSize.height());
		}

		QRectF AbstractChartLayout::calculateTitleGeometry(const QRectF &geometry, ChartTitle *title) const
		{
		title->setGeometry(geometry);
Miikka Heikkinen Fix clearing the chart title...	r2876	if (title->text().isEmpty()) {
		return geometry;
		} else {
		// Round to full pixel via QPoint to avoid one pixel clipping on the edge in some cases
		QPointF center((geometry.center() - title->boundingRect().center()).toPoint());

		title->setPos(center.x(), title->pos().y());
		return geometry.adjusted(0, title->boundingRect().height() + 1, 0, 0);
		}
Miikka Heikkinen Add Polar chart support...	r2483	}

		QRectF AbstractChartLayout::calculateTitleMinimum(const QRectF &minimum, ChartTitle *title) const
		{
		QSizeF min = title->sizeHint(Qt::MinimumSize);
		return minimum.adjusted(0, 0, min.width(), min.height());
		}

		QSizeF AbstractChartLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
		{
		Q_UNUSED(constraint);
		if (which == Qt::MinimumSize) {
		QList<ChartAxisElement *> axes = m_presenter->axisItems();
		ChartTitle *title = m_presenter->titleElement();
		QLegend *legend = m_presenter->legend();
		QRectF minimumRect(0, 0, 0, 0);
		minimumRect = calculateBackgroundMinimum(minimumRect);
		minimumRect = calculateContentMinimum(minimumRect);
		minimumRect = calculateTitleMinimum(minimumRect, title);
		minimumRect = calculateLegendMinimum(minimumRect, legend);
		minimumRect = calculateAxisMinimum(minimumRect, axes);
		return minimumRect.united(m_minChartRect).size().toSize();
		}
		return QSize(-1, -1);
		}

		void AbstractChartLayout::setMargins(const QMargins &margins)
		{
		if (m_margins != margins) {
		m_margins = margins;
		updateGeometry();
		}
		}

		QMargins AbstractChartLayout::margins() const
		{
		return m_margins;
		}

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