HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/axis/valueaxis/chartvalueaxisy.cpp

Removed some carbage from pie series public APIs

Jani Honkonen - - Load All Authors

File last commit:

r2015:b5f96ea8740c


                r2042:5963e0c0c35d

Download file

             chartvalueaxisy.cpp
        
                    126 lines
            
             | 3.9 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / axis / valueaxis / chartvalueaxisy.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      /****************************************************************************

      **

      ** Copyright (C) 2012 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$

      **

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

        Marek Rosa
    
renamed QValueAxis related files

              r1805
            
      #include "chartvalueaxisy_p.h"

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      #include "qabstractaxis.h"

      #include "chartpresenter_p.h"

        Marek Rosa
    
renamed QValueAxis related files

              r1805
            
      #include "qvalueaxis.h"

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      #include <QGraphicsLayout>

      #include <QFontMetrics>

        Michal Klocek
    
Refactor animator...

              r1735
            
      #include <qmath.h>

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      static int label_padding = 5;

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Marek Rosa
    
renamed QValueAxis related files

              r1805
            
      ChartValueAxisY::ChartValueAxisY(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),

        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
      m_tickCount(0)

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      {

      }

        Marek Rosa
    
renamed QValueAxis related files

              r1805
            
      ChartValueAxisY::~ChartValueAxisY()

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      {

      }

        Marek Rosa
    
renamed QValueAxis related files

              r1805
            
      QVector<qreal> ChartValueAxisY::calculateLayout() const

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      {

        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
          Q_ASSERT(m_tickCount>=2);

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          QVector<qreal> points;

        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
          points.resize(m_tickCount);

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
          const qreal deltaY = m_rect.height()/(m_tickCount-1);

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

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
              int y = i * -deltaY + m_rect.bottom();

              points[i] = y;

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          }

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          return points;

      }

        Marek Rosa
    
renamed QValueAxis related files

              r1805
            
      void ChartValueAxisY::updateGeometry()

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      {

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
          const QVector<qreal> &layout = ChartAxis::layout();

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          m_minWidth = 0;

          m_minHeight = 0;

          if(layout.isEmpty()) return;

          QStringList ticksList;

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          createNumberLabels(ticksList,m_min,m_max,layout.size());

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          QList<QGraphicsItem *> lines = m_grid->childItems();

          QList<QGraphicsItem *> labels = m_labels->childItems();

          QList<QGraphicsItem *> shades = m_shades->childItems();

        Michal Klocek
    
Refactor Visibly methods of axis...

              r1729
            
          QList<QGraphicsItem *> axis = m_arrow->childItems();

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          Q_ASSERT(labels.size() == ticksList.size());

          Q_ASSERT(layout.size() == ticksList.size());

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
          qreal height =  2*m_rect.bottom();

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
          lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          for (int i = 0; i < layout.size(); ++i) {

              QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
              lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
              QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
                  labelItem->setText(ticksList.at(i));

                  const QRectF& rect = labelItem->boundingRect();

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
                  QPointF center = rect.center();

                  labelItem->setTransformOriginPoint(center.x(), center.y());

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
                  labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i]-center.y());

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
        Marek Rosa
    
Removed generic chartaxis

              r1561
            
                  if(labelItem->pos().y()+rect.height()>height) {

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
                      labelItem->setVisible(false);

                      lineItem->setVisible(false);

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
                  }

                  else {

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
                      labelItem->setVisible(true);

                      lineItem->setVisible(true);

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
                      height=labelItem->pos().y();

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
                  }

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
                  m_minWidth=qMax(rect.width()+label_padding,m_minWidth);

                  m_minHeight+=rect.height();

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
              if ((i+1)%2 && i>1) {

                  QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
                  rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
              }

              lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));

        Marek Rosa
    
Removed generic chartaxis

              r1561
            
              lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
          }

        Michal Klocek
    
Adds checkLayout call, when geometry of axis updated

              r1890
            
        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      }

        Marek Rosa
    
renamed QValueAxis related files

              r1805
            
      void ChartValueAxisY::handleAxisUpdated()

        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
      {

        Marek Rosa
    
class QValuesAxis renamed to QValueAxis

              r1804
            
          QValueAxis* axis = qobject_cast<QValueAxis*>(m_chartAxis);

        Marek Rosa
    
QValueAxis ticksCount to tickCount

              r1807
            
          m_tickCount = axis->tickCount();

        Michal Klocek
    
Refactors Domain and Axis...

              r1698
            
          ChartAxis::handleAxisUpdated();

      }

        Marek Rosa
    
Added Chart classes for value and categories axis

              r1555
            
      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

Marek Rosa Added Chart classes for value and categories axis	r1555	/****************************************************************************
		**
		** Copyright (C) 2012 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$
		**
		****************************************************************************/

Marek Rosa renamed QValueAxis related files	r1805	#include "chartvalueaxisy_p.h"
Marek Rosa Added Chart classes for value and categories axis	r1555	#include "qabstractaxis.h"
		#include "chartpresenter_p.h"
Marek Rosa renamed QValueAxis related files	r1805	#include "qvalueaxis.h"
Marek Rosa Added Chart classes for value and categories axis	r1555	#include <QGraphicsLayout>
		#include <QFontMetrics>
Michal Klocek Refactor animator...	r1735	#include <qmath.h>
Marek Rosa Added Chart classes for value and categories axis	r1555
		static int label_padding = 5;

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Marek Rosa renamed QValueAxis related files	r1805	ChartValueAxisY::ChartValueAxisY(QAbstractAxis axis,ChartPresenter presenter) : ChartAxis(axis,presenter),
Michal Klocek Refactors Domain and Axis...	r1698	m_tickCount(0)
Marek Rosa Added Chart classes for value and categories axis	r1555	{
		}

Marek Rosa renamed QValueAxis related files	r1805	ChartValueAxisY::~ChartValueAxisY()
Marek Rosa Added Chart classes for value and categories axis	r1555	{
		}

Marek Rosa renamed QValueAxis related files	r1805	QVector<qreal> ChartValueAxisY::calculateLayout() const
Marek Rosa Added Chart classes for value and categories axis	r1555	{
Michal Klocek Refactors Domain and Axis...	r1698	Q_ASSERT(m_tickCount>=2);
Marek Rosa Added Chart classes for value and categories axis	r1555
		QVector<qreal> points;
Michal Klocek Refactors Domain and Axis...	r1698	points.resize(m_tickCount);
Marek Rosa Added Chart classes for value and categories axis	r1555
Michal Klocek Refactors Domain and Axis...	r1698	const qreal deltaY = m_rect.height()/(m_tickCount-1);
		for (int i = 0; i < m_tickCount; ++i) {
Marek Rosa Removed generic chartaxis	r1561	int y = i * -deltaY + m_rect.bottom();
		points[i] = y;
Marek Rosa Added Chart classes for value and categories axis	r1555	}
Marek Rosa Removed generic chartaxis	r1561
Marek Rosa Added Chart classes for value and categories axis	r1555	return points;
		}

