HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/domain/logxydomain.cpp

Bugfix: axis visibily issues...

Bugfix: axis visibily issues * adds missing isTitleVisible * fixes axis->setVisible * invalidate layout when visibilty changed

Marek Rosa - - Load All Authors

File last commit:

r2295:8468c10170a2


                r2297:bf59b22cf3e9

Download file

             logxydomain.cpp
        
                    214 lines
            
             | 6.6 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / domain / logxydomain.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Marek Rosa
    
Domains added

              r2275
            
      /****************************************************************************

      **

      ** 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 "logxydomain_p.h"

      #include "qabstractaxis_p.h"

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
      #include "qlogvalueaxis.h"

        Marek Rosa
    
Domains added

              r2275
            
      #include <qmath.h>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      LogXYDomain::LogXYDomain(QObject *parent)

          : AbstractDomain(parent),

            m_logMinX(0),

            m_logMaxX(1),

            m_logBaseX(10)

      {

      }

      LogXYDomain::~LogXYDomain()

      {

      }

      void LogXYDomain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY)

      {

          bool axisXChanged = false;

          bool axisYChanged = false;

          if (!qFuzzyCompare(m_minX, minX) || !qFuzzyCompare(m_maxX, maxX)) {

              m_minX = minX;

              m_maxX = maxX;

              axisXChanged = true;

              m_logMinX = log10(m_minX) / log10(m_logBaseX);

              m_logMaxX = log10(m_maxX) / log10(m_logBaseX);

        Michal Klocek
    
Fix domain switching

              r2288
            
              if(!m_signalsBlocked)

        Marek Rosa
    
Domains added

              r2275
            
              emit rangeHorizontalChanged(m_minX, m_maxX);

          }

          if (!qFuzzyIsNull(m_minY - minY) || !qFuzzyIsNull(m_maxY - maxY)) {

              m_minY = minY;

              m_maxY = maxY;

              axisYChanged = true;

        Michal Klocek
    
Fix domain switching

              r2288
            
              if(!m_signalsBlocked)

        Marek Rosa
    
Domains added

              r2275
            
              emit rangeVerticalChanged(m_minY, m_maxY);

          }

          if (axisXChanged || axisYChanged)

              emit updated();

      }

      void LogXYDomain::zoomIn(const QRectF &rect)

      {

        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
          qreal newLogMinX = rect.left() * (m_logMaxX - m_logMinX) / m_size.width() + m_logMinX;

          qreal newLogMaxX = rect.right() * (m_logMaxX - m_logMinX) / m_size.width() + m_logMinX;

          qreal minX = qPow(m_logBaseX, newLogMinX);

          qreal maxX = qPow(m_logBaseX, newLogMaxX);

        Marek Rosa
    
Domains added

              r2275
            
        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
          qreal dy = spanY() / m_size.height();

        Marek Rosa
    
Domains added

              r2275
            
          qreal minY = m_minY;

          qreal maxY = m_maxY;

          minY = maxY - dy * rect.bottom();

          maxY = maxY - dy * rect.top();

          setRange(minX, maxX, minY, maxY);

      }

      void LogXYDomain::zoomOut(const QRectF &rect)

      {

        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
          qreal ratioX = m_size.width()/rect.width();

          qreal newLogMinX = m_logMinX - (m_logMaxX - m_logMinX) / ratioX;

          qreal newLogMaxX = m_logMaxX + (m_logMaxX - m_logMinX) / ratioX;

          qreal minX = qPow(m_logBaseX, newLogMinX);

          qreal maxX = qPow(m_logBaseX, newLogMaxX);

        Marek Rosa
    
Domains added

              r2275
            
        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
          qreal dy = spanY() / rect.height();

        Marek Rosa
    
Domains added

              r2275
            
          qreal minY = m_minY;

          qreal maxY = m_maxY;

          maxY = minY + dy * rect.bottom();

          minY = maxY - dy * m_size.height();

          setRange(minX, maxX, minY, maxY);

      }

      void LogXYDomain::move(qreal dx, qreal dy)

      {

        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
          qreal stepX = dx * qAbs(m_logMaxX - m_logMinX) / m_size.width();

          qreal minX = qPow(m_logBaseX, m_logMinX + stepX);

          qreal maxX = qPow(m_logBaseX, m_logMaxX + stepX);

        Marek Rosa
    
Domains added

              r2275
            
        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
          qreal y = spanY() / m_size.height();

        Marek Rosa
    
Domains added

              r2275
            
          qreal minY = m_minY;

          qreal maxY = m_maxY;

          if (dy != 0) {

              minY = minY + y * dy;

              maxY = maxY + y * dy;

          }

          setRange(minX, maxX, minY, maxY);

      }

      QPointF LogXYDomain::calculateGeometryPoint(const QPointF &point) const

      {

          const qreal leftEdge = m_logMinX < m_logMaxX ? m_logMinX : m_logMaxX;

          const qreal deltaX = m_size.width() / qAbs(m_logMaxX - m_logMinX);

          const qreal deltaY = m_size.height() / (m_maxY - m_minY);

          qreal x = (log10(point.x()) / log10(m_logBaseX)) * deltaX - leftEdge * deltaX;

          qreal y = (point.y() - m_minY) * -deltaY + m_size.height();

          return QPointF(x, y);

      }

      QVector<QPointF> LogXYDomain::calculateGeometryPoints(const QList<QPointF>& vector) const

      {

          const qreal leftEdge = m_logMinX < m_logMaxX ? m_logMinX : m_logMaxX;

          const qreal deltaX = m_size.width() / qAbs(m_logMaxX - m_logMinX);

          const qreal deltaY = m_size.height() / (m_maxY - m_minY);

          QVector<QPointF> result;

          result.resize(vector.count());

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

              qreal x = (log10(vector[i].x()) / log10(m_logBaseX)) * deltaX - leftEdge * deltaX;

              qreal y = (vector[i].y() - m_minY) * -deltaY + m_size.height();

              result[i].setX(x);

              result[i].setY(y);

          }

          return result;

      }

      QPointF LogXYDomain::calculateDomainPoint(const QPointF &point) const

      {

        Marek Rosa
    
LogDomains: calculateDomainPoint implemented

              r2283
            
          const qreal leftEdgeX= m_logMinX < m_logMaxX ? m_logMinX : m_logMaxX;

          const qreal deltaX = m_size.width() / qAbs(m_logMaxX - m_logMinX);

        Marek Rosa
    
Domains added

              r2275
            
          const qreal deltaY = m_size.height() / (m_maxY - m_minY);

        Marek Rosa
    
LogDomains: calculateDomainPoint implemented

              r2283
            
          qreal x = qPow(m_logBaseX, leftEdgeX + point.x() / deltaX);

        Marek Rosa
    
Domains added

              r2275
            
          qreal y = (point.y() - m_size.height()) / (-deltaY) + m_minY;

          return QPointF(x, y);

      }

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
      bool LogXYDomain::attachAxis(QAbstractAxis* axis)

      {

          AbstractDomain::attachAxis(axis);

          QLogValueAxis *logAxis = qobject_cast<QLogValueAxis *>(axis);

        Marek Rosa
    
Fix to domain initialization when log base was preset on axis before adding it to chart

              r2295
            
          if(logAxis && logAxis->orientation()==Qt::Horizontal) {

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
              QObject::connect(logAxis, SIGNAL(baseChanged(qreal)), this, SLOT(handleHorizontalAxisBaseChanged(qreal)));

        Marek Rosa
    
Fix to domain initialization when log base was preset on axis before adding it to chart

              r2295
            
              handleHorizontalAxisBaseChanged(logAxis->base());

          }

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
          return true;

      }

      bool LogXYDomain::detachAxis(QAbstractAxis* axis)

      {

          AbstractDomain::detachAxis(axis);

          QLogValueAxis *logAxis = qobject_cast<QLogValueAxis *>(axis);

          if(logAxis && logAxis->orientation()==Qt::Horizontal)

              QObject::disconnect(logAxis, SIGNAL(baseChanged(qreal)), this, SLOT(handleHorizontalAxisBaseChanged(qreal)));

          return true;

      }

      void LogXYDomain::handleHorizontalAxisBaseChanged(qreal baseX)

      {

          m_logBaseX = baseX;

        Marek Rosa
    
Log domains update when axis base changes. LogAxis fix for labelFormat

              r2293
            
          m_logMinX = log10(m_minX) / log10(m_logBaseX);

          m_logMaxX = log10(m_maxX) / log10(m_logBaseX);

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
      }

        Marek Rosa
    
Domains added

              r2275
            
      // operators

      bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator== (const LogXYDomain &domain1, const LogXYDomain &domain2)

      {

          return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX) &&

                  qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY) &&

                  qFuzzyIsNull(domain1.m_minX - domain2.m_minX) &&

                  qFuzzyIsNull(domain1.m_minY - domain2.m_minY));

      }

      bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, const LogXYDomain &domain2)

      {

          return !(domain1 == domain2);

      }

      QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain)

      {

          dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size;

          return dbg.maybeSpace();

      }

      #include "moc_logxydomain_p.cpp"

      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 Domains added	r2275	/****************************************************************************
		**
		** 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 "logxydomain_p.h"
		#include "qabstractaxis_p.h"
Marek Rosa Added attach/dettach axis domain implementations	r2290	#include "qlogvalueaxis.h"
Marek Rosa Domains added	r2275	#include <qmath.h>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		LogXYDomain::LogXYDomain(QObject *parent)
		: AbstractDomain(parent),
		m_logMinX(0),
		m_logMaxX(1),
		m_logBaseX(10)
		{
		}

		LogXYDomain::~LogXYDomain()
		{
		}

		void LogXYDomain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY)
		{
		bool axisXChanged = false;
		bool axisYChanged = false;

		if (!qFuzzyCompare(m_minX, minX) \|\| !qFuzzyCompare(m_maxX, maxX)) {
		m_minX = minX;
		m_maxX = maxX;
		axisXChanged = true;
		m_logMinX = log10(m_minX) / log10(m_logBaseX);
		m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
Michal Klocek Fix domain switching	r2288	if(!m_signalsBlocked)
Marek Rosa Domains added	r2275	emit rangeHorizontalChanged(m_minX, m_maxX);
		}

		if (!qFuzzyIsNull(m_minY - minY) \|\| !qFuzzyIsNull(m_maxY - maxY)) {
		m_minY = minY;
		m_maxY = maxY;
		axisYChanged = true;
Michal Klocek Fix domain switching	r2288	if(!m_signalsBlocked)
Marek Rosa Domains added	r2275	emit rangeVerticalChanged(m_minY, m_maxY);
		}

		if (axisXChanged \|\| axisYChanged)
		emit updated();
		}

		void LogXYDomain::zoomIn(const QRectF &rect)
		{
Marek Rosa Log domains zoomin, zoomout and move added	r2280	qreal newLogMinX = rect.left() * (m_logMaxX - m_logMinX) / m_size.width() + m_logMinX;
		qreal newLogMaxX = rect.right() * (m_logMaxX - m_logMinX) / m_size.width() + m_logMinX;
		qreal minX = qPow(m_logBaseX, newLogMinX);
		qreal maxX = qPow(m_logBaseX, newLogMaxX);
Marek Rosa Domains added	r2275
Marek Rosa Log domains zoomin, zoomout and move added	r2280	qreal dy = spanY() / m_size.height();
Marek Rosa Domains added	r2275	qreal minY = m_minY;
		qreal maxY = m_maxY;

		minY = maxY - dy * rect.bottom();
		maxY = maxY - dy * rect.top();

		setRange(minX, maxX, minY, maxY);
		}

		void LogXYDomain::zoomOut(const QRectF &rect)
		{
Marek Rosa Log domains zoomin, zoomout and move added	r2280	qreal ratioX = m_size.width()/rect.width();
		qreal newLogMinX = m_logMinX - (m_logMaxX - m_logMinX) / ratioX;
		qreal newLogMaxX = m_logMaxX + (m_logMaxX - m_logMinX) / ratioX;
		qreal minX = qPow(m_logBaseX, newLogMinX);
		qreal maxX = qPow(m_logBaseX, newLogMaxX);
Marek Rosa Domains added	r2275
Marek Rosa Log domains zoomin, zoomout and move added	r2280	qreal dy = spanY() / rect.height();
Marek Rosa Domains added	r2275	qreal minY = m_minY;
		qreal maxY = m_maxY;

		maxY = minY + dy * rect.bottom();
		minY = maxY - dy * m_size.height();

		setRange(minX, maxX, minY, maxY);
		}

		void LogXYDomain::move(qreal dx, qreal dy)
		{
Marek Rosa Log domains zoomin, zoomout and move added	r2280	qreal stepX = dx * qAbs(m_logMaxX - m_logMinX) / m_size.width();
		qreal minX = qPow(m_logBaseX, m_logMinX + stepX);
		qreal maxX = qPow(m_logBaseX, m_logMaxX + stepX);
Marek Rosa Domains added	r2275
Marek Rosa Log domains zoomin, zoomout and move added	r2280	qreal y = spanY() / m_size.height();
Marek Rosa Domains added	r2275	qreal minY = m_minY;
		qreal maxY = m_maxY;

		if (dy != 0) {
		minY = minY + y * dy;
		maxY = maxY + y * dy;
		}
		setRange(minX, maxX, minY, maxY);
		}

		QPointF LogXYDomain::calculateGeometryPoint(const QPointF &point) const
		{
		const qreal leftEdge = m_logMinX < m_logMaxX ? m_logMinX : m_logMaxX;
		const qreal deltaX = m_size.width() / qAbs(m_logMaxX - m_logMinX);
		const qreal deltaY = m_size.height() / (m_maxY - m_minY);

		qreal x = (log10(point.x()) / log10(m_logBaseX)) * deltaX - leftEdge * deltaX;
		qreal y = (point.y() - m_minY) * -deltaY + m_size.height();
		return QPointF(x, y);
		}

		QVector<QPointF> LogXYDomain::calculateGeometryPoints(const QList<QPointF>& vector) const
		{
		const qreal leftEdge = m_logMinX < m_logMaxX ? m_logMinX : m_logMaxX;
		const qreal deltaX = m_size.width() / qAbs(m_logMaxX - m_logMinX);
		const qreal deltaY = m_size.height() / (m_maxY - m_minY);

		QVector<QPointF> result;
		result.resize(vector.count());

		for (int i = 0; i < vector.count(); ++i) {
		qreal x = (log10(vector[i].x()) / log10(m_logBaseX)) * deltaX - leftEdge * deltaX;
		qreal y = (vector[i].y() - m_minY) * -deltaY + m_size.height();
		result[i].setX(x);
		result[i].setY(y);
		}
		return result;
		}

		QPointF LogXYDomain::calculateDomainPoint(const QPointF &point) const
		{
Marek Rosa LogDomains: calculateDomainPoint implemented	r2283	const qreal leftEdgeX= m_logMinX < m_logMaxX ? m_logMinX : m_logMaxX;
		const qreal deltaX = m_size.width() / qAbs(m_logMaxX - m_logMinX);
Marek Rosa Domains added	r2275	const qreal deltaY = m_size.height() / (m_maxY - m_minY);
Marek Rosa LogDomains: calculateDomainPoint implemented	r2283	qreal x = qPow(m_logBaseX, leftEdgeX + point.x() / deltaX);
Marek Rosa Domains added	r2275	qreal y = (point.y() - m_size.height()) / (-deltaY) + m_minY;
		return QPointF(x, y);
		}

Marek Rosa Added attach/dettach axis domain implementations	r2290	bool LogXYDomain::attachAxis(QAbstractAxis* axis)
		{
		AbstractDomain::attachAxis(axis);
		QLogValueAxis logAxis = qobject_cast<QLogValueAxis >(axis);

Marek Rosa Fix to domain initialization when log base was preset on axis before adding it to chart	r2295	if(logAxis && logAxis->orientation()==Qt::Horizontal) {
Marek Rosa Added attach/dettach axis domain implementations	r2290	QObject::connect(logAxis, SIGNAL(baseChanged(qreal)), this, SLOT(handleHorizontalAxisBaseChanged(qreal)));
Marek Rosa Fix to domain initialization when log base was preset on axis before adding it to chart	r2295	handleHorizontalAxisBaseChanged(logAxis->base());
		}
Marek Rosa Added attach/dettach axis domain implementations	r2290
		return true;
		}

		bool LogXYDomain::detachAxis(QAbstractAxis* axis)
		{
		AbstractDomain::detachAxis(axis);
		QLogValueAxis logAxis = qobject_cast<QLogValueAxis >(axis);

		if(logAxis && logAxis->orientation()==Qt::Horizontal)
		QObject::disconnect(logAxis, SIGNAL(baseChanged(qreal)), this, SLOT(handleHorizontalAxisBaseChanged(qreal)));

		return true;
		}

		void LogXYDomain::handleHorizontalAxisBaseChanged(qreal baseX)
		{
		m_logBaseX = baseX;
Marek Rosa Log domains update when axis base changes. LogAxis fix for labelFormat	r2293	m_logMinX = log10(m_minX) / log10(m_logBaseX);
		m_logMaxX = log10(m_maxX) / log10(m_logBaseX);
Marek Rosa Added attach/dettach axis domain implementations	r2290	}

Marek Rosa Domains added	r2275	// operators

		bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator== (const LogXYDomain &domain1, const LogXYDomain &domain2)
		{
		return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX) &&
		qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY) &&
		qFuzzyIsNull(domain1.m_minX - domain2.m_minX) &&
		qFuzzyIsNull(domain1.m_minY - domain2.m_minY));
		}


		bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, const LogXYDomain &domain2)
		{
		return !(domain1 == domain2);
		}


		QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain)
		{
		dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size;
		return dbg.maybeSpace();
		}

		#include "moc_logxydomain_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE