HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/axis/datetimeaxis/chartdatetimeaxisy.cpp

changing order of series in qmlweather example. This is a workaround to make axis values right. Should not be order dependant, like it is now

Michal Klocek - - Load All Authors

File last commit:

r2336:03ff7a7fe0a8


                r2401:71e82ffadcde

Download file

             chartdatetimeaxisy.cpp
        
                    135 lines
            
             | 3.7 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / axis / datetimeaxis / chartdatetimeaxisy.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      /****************************************************************************

      **

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

      **

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

      #include "chartdatetimeaxisy_p.h"

      #include "chartpresenter_p.h"

      #include "qdatetimeaxis.h"

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
      #include "chartlayout_p.h"

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      #include <QGraphicsLayout>

      #include <QFontMetrics>

      #include <QDateTime>

        Michal Klocek
    
Refactor animator...

              r1735
            
      #include <qmath.h>

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Refactors internals...

              r2273
            
      ChartDateTimeAxisY::ChartDateTimeAxisY(QDateTimeAxis *axis, QGraphicsItem* item)

          : VerticalAxis(axis, item),

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
            m_axis(axis)

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      {

        Michal Klocek
    
Refactors internals...

              r2273
            
          QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));

        Marek Rosa
    
Fixed: datetimeaxis not redrawing when datetime format changed

              r2326
            
          QObject::connect(m_axis,SIGNAL(formatChanged(QString)),this, SLOT(handleFormatChanged(QString)));

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      }

      ChartDateTimeAxisY::~ChartDateTimeAxisY()

      {

      }

      QVector<qreal> ChartDateTimeAxisY::calculateLayout() const

      {

        Michal Klocek
    
Refactors internals...

              r2273
            
          int tickCount = m_axis->tickCount();

          Q_ASSERT(tickCount >= 2);

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
          QVector<qreal> points;

        Michal Klocek
    
Refactors internals...

              r2273
            
          points.resize(tickCount);

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          const QRectF &gridRect = gridGeometry();

        Michal Klocek
    
Refactors internals...

              r2273
            
          const qreal deltaY = gridRect.height() / (tickCount - 1);

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

        Michal Klocek
    
Refactors axis updateGeometry handling...

              r2111
            
              int y = i * -deltaY + gridRect.bottom();

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
              points[i] = y;

          }

          return points;

      }

      void ChartDateTimeAxisY::updateGeometry()

      {

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

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          if (layout.isEmpty())

              return;

        Michal Klocek
    
Refactors internals...

              r2273
            
          setLabels(createDateTimeLabels(min(),max(), layout.size(),m_axis->format()));

        Michal Klocek
    
Refactors axis updateGeometry handling...

              r2111
            
          VerticalAxis::updateGeometry();

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      }

        Michal Klocek
    
Refactors internals...

              r2273
            
      void ChartDateTimeAxisY::handleTickCountChanged(int tick)

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      {

        Michal Klocek
    
Refactors internals...

              r2273
            
          Q_UNUSED(tick)

        Michal Klocek
    
Fixes more missing update layout calls

              r2334
            
          QGraphicsLayoutItem::updateGeometry();

        Michal Klocek
    
Refactors internals...

              r2273
            
          if(presenter()) presenter()->layout()->invalidate();

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      }

        Marek Rosa
    
Fixed: datetimeaxis not redrawing when datetime format changed

              r2326
            
      void ChartDateTimeAxisY::handleFormatChanged(const QString &format)

      {

          Q_UNUSED(format);

        Michal Klocek
    
Fixes more missing update layout calls

              r2334
            
          QGraphicsLayoutItem::updateGeometry();

        Marek Rosa
    
Fixed: datetimeaxis not redrawing when datetime format changed

              r2326
            
          if(presenter()) presenter()->layout()->invalidate();

      }

        Jani Honkonen
    
src folder: another massive victory for coding style police

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

        Michal Klocek
    
Refactors layout...

              r1965
            
      {

          Q_UNUSED(constraint)

        Michal Klocek
    
Refactors axis updateGeometry handling...

              r2111
            
          QFontMetrics fn(font());

        Michal Klocek
    
Refactors layout...

              r1965
            
          QSizeF sh;

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
          QSizeF base = VerticalAxis::sizeHint(which, constraint);

        Michal Klocek
    
Refactors internals...

              r2273
            
          QStringList ticksList = createDateTimeLabels(min(),max(),m_axis->tickCount(),m_axis->format());

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
          qreal width = 0;

          qreal height = 0;

        Michal Klocek
    
Refactors layout:...

              r2105
            
        Michal Klocek
    
Change sizeHint of vertical axis, caculate width based on each label

              r2336
            
        Michal Klocek
    
Refactors internals...

              r2273
            
          if(ticksList.empty()){

              return sh;

          }

        Michal Klocek
    
Change sizeHint of vertical axis, caculate width based on each label

              r2336
            
          int labelWidth = 0;

          foreach(const QString& s, ticksList)

          {

              labelWidth=qMax(fn.width(s),labelWidth);

          }

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
          switch (which) {

              case Qt::MinimumSize: {

                  width = fn.boundingRect("...").width() + labelPadding();

                  width += base.width();

                  height = fn.height();

                  height = qMax(height,base.height());

                  sh = QSizeF(width,height);

                  break;

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
              }

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
              case Qt::PreferredSize: {

        Michal Klocek
    
Change sizeHint of vertical axis, caculate width based on each label

              r2336
            
                  width = labelWidth + labelPadding() + 2; //two pixels of tolerance

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
                  width += base.width();

                  height = fn.height() * ticksList.count();

                  height = qMax(height,base.height());

                  sh = QSizeF(width,height);

                  break;

              }

              default:

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
              break;

          }

        Michal Klocek
    
Refactors layout...

              r1965
            
        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          return sh;

        Michal Klocek
    
Refactors layout...

              r1965
            
      }

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
        Michal Klocek
    
Refactors internals...

              r2273
            
      #include "moc_chartdatetimeaxisy_p.cpp"

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      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 QDateTimeAxis	r1717	/****************************************************************************
		**
		** 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$
		**
		****************************************************************************/

		#include "chartdatetimeaxisy_p.h"
		#include "chartpresenter_p.h"
		#include "qdatetimeaxis.h"
