HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/layout/polarchartlayout.cpp

Merge remote-tracking branch 'origin/5.6' into 5.7...

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2898:03a6177a3223

master

Download file

             polarchartlayout.cpp
        
                    91 lines
            
             | 3.3 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / layout / polarchartlayout.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

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

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        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

        Miikka Heikkinen
    
Updated license...

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

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

      **

      ** GNU General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU

      ** General Public License version 3 or (at your option) any later version

      ** approved by the KDE Free Qt Foundation. The licenses are as published by

      ** the Free Software Foundation and appearing in the file LICENSE.GPL3

      ** included in the packaging of this file. Please review the following

      ** information to ensure the GNU General Public License requirements will

      ** be met: https://www.gnu.org/licenses/gpl-3.0.html.

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/polarchartlayout_p.h>

      #include <private/chartpresenter_p.h>

      #include <private/polarchartaxis_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;

      PolarChartLayout::PolarChartLayout(ChartPresenter *presenter)

          : AbstractChartLayout(presenter)

      {

      }

      PolarChartLayout::~PolarChartLayout()

      {

      }

      QRectF PolarChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxisElement *> &axes) const

      {

          // How to handle multiple angular/radial axes?

          qreal axisRadius = geometry.height() / 2.0;

          if (geometry.width() < geometry.height())

              axisRadius = geometry.width() / 2.0;

          int titleHeight = 0;

          foreach (ChartAxisElement *chartAxis, axes) {

              if (!chartAxis->isVisible())

                  continue;

              PolarChartAxis *polarChartAxis = static_cast<PolarChartAxis *>(chartAxis);

              qreal radius = polarChartAxis->preferredAxisRadius(geometry.size());

              if (radius < axisRadius)

                  axisRadius = radius;

              if (chartAxis->axis()->orientation() == Qt::Horizontal

                  && chartAxis->axis()->isTitleVisible()

                  && !chartAxis->axis()->titleText().isEmpty()) {

                  // If axis has angular title, adjust geometry down by the space title takes

        Miikka Heikkinen
    
Added HTML support for various text items...

              r2539
            
                  QRectF dummyRect = ChartPresenter::textBoundingRect(chartAxis->axis()->titleFont(), chartAxis->axis()->titleText());

        Miikka Heikkinen
    
Fix multi-line axis titles....

              r2530
            
                  titleHeight = (dummyRect.height() / 2.0) + chartAxis->titlePadding();

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
              }

          }

          QRectF axisRect;

          axisRect.setSize(QSizeF(axisRadius * 2.0, axisRadius * 2.0));

          axisRect.moveCenter(geometry.center());

          axisRect.adjust(0, titleHeight, 0, titleHeight);

          foreach (ChartAxisElement *chartAxis, axes)

              chartAxis->setGeometry(axisRect, QRectF());

          return axisRect;

      }

      QRectF PolarChartLayout::calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxisElement *> &axes) const

      {

          Q_UNUSED(axes);

          return minimum;

      }

        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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
Miikka Heikkinen Add Polar chart support...	r2483	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Miikka Heikkinen Add Polar chart support...	r2483	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Miikka Heikkinen Add Polar chart support...	r2483	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
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
Miikka Heikkinen Updated license...	r2854	** and conditions see https://www.qt.io/terms-conditions. For further
		** information use the contact form at https://www.qt.io/contact-us.
		**
		** GNU General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU
		** General Public License version 3 or (at your option) any later version
		** approved by the KDE Free Qt Foundation. The licenses are as published by
		** the Free Software Foundation and appearing in the file LICENSE.GPL3
		** included in the packaging of this file. Please review the following
		** information to ensure the GNU General Public License requirements will
		** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Miikka Heikkinen Add Polar chart support...	r2483	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Miikka Heikkinen Add Polar chart support...	r2483
Titta Heikkala Fix include syntax...	r2714	#include <private/polarchartlayout_p.h>
		#include <private/chartpresenter_p.h>
		#include <private/polarchartaxis_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;

		PolarChartLayout::PolarChartLayout(ChartPresenter *presenter)
		: AbstractChartLayout(presenter)
		{
		}

		PolarChartLayout::~PolarChartLayout()
		{
		}

		QRectF PolarChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxisElement *> &axes) const
		{
		// How to handle multiple angular/radial axes?
		qreal axisRadius = geometry.height() / 2.0;
		if (geometry.width() < geometry.height())
		axisRadius = geometry.width() / 2.0;

		int titleHeight = 0;
		foreach (ChartAxisElement *chartAxis, axes) {
		if (!chartAxis->isVisible())
		continue;

		PolarChartAxis polarChartAxis = static_cast<PolarChartAxis >(chartAxis);
		qreal radius = polarChartAxis->preferredAxisRadius(geometry.size());
		if (radius < axisRadius)
		axisRadius = radius;

		if (chartAxis->axis()->orientation() == Qt::Horizontal
		&& chartAxis->axis()->isTitleVisible()
		&& !chartAxis->axis()->titleText().isEmpty()) {
		// If axis has angular title, adjust geometry down by the space title takes
Miikka Heikkinen Added HTML support for various text items...	r2539	QRectF dummyRect = ChartPresenter::textBoundingRect(chartAxis->axis()->titleFont(), chartAxis->axis()->titleText());
Miikka Heikkinen Fix multi-line axis titles....	r2530	titleHeight = (dummyRect.height() / 2.0) + chartAxis->titlePadding();
Miikka Heikkinen Add Polar chart support...	r2483	}
		}

		QRectF axisRect;
		axisRect.setSize(QSizeF(axisRadius * 2.0, axisRadius * 2.0));
		axisRect.moveCenter(geometry.center());
		axisRect.adjust(0, titleHeight, 0, titleHeight);

		foreach (ChartAxisElement *chartAxis, axes)
		chartAxis->setGeometry(axisRect, QRectF());

		return axisRect;
		}

		QRectF PolarChartLayout::calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxisElement *> &axes) const
		{
		Q_UNUSED(axes);
		return minimum;
		}

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