Marek Rosa renamed QValueAxis related files	r1805	void ChartValueAxisY::updateGeometry()
Marek Rosa Added Chart classes for value and categories axis	r1555	{
Marek Rosa Removed generic chartaxis	r1561	const QVector<qreal> &layout = ChartAxis::layout();
Marek Rosa Added Chart classes for value and categories axis	r1555	m_minWidth = 0;
		m_minHeight = 0;

		if(layout.isEmpty()) return;

		QStringList ticksList;

Michal Klocek Refactor QChart API...	r1577	createNumberLabels(ticksList,m_min,m_max,layout.size());
Marek Rosa Added Chart classes for value and categories axis	r1555
		QList<QGraphicsItem *> lines = m_grid->childItems();
		QList<QGraphicsItem *> labels = m_labels->childItems();
		QList<QGraphicsItem *> shades = m_shades->childItems();
Michal Klocek Refactor Visibly methods of axis...	r1729	QList<QGraphicsItem *> axis = m_arrow->childItems();
Marek Rosa Added Chart classes for value and categories axis	r1555
		Q_ASSERT(labels.size() == ticksList.size());
		Q_ASSERT(layout.size() == ticksList.size());

Marek Rosa Removed generic chartaxis	r1561	qreal height = 2*m_rect.bottom();

Marek Rosa Added Chart classes for value and categories axis	r1555	QGraphicsLineItem lineItem = static_cast<QGraphicsLineItem>(axis.at(0));
Marek Rosa Removed generic chartaxis	r1561	lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());
Marek Rosa Added Chart classes for value and categories axis	r1555
		for (int i = 0; i < layout.size(); ++i) {
		QGraphicsLineItem lineItem = static_cast<QGraphicsLineItem>(lines.at(i));
Marek Rosa Removed generic chartaxis	r1561	lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
Marek Rosa Added Chart classes for value and categories axis	r1555	QGraphicsSimpleTextItem labelItem = static_cast<QGraphicsSimpleTextItem>(labels.at(i));
Marek Rosa Removed generic chartaxis	r1561
Marek Rosa Added Chart classes for value and categories axis	r1555	labelItem->setText(ticksList.at(i));
		const QRectF& rect = labelItem->boundingRect();
Marek Rosa Removed generic chartaxis	r1561
Marek Rosa Added Chart classes for value and categories axis	r1555	QPointF center = rect.center();
		labelItem->setTransformOriginPoint(center.x(), center.y());
Marek Rosa Removed generic chartaxis	r1561	labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i]-center.y());
Marek Rosa Added Chart classes for value and categories axis	r1555
Marek Rosa Removed generic chartaxis	r1561	if(labelItem->pos().y()+rect.height()>height) {
Marek Rosa Added Chart classes for value and categories axis	r1555	labelItem->setVisible(false);
		lineItem->setVisible(false);
Marek Rosa Removed generic chartaxis	r1561	}
		else {
Marek Rosa Added Chart classes for value and categories axis	r1555	labelItem->setVisible(true);
		lineItem->setVisible(true);
Marek Rosa Removed generic chartaxis	r1561	height=labelItem->pos().y();
Marek Rosa Added Chart classes for value and categories axis	r1555	}
Marek Rosa Removed generic chartaxis	r1561
		m_minWidth=qMax(rect.width()+label_padding,m_minWidth);
		m_minHeight+=rect.height();
Marek Rosa Added Chart classes for value and categories axis	r1555
		if ((i+1)%2 && i>1) {
		QGraphicsRectItem rectItem = static_cast<QGraphicsRectItem>(shades.at(i/2-1));
Marek Rosa Removed generic chartaxis	r1561	rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);
Marek Rosa Added Chart classes for value and categories axis	r1555	}
		lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
Marek Rosa Removed generic chartaxis	r1561	lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);
Marek Rosa Added Chart classes for value and categories axis	r1555	}
Michal Klocek Adds checkLayout call, when geometry of axis updated	r1890
Marek Rosa Added Chart classes for value and categories axis	r1555	}

Marek Rosa renamed QValueAxis related files	r1805	void ChartValueAxisY::handleAxisUpdated()
Michal Klocek Refactors Domain and Axis...	r1698	{
Marek Rosa class QValuesAxis renamed to QValueAxis	r1804	QValueAxis* axis = qobject_cast<QValueAxis*>(m_chartAxis);
Marek Rosa QValueAxis ticksCount to tickCount	r1807	m_tickCount = axis->tickCount();
Michal Klocek Refactors Domain and Axis...	r1698	ChartAxis::handleAxisUpdated();
		}


Marek Rosa Added Chart classes for value and categories axis	r1555	QTCOMMERCIALCHART_END_NAMESPACE