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

Fix zooming when presenter dimensions are not integers...

Fix zooming when presenter dimensions are not integers If presenter width (or height) is not an integer, zooming using vertical (or horizontal) rubberband will cause the fixed dimension to change, because rubberband uses QRect instead of QRectF. Fixed by forcing the corresponding plotArea dimension for the fixed rubberband dimension when calling zoomIn() in mouseReleaseEvent. Task-number: QTRD-1905 Reviewed-by: Mika Salmela

Miikka Heikkinen - - Load All Authors

File last commit:

r2412:38736d0999b4


                r2416:25b2e1c316cb

Download file

             chartdatetimeaxisx.cpp
        
                    131 lines
            
             | 3.7 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / axis / datetimeaxis / chartdatetimeaxisx.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 "chartdatetimeaxisx_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 <QDateTime>

        Michal Klocek
    
Refactor animator...

              r1735
            
      #include <QFontMetrics>

      #include <qmath.h>

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Refactors internals...

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

          : HorizontalAxis(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
            
      }

      ChartDateTimeAxisX::~ChartDateTimeAxisX()

      {

      }

      QVector<qreal> ChartDateTimeAxisX::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 deltaX = gridRect.width() / (tickCount - 1);

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

        Michal Klocek
    
Refactors axis updateGeometry handling...

              r2111
            
              int x = i * deltaX + gridRect.left();

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
              points[i] = x;

          }

          return points;

      }

      void ChartDateTimeAxisX::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
            
          HorizontalAxis::updateGeometry();

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      }

        Michal Klocek
    
Refactors internals...

              r2273
            
      void ChartDateTimeAxisX::handleTickCountChanged(int tick)

        Marek Rosa
    
Added QDateTimeAxis

              r1717
            
      {

        Michal Klocek
    
Refactors internals...

              r2273
            
          Q_UNUSED(tick)

        Michal Klocek
    
Fixes even more missing layout update calls

              r2335
            
          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 ChartDateTimeAxisX::handleFormatChanged(const QString &format)

      {

          Q_UNUSED(format);

        Michal Klocek
    
Fixes even more missing layout update calls

              r2335
            
          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 ChartDateTimeAxisX::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 = HorizontalAxis::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 internals...

              r2273
            
          if(ticksList.empty()){

              return sh;

          }

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

              r2131
            
          switch (which) {

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
          case Qt::MinimumSize:{

        Miikka Heikkinen
    
Fix axis sizehints when labels are angled...

              r2412
            
              QRectF boundingRect = labelBoundingRect(fn, "...");

              width = qMax(boundingRect.width(), base.width());

              height = boundingRect.height() + labelPadding();

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
              height += base.height();

        Miikka Heikkinen
    
Fix axis sizehints when labels are angled...

              r2412
            
              sh = QSizeF(width, height);

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

              r2131
            
              break;

        Michal Klocek
    
Adds sizeHints for datetimeaxis

              r2137
            
          }

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

              r2131
            
          case Qt::PreferredSize: {

        Miikka Heikkinen
    
Fix axis sizehints when labels are angled...

              r2412
            
              int labelHeight = 0;

              foreach (const QString& s, ticksList) {

                  QRect rect = labelBoundingRect(fn, s);

                  labelHeight = qMax(rect.height(), labelHeight);

                  width += rect.width();

              }

              height = labelHeight + labelPadding();

              height += base.height();

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

              sh = QSizeF(width, height);

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

              r2131
            
              break;

          }

          default:

              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
            
      }

        Michal Klocek
    
Refactors internals...

              r2273
            
      #include "moc_chartdatetimeaxisx_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 "chartdatetimeaxisx_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 <QDateTime>
Michal Klocek Refactor animator...	r1735	#include <QFontMetrics>
		#include <qmath.h>

Marek Rosa Added QDateTimeAxis	r1717	QTCOMMERCIALCHART_BEGIN_NAMESPACE

Michal Klocek Refactors internals...	r2273	ChartDateTimeAxisX::ChartDateTimeAxisX(QDateTimeAxis axis, QGraphicsItem item)
		: HorizontalAxis(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	}

		ChartDateTimeAxisX::~ChartDateTimeAxisX()
		{
		}

		QVector<qreal> ChartDateTimeAxisX::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 deltaX = gridRect.width() / (tickCount - 1);
		for (int i = 0; i < tickCount; ++i) {
Michal Klocek Refactors axis updateGeometry handling...	r2111	int x = i * deltaX + gridRect.left();
Marek Rosa Added QDateTimeAxis	r1717	points[i] = x;
		}
		return points;
		}

		void ChartDateTimeAxisX::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	HorizontalAxis::updateGeometry();
Marek Rosa Added QDateTimeAxis	r1717	}

Michal Klocek Refactors internals...	r2273	void ChartDateTimeAxisX::handleTickCountChanged(int tick)
Marek Rosa Added QDateTimeAxis	r1717	{
Michal Klocek Refactors internals...	r2273	Q_UNUSED(tick)
Michal Klocek Fixes even more missing layout update calls	r2335	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 ChartDateTimeAxisX::handleFormatChanged(const QString &format)
		{
		Q_UNUSED(format);
Michal Klocek Fixes even more missing layout update calls	r2335	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 ChartDateTimeAxisX::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 = HorizontalAxis::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 internals...	r2273	if(ticksList.empty()){
		return sh;
		}

Jani Honkonen src folder: another massive victory for coding style police	r2131	switch (which) {
Michal Klocek Adds sizeHints for datetimeaxis	r2137	case Qt::MinimumSize:{
Miikka Heikkinen Fix axis sizehints when labels are angled...	r2412	QRectF boundingRect = labelBoundingRect(fn, "...");
		width = qMax(boundingRect.width(), base.width());
		height = boundingRect.height() + labelPadding();
Michal Klocek Adds sizeHints for datetimeaxis	r2137	height += base.height();
Miikka Heikkinen Fix axis sizehints when labels are angled...	r2412	sh = QSizeF(width, height);
Jani Honkonen src folder: another massive victory for coding style police	r2131	break;
Michal Klocek Adds sizeHints for datetimeaxis	r2137	}
Jani Honkonen src folder: another massive victory for coding style police	r2131	case Qt::PreferredSize: {
Miikka Heikkinen Fix axis sizehints when labels are angled...	r2412	int labelHeight = 0;
		foreach (const QString& s, ticksList) {
		QRect rect = labelBoundingRect(fn, s);
		labelHeight = qMax(rect.height(), labelHeight);
		width += rect.width();
		}
		height = labelHeight + labelPadding();
		height += base.height();
		width = qMax(width, base.width());
		sh = QSizeF(width, height);
Jani Honkonen src folder: another massive victory for coding style police	r2131	break;
		}
		default:
		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	}

Michal Klocek Refactors internals...	r2273	#include "moc_chartdatetimeaxisx_p.cpp"

Marek Rosa Added QDateTimeAxis	r1717	QTCOMMERCIALCHART_END_NAMESPACE