HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/axis/polarchartaxis.cpp

Don't reserve space for chart title if it is empty....

Don't reserve space for chart title if it is empty. If title.isEmpty() returns true, chart title is no longer reserved any space. If you want to reserve space for "empty" title in the future, you can do so by specifying e.g. a single space for title. Task-number: QTRD-3480 Change-Id: I5b2b44acf715b3bd9b4243049c4985ca63a4a16d Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2776:bc1f6aa59d42


                r2794:05fa3caa7879

Download file

             polarchartaxis.cpp
        
                    124 lines
            
             | 3.6 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / axis / polarchartaxis.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      /****************************************************************************

      **

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** Copyright (C) 2015 The Qt Company Ltd

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** For any questions to The Qt Company, please use contact form at http://qt.io

        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...

              r2740
            
      ** Licensees holding valid commercial license for Qt may use this file in

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

      ** or, alternatively, in accordance with the terms contained in a written

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** agreement between you and The Qt Company.

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

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

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** contact form at http://qt.io

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

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

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/polarchartaxis_p.h>

      #include <private/qabstractaxis_p.h>

      #include <private/chartpresenter_p.h>

        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
            
      PolarChartAxis::PolarChartAxis(QAbstractAxis *axis, QGraphicsItem *item, bool intervalAxis)

          : ChartAxisElement(axis, item, intervalAxis)

      {

      }

      PolarChartAxis::~PolarChartAxis()

      {

      }

      void PolarChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)

      {

          Q_UNUSED(grid);

          setAxisGeometry(axis);

          if (isEmpty())

              return;

          QVector<qreal> layout = calculateLayout();

          updateLayout(layout);

      }

      QRectF PolarChartAxis::gridGeometry() const

      {

          return QRectF();

      }

      void PolarChartAxis::updateLayout(QVector<qreal> &layout)

      {

          int diff = ChartAxisElement::layout().size() - layout.size();

          if (animation()) {

              switch (presenter()->state()) {

        Miikka Heikkinen
    
Fix some warnings for android build....

              r2504
            
              case ChartPresenter::ZoomInState:

              case ChartPresenter::ZoomOutState:

              case ChartPresenter::ScrollUpState:

              case ChartPresenter::ScrollLeftState:

              case ChartPresenter::ScrollDownState:

              case ChartPresenter::ScrollRightState:

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
              case ChartPresenter::ShowState:

                  animation()->setAnimationType(AxisAnimation::DefaultAnimation);

                  break;

              }

              // Update to "old" geometry before starting animation to avoid incorrectly sized

              // axes lingering in wrong position compared to series plot before animation can kick in.

              // Note that the position mismatch still exists even with this update, but it will be

              // far less ugly.

              updateGeometry();

          }

          if (diff > 0)

              deleteItems(diff);

          else if (diff < 0)

              createItems(-diff);

          if (animation()) {

              animation()->setValues(ChartAxisElement::layout(), layout);

              presenter()->startAnimation(animation());

          } else {

              setLayout(layout);

              updateGeometry();

          }

      }

      bool PolarChartAxis::isEmpty()

      {

          return !axisGeometry().isValid() || qFuzzyIsNull(min() - max());

      }

      void PolarChartAxis::deleteItems(int count)

      {

          QList<QGraphicsItem *> gridLines = gridItems();

          QList<QGraphicsItem *> labels = labelItems();

          QList<QGraphicsItem *> shades = shadeItems();

          QList<QGraphicsItem *> axis = arrowItems();

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

              if (gridItems().size() == 1 || (((gridLines.size() + 1) % 2) && gridLines.size() > 0))

                  delete(shades.takeLast());

              delete(gridLines.takeLast());

              delete(labels.takeLast());

              delete(axis.takeLast());

          }

      }

      void PolarChartAxis::handleShadesBrushChanged(const QBrush &brush)

      {

          foreach (QGraphicsItem *item, shadeItems())

              static_cast<QGraphicsPathItem *>(item)->setBrush(brush);

      }

      void PolarChartAxis::handleShadesPenChanged(const QPen &pen)

      {

          foreach (QGraphicsItem *item, shadeItems())

              static_cast<QGraphicsPathItem *>(item)->setPen(pen);

      }

      #include "moc_polarchartaxis_p.cpp"

        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 Add Polar chart support...	r2483	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Miikka Heikkinen Add Polar chart support...	r2483	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
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...	r2740	** Licensees holding valid commercial license for Qt may use this file in
		** accordance with the Qt License Agreement provided with the Software
		** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala Copyright header changes...	r2776	** agreement between you and The Qt Company.
Miikka Heikkinen Add Polar chart support...	r2483	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Miikka Heikkinen Add Polar chart support...	r2483	**
		****************************************************************************/

Titta Heikkala Fix include syntax...	r2714	#include <private/polarchartaxis_p.h>
		#include <private/qabstractaxis_p.h>
		#include <private/chartpresenter_p.h>
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
		PolarChartAxis::PolarChartAxis(QAbstractAxis axis, QGraphicsItem item, bool intervalAxis)
		: ChartAxisElement(axis, item, intervalAxis)
		{
		}

		PolarChartAxis::~PolarChartAxis()
		{

		}

		void PolarChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
		{
		Q_UNUSED(grid);
		setAxisGeometry(axis);

		if (isEmpty())
		return;

		QVector<qreal> layout = calculateLayout();
		updateLayout(layout);
		}

		QRectF PolarChartAxis::gridGeometry() const
		{
		return QRectF();
		}

		void PolarChartAxis::updateLayout(QVector<qreal> &layout)
		{
		int diff = ChartAxisElement::layout().size() - layout.size();

		if (animation()) {
		switch (presenter()->state()) {
Miikka Heikkinen Fix some warnings for android build....	r2504	case ChartPresenter::ZoomInState:
		case ChartPresenter::ZoomOutState:
		case ChartPresenter::ScrollUpState:
		case ChartPresenter::ScrollLeftState:
		case ChartPresenter::ScrollDownState:
		case ChartPresenter::ScrollRightState:
Miikka Heikkinen Add Polar chart support...	r2483	case ChartPresenter::ShowState:
		animation()->setAnimationType(AxisAnimation::DefaultAnimation);
		break;
		}
		// Update to "old" geometry before starting animation to avoid incorrectly sized
		// axes lingering in wrong position compared to series plot before animation can kick in.
		// Note that the position mismatch still exists even with this update, but it will be
		// far less ugly.
		updateGeometry();
		}

		if (diff > 0)
		deleteItems(diff);
		else if (diff < 0)
		createItems(-diff);

		if (animation()) {
		animation()->setValues(ChartAxisElement::layout(), layout);
		presenter()->startAnimation(animation());
		} else {
		setLayout(layout);
		updateGeometry();
		}
		}

		bool PolarChartAxis::isEmpty()
		{
		return !axisGeometry().isValid() \|\| qFuzzyIsNull(min() - max());
		}

		void PolarChartAxis::deleteItems(int count)
		{
		QList<QGraphicsItem *> gridLines = gridItems();
		QList<QGraphicsItem *> labels = labelItems();
		QList<QGraphicsItem *> shades = shadeItems();
		QList<QGraphicsItem *> axis = arrowItems();

		for (int i = 0; i < count; ++i) {
		if (gridItems().size() == 1 \|\| (((gridLines.size() + 1) % 2) && gridLines.size() > 0))
		delete(shades.takeLast());
		delete(gridLines.takeLast());
		delete(labels.takeLast());
		delete(axis.takeLast());
		}
		}

		void PolarChartAxis::handleShadesBrushChanged(const QBrush &brush)
		{
		foreach (QGraphicsItem *item, shadeItems())
		static_cast<QGraphicsPathItem *>(item)->setBrush(brush);
		}

		void PolarChartAxis::handleShadesPenChanged(const QPen &pen)
		{
		foreach (QGraphicsItem *item, shadeItems())
		static_cast<QGraphicsPathItem *>(item)->setPen(pen);
		}

		#include "moc_polarchartaxis_p.cpp"

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