Michal Klocek Adds sizeHints for datetimeaxis	r2137	#include "chartlayout_p.h"
Marek Rosa Added QDateTimeAxis	r1717	#include <QGraphicsLayout>
		#include <QFontMetrics>
		#include <QDateTime>
Michal Klocek Refactor animator...	r1735	#include <qmath.h>

Marek Rosa Added QDateTimeAxis	r1717	QTCOMMERCIALCHART_BEGIN_NAMESPACE

Michal Klocek Refactors internals...	r2273	ChartDateTimeAxisY::ChartDateTimeAxisY(QDateTimeAxis axis, QGraphicsItem item)
		: VerticalAxis(axis, item),
Jani Honkonen src folder: another massive victory for coding style police	r2131	m_axis(axis)
Marek Rosa Added QDateTimeAxis	r1717	{
Michal Klocek Refactors internals...	r2273	QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
Marek Rosa Fixed: datetimeaxis not redrawing when datetime format changed	r2326	QObject::connect(m_axis,SIGNAL(formatChanged(QString)),this, SLOT(handleFormatChanged(QString)));
Marek Rosa Added QDateTimeAxis	r1717	}

		ChartDateTimeAxisY::~ChartDateTimeAxisY()
		{
		}

		QVector<qreal> ChartDateTimeAxisY::calculateLayout() const
		{
Michal Klocek Refactors internals...	r2273	int tickCount = m_axis->tickCount();

		Q_ASSERT(tickCount >= 2);
Marek Rosa Added QDateTimeAxis	r1717
		QVector<qreal> points;
Michal Klocek Refactors internals...	r2273	points.resize(tickCount);
Jani Honkonen src folder: another massive victory for coding style police	r2131	const QRectF &gridRect = gridGeometry();
Michal Klocek Refactors internals...	r2273	const qreal deltaY = gridRect.height() / (tickCount - 1);
		for (int i = 0; i < tickCount; ++i) {
Michal Klocek Refactors axis updateGeometry handling...	r2111	int y = i * -deltaY + gridRect.bottom();
Marek Rosa Added QDateTimeAxis	r1717	points[i] = y;
		}

		return points;
		}

		void ChartDateTimeAxisY::updateGeometry()
		{
		const QVector<qreal> &layout = ChartAxis::layout();
Jani Honkonen src folder: another massive victory for coding style police	r2131	if (layout.isEmpty())
		return;
Michal Klocek Refactors internals...	r2273	setLabels(createDateTimeLabels(min(),max(), layout.size(),m_axis->format()));
Michal Klocek Refactors axis updateGeometry handling...	r2111	VerticalAxis::updateGeometry();
Marek Rosa Added QDateTimeAxis	r1717	}

Michal Klocek Refactors internals...	r2273	void ChartDateTimeAxisY::handleTickCountChanged(int tick)
Marek Rosa Added QDateTimeAxis	r1717	{
Michal Klocek Refactors internals...	r2273	Q_UNUSED(tick)
Michal Klocek Fixes more missing update layout calls	r2334	QGraphicsLayoutItem::updateGeometry();
Michal Klocek Refactors internals...	r2273	if(presenter()) presenter()->layout()->invalidate();
Marek Rosa Added QDateTimeAxis	r1717	}

Marek Rosa Fixed: datetimeaxis not redrawing when datetime format changed	r2326	void ChartDateTimeAxisY::handleFormatChanged(const QString &format)
		{
		Q_UNUSED(format);
Michal Klocek Fixes more missing update layout calls	r2334	QGraphicsLayoutItem::updateGeometry();
Marek Rosa Fixed: datetimeaxis not redrawing when datetime format changed	r2326	if(presenter()) presenter()->layout()->invalidate();
		}

Jani Honkonen src folder: another massive victory for coding style police	r2131	QSizeF ChartDateTimeAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
Michal Klocek Refactors layout...	r1965	{
		Q_UNUSED(constraint)

Michal Klocek Refactors axis updateGeometry handling...	r2111	QFontMetrics fn(font());
Michal Klocek Refactors layout...	r1965	QSizeF sh;

Michal Klocek Adds sizeHints for datetimeaxis	r2137	QSizeF base = VerticalAxis::sizeHint(which, constraint);
Michal Klocek Refactors internals...	r2273	QStringList ticksList = createDateTimeLabels(min(),max(),m_axis->tickCount(),m_axis->format());
Michal Klocek Adds sizeHints for datetimeaxis	r2137	qreal width = 0;
		qreal height = 0;
Michal Klocek Refactors layout:...	r2105
Michal Klocek Change sizeHint of vertical axis, caculate width based on each label	r2336
Michal Klocek Refactors internals...	r2273	if(ticksList.empty()){
		return sh;
		}

Michal Klocek Change sizeHint of vertical axis, caculate width based on each label	r2336	int labelWidth = 0;

		foreach(const QString& s, ticksList)
		{
		labelWidth=qMax(fn.width(s),labelWidth);
		}

Michal Klocek Adds sizeHints for datetimeaxis	r2137	switch (which) {
		case Qt::MinimumSize: {
		width = fn.boundingRect("...").width() + labelPadding();
		width += base.width();
		height = fn.height();
		height = qMax(height,base.height());
		sh = QSizeF(width,height);
		break;
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	}
Michal Klocek Adds sizeHints for datetimeaxis	r2137	case Qt::PreferredSize: {
Michal Klocek Change sizeHint of vertical axis, caculate width based on each label	r2336	width = labelWidth + labelPadding() + 2; //two pixels of tolerance
Michal Klocek Adds sizeHints for datetimeaxis	r2137	width += base.width();
		height = fn.height() * ticksList.count();
		height = qMax(height,base.height());
		sh = QSizeF(width,height);
		break;
		}
		default:
Jani Honkonen src folder: another massive victory for coding style police	r2131	break;
		}
Michal Klocek Refactors layout...	r1965
Jani Honkonen src folder: another massive victory for coding style police	r2131	return sh;
Michal Klocek Refactors layout...	r1965	}
Marek Rosa Added QDateTimeAxis	r1717
Michal Klocek Refactors internals...	r2273	#include "moc_chartdatetimeaxisy_p.cpp"

Marek Rosa Added QDateTimeAxis	r1717	QTCOMMERCIALCHART_END_NAMESPACE