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

Fix shades for log and category axes....

Fix shades for log and category axes. Partial spans at the chart edges are now shaded properly. Task-number: QTRD-1940 Change-Id: Ibe03a2b9638ccb16d9c8c9bc7f2a0f924a7115d4 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2721:cc2d0eaf2462


                r2721:cc2d0eaf2462

Download file

             cartesianchartaxis.cpp
        
                    201 lines
            
             | 6.5 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / axis / cartesianchartaxis.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Add Polar chart support...

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

      **

        Titta Heikkala
    
Update copyright year...

              r2688
            
      ** Copyright (C) 2014 Digia Plc

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** This file is part of the Qt Enterprise Charts Add-on.

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      **

      ** $QT_BEGIN_LICENSE$

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** Licensees holding valid Qt Enterprise licenses may use this file in

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

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      ** 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$

      **

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

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/cartesianchartaxis_p.h>

      #include <QtCharts/QAbstractAxis>

      #include <private/qabstractaxis_p.h>

      #include <private/chartpresenter_p.h>

      #include <private/abstractchartlayout_p.h>

      #include <private/abstractdomain_p.h>

      #include <private/linearrowitem_p.h>

      #include <QtCharts/QValueAxis>

      #include <QtCharts/QLogValueAxis>

      #include <QtWidgets/QGraphicsLayout>

      #include <QtGui/QTextDocument>

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

          : ChartAxisElement(axis, item, intervalAxis)

      {

          Q_ASSERT(item);

      }

      CartesianChartAxis::~CartesianChartAxis()

      {

      }

      void CartesianChartAxis::createItems(int count)

      {

          if (arrowItems().size() == 0) {

              QGraphicsLineItem *arrow = new LineArrowItem(this, this);

              arrow->setPen(axis()->linePen());

              arrowGroup()->addToGroup(arrow);

          }

          if (intervalAxis() && gridItems().size() == 0) {

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

                  QGraphicsLineItem *item = new QGraphicsLineItem(this);

                  item->setPen(axis()->gridLinePen());

                  gridGroup()->addToGroup(item);

        Miikka Heikkinen
    
Fix shades for log and category axes....

              r2721
            
                  QGraphicsRectItem *shades = new QGraphicsRectItem(this);

                  shades->setPen(axis()->shadesPen());

                  shades->setBrush(axis()->shadesBrush());

                  shadeGroup()->addToGroup(shades);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
              }

          }

        Titta Heikkala
    
Fix setting the axis title...

              r2608
            
          QGraphicsTextItem *title = titleItem();

          title->setFont(axis()->titleFont());

          title->setDefaultTextColor(axis()->titleBrush().color());

          title->setHtml(axis()->titleText());

        Miikka Heikkinen
    
Add Polar chart support...

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

              QGraphicsLineItem *arrow = new QGraphicsLineItem(this);

              QGraphicsLineItem *grid = new QGraphicsLineItem(this);

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

              r2539
            
              QGraphicsTextItem *label = new QGraphicsTextItem(this);

        Miikka Heikkinen
    
Fix text item margins...

              r2592
            
              label->document()->setDocumentMargin(ChartPresenter::textMargin());

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
              arrow->setPen(axis()->linePen());

              grid->setPen(axis()->gridLinePen());

              label->setFont(axis()->labelsFont());

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

              r2539
            
              label->setDefaultTextColor(axis()->labelsBrush().color());

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
              label->setRotation(axis()->labelsAngle());

              arrowGroup()->addToGroup(arrow);

              gridGroup()->addToGroup(grid);

              labelGroup()->addToGroup(label);

        Miikka Heikkinen
    
Fix shades for log and category axes....

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

                  QGraphicsRectItem *shades = new QGraphicsRectItem(this);

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
                  shades->setPen(axis()->shadesPen());

                  shades->setBrush(axis()->shadesBrush());

                  shadeGroup()->addToGroup(shades);

              }

          }

      }

      void CartesianChartAxis::deleteItems(int count)

      {

          QList<QGraphicsItem *> lines = gridItems();

          QList<QGraphicsItem *> labels = labelItems();

          QList<QGraphicsItem *> shades = shadeItems();

          QList<QGraphicsItem *> axis = arrowItems();

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

        Miikka Heikkinen
    
Fix shades for log and category axes....

              r2721
            
              if (lines.size() == 1 || (((lines.size() + 1) % 2) && lines.size() > 0))

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
                  delete(shades.takeLast());

              delete(lines.takeLast());

              delete(labels.takeLast());

              delete(axis.takeLast());

          }

      }

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

      {

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

          if (diff > 0)

              deleteItems(diff);

          else if (diff < 0)

              createItems(-diff);

          if (animation()) {

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

              case ChartPresenter::ZoomInState:

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

                  animation()->setAnimationPoint(presenter()->statePoint());

                  break;

              case ChartPresenter::ZoomOutState:

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

                  animation()->setAnimationPoint(presenter()->statePoint());

                  break;

              case ChartPresenter::ScrollUpState:

              case ChartPresenter::ScrollLeftState:

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

                  break;

              case ChartPresenter::ScrollDownState:

              case ChartPresenter::ScrollRightState:

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

                  break;

              case ChartPresenter::ShowState:

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

                  break;

              }

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

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

          } else {

              setLayout(layout);

              updateGeometry();

          }

      }

      bool CartesianChartAxis::isEmpty()

      {

          return axisGeometry().isEmpty()

                 || gridGeometry().isEmpty()

                 || qFuzzyCompare(min(), max());

      }

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

      {

          m_gridRect = grid;

          setAxisGeometry(axis);

          if (isEmpty())

              return;

          QVector<qreal> layout = calculateLayout();

          updateLayout(layout);

      }

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

      {

          Q_UNUSED(which);

          Q_UNUSED(constraint);

          return QSizeF();

      }

      void CartesianChartAxis::handleArrowPenChanged(const QPen &pen)

      {

          foreach (QGraphicsItem *item, arrowItems())

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

      }

      void CartesianChartAxis::handleGridPenChanged(const QPen &pen)

      {

          foreach (QGraphicsItem *item, gridItems())

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

      }

      void CartesianChartAxis::handleShadesBrushChanged(const QBrush &brush)

      {

          foreach (QGraphicsItem *item, shadeItems())

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

      }

      void CartesianChartAxis::handleShadesPenChanged(const QPen &pen)

      {

          foreach (QGraphicsItem *item, shadeItems())

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

      }

      #include "moc_cartesianchartaxis_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 Update copyright year...	r2688	** Copyright (C) 2014 Digia Plc
Miikka Heikkinen Add Polar chart support...	r2483	** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** This file is part of the Qt Enterprise Charts Add-on.
Miikka Heikkinen Add Polar chart support...	r2483	**
		** $QT_BEGIN_LICENSE$
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** Licensees holding valid Qt Enterprise licenses may use this file in
		** accordance with the Qt Enterprise License Agreement provided with the
Miikka Heikkinen Add Polar chart support...	r2483	** 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$
		**
		****************************************************************************/

Titta Heikkala Fix include syntax...	r2714	#include <private/cartesianchartaxis_p.h>
		#include <QtCharts/QAbstractAxis>
		#include <private/qabstractaxis_p.h>
		#include <private/chartpresenter_p.h>
		#include <private/abstractchartlayout_p.h>
		#include <private/abstractdomain_p.h>
		#include <private/linearrowitem_p.h>
		#include <QtCharts/QValueAxis>
		#include <QtCharts/QLogValueAxis>
		#include <QtWidgets/QGraphicsLayout>
		#include <QtGui/QTextDocument>
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
		CartesianChartAxis::CartesianChartAxis(QAbstractAxis axis, QGraphicsItem item , bool intervalAxis)
		: ChartAxisElement(axis, item, intervalAxis)
		{
		Q_ASSERT(item);
		}


		CartesianChartAxis::~CartesianChartAxis()
		{
		}

		void CartesianChartAxis::createItems(int count)
		{
		if (arrowItems().size() == 0) {
		QGraphicsLineItem *arrow = new LineArrowItem(this, this);
		arrow->setPen(axis()->linePen());
		arrowGroup()->addToGroup(arrow);
		}

		if (intervalAxis() && gridItems().size() == 0) {
		for (int i = 0 ; i < 2 ; i ++){
		QGraphicsLineItem *item = new QGraphicsLineItem(this);
		item->setPen(axis()->gridLinePen());
		gridGroup()->addToGroup(item);
Miikka Heikkinen Fix shades for log and category axes....	r2721	QGraphicsRectItem *shades = new QGraphicsRectItem(this);
		shades->setPen(axis()->shadesPen());
		shades->setBrush(axis()->shadesBrush());
		shadeGroup()->addToGroup(shades);
Miikka Heikkinen Add Polar chart support...	r2483	}
		}

Titta Heikkala Fix setting the axis title...	r2608	QGraphicsTextItem *title = titleItem();
		title->setFont(axis()->titleFont());
		title->setDefaultTextColor(axis()->titleBrush().color());
		title->setHtml(axis()->titleText());

Miikka Heikkinen Add Polar chart support...	r2483	for (int i = 0; i < count; ++i) {
		QGraphicsLineItem *arrow = new QGraphicsLineItem(this);
		QGraphicsLineItem *grid = new QGraphicsLineItem(this);
Miikka Heikkinen Added HTML support for various text items...	r2539	QGraphicsTextItem *label = new QGraphicsTextItem(this);
Miikka Heikkinen Fix text item margins...	r2592	label->document()->setDocumentMargin(ChartPresenter::textMargin());
Miikka Heikkinen Add Polar chart support...	r2483	arrow->setPen(axis()->linePen());
		grid->setPen(axis()->gridLinePen());
		label->setFont(axis()->labelsFont());
Miikka Heikkinen Added HTML support for various text items...	r2539	label->setDefaultTextColor(axis()->labelsBrush().color());
Miikka Heikkinen Add Polar chart support...	r2483	label->setRotation(axis()->labelsAngle());
		arrowGroup()->addToGroup(arrow);
		gridGroup()->addToGroup(grid);
		labelGroup()->addToGroup(label);

Miikka Heikkinen Fix shades for log and category axes....	r2721	if (gridItems().size() == 1 \|\| (((gridItems().size() + 1) % 2) && gridItems().size() > 0)) {
		QGraphicsRectItem *shades = new QGraphicsRectItem(this);
Miikka Heikkinen Add Polar chart support...	r2483	shades->setPen(axis()->shadesPen());
		shades->setBrush(axis()->shadesBrush());
		shadeGroup()->addToGroup(shades);
		}
		}
		}

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

		for (int i = 0; i < count; ++i) {
Miikka Heikkinen Fix shades for log and category axes....	r2721	if (lines.size() == 1 \|\| (((lines.size() + 1) % 2) && lines.size() > 0))
Miikka Heikkinen Add Polar chart support...	r2483	delete(shades.takeLast());
		delete(lines.takeLast());
		delete(labels.takeLast());
		delete(axis.takeLast());
		}
		}

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

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

		if (animation()) {
		switch (presenter()->state()) {
		case ChartPresenter::ZoomInState:
		animation()->setAnimationType(AxisAnimation::ZoomInAnimation);
		animation()->setAnimationPoint(presenter()->statePoint());
		break;
		case ChartPresenter::ZoomOutState:
		animation()->setAnimationType(AxisAnimation::ZoomOutAnimation);
		animation()->setAnimationPoint(presenter()->statePoint());
		break;
		case ChartPresenter::ScrollUpState:
		case ChartPresenter::ScrollLeftState:
		animation()->setAnimationType(AxisAnimation::MoveBackwordAnimation);
		break;
		case ChartPresenter::ScrollDownState:
		case ChartPresenter::ScrollRightState:
		animation()->setAnimationType(AxisAnimation::MoveForwardAnimation);
		break;
		case ChartPresenter::ShowState:
		animation()->setAnimationType(AxisAnimation::DefaultAnimation);
		break;
		}
		animation()->setValues(ChartAxisElement::layout(), layout);
		presenter()->startAnimation(animation());
		} else {
		setLayout(layout);
		updateGeometry();
		}
		}

		bool CartesianChartAxis::isEmpty()
		{
		return axisGeometry().isEmpty()
		\|\| gridGeometry().isEmpty()
		\|\| qFuzzyCompare(min(), max());
		}

		void CartesianChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
		{
		m_gridRect = grid;
		setAxisGeometry(axis);

		if (isEmpty())
		return;

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

		QSizeF CartesianChartAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
		{
		Q_UNUSED(which);
		Q_UNUSED(constraint);
		return QSizeF();
		}

		void CartesianChartAxis::handleArrowPenChanged(const QPen &pen)
		{
		foreach (QGraphicsItem *item, arrowItems())
		static_cast<QGraphicsLineItem *>(item)->setPen(pen);
		}

		void CartesianChartAxis::handleGridPenChanged(const QPen &pen)
		{
		foreach (QGraphicsItem *item, gridItems())
		static_cast<QGraphicsLineItem *>(item)->setPen(pen);
		}

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

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

		#include "moc_cartesianchartaxis_p.cpp"

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