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

Fix vanishing labels for first and last ticks....

Fix vanishing labels for first and last ticks. Extra space must be reserved by layout for the axes that have wide labels for first or last tick. Changed the logic how axis sizeHint is interpreted to make the previously irrelevant height or width (depending on orientation) of the sizeHint to indicate how far the widest label extends past the first/last tick, and adjust the grid size accordingly in layout. Reviewed-by: Mika Salmela

Miikka Heikkinen - - Load All Authors

File last commit:

r2432:53927f716a3d


                r2443:5b27b7b1d72a

RC2_1.2.1

Download file

             xlogydomain.cpp
        
                    232 lines
            
             | 7.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / domain / xlogydomain.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Marek Rosa
    
Domains added

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

      **

        Miikka Heikkinen
    
Fixed the copyright year 2012 -> 2013

              r2432
            
      ** Copyright (C) 2013 Digia Plc

        Marek Rosa
    
Domains added

              r2275
            
      ** 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 "xlogydomain_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

      XLogYDomain::XLogYDomain(QObject *parent)

          : AbstractDomain(parent),

        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
            m_logLeftY(0),

            m_logRightY(1),

        Marek Rosa
    
Domains added

              r2275
            
            m_logBaseY(10)

      {

      }

      XLogYDomain::~XLogYDomain()

      {

      }

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

      {

          bool axisXChanged = false;

          bool axisYChanged = false;

          if (!qFuzzyIsNull(m_minX - minX) || !qFuzzyIsNull(m_maxX - maxX)) {

              m_minX = minX;

              m_maxX = maxX;

              axisXChanged = true;

        Michal Klocek
    
Fix domain switching

              r2288
            
              if(!m_signalsBlocked)

        Marek Rosa
    
Negative values with log axis handled

              r2356
            
                  emit rangeHorizontalChanged(m_minX, m_maxX);

        Marek Rosa
    
Domains added

              r2275
            
          }

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

              m_minY = minY;

              m_maxY = maxY;

              axisYChanged = true;

        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
              qreal logMinY = log10(m_minY) / log10(m_logBaseY);

              qreal logMaxY = log10(m_maxY) / log10(m_logBaseY);

              m_logLeftY = logMinY < logMaxY ? logMinY : logMaxY;

              m_logRightY = logMinY > logMaxY ? logMinY : logMaxY;

        Michal Klocek
    
Fix domain switching

              r2288
            
              if(!m_signalsBlocked)

        Marek Rosa
    
Negative values with log axis handled

              r2356
            
                  emit rangeVerticalChanged(m_minY, m_maxY);

        Marek Rosa
    
Domains added

              r2275
            
          }

          if (axisXChanged || axisYChanged)

              emit updated();

      }

      void XLogYDomain::zoomIn(const QRectF &rect)

      {

          qreal dx = spanX() / m_size.width();

          qreal maxX = m_maxX;

          qreal minX = m_minX;

          maxX = minX + dx * rect.right();

          minX = minX + dx * rect.left();

        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
          qreal logLeftY = m_logRightY - rect.bottom() * (m_logRightY - m_logLeftY) / m_size.height();

          qreal logRightY = m_logRightY - rect.top() * (m_logRightY - m_logLeftY) / m_size.height();

          qreal leftY = qPow(m_logBaseY, logLeftY);

          qreal rightY = qPow(m_logBaseY, logRightY);

          qreal minY = leftY < rightY ? leftY : rightY;

          qreal maxY = leftY > rightY ? leftY : rightY;

        Marek Rosa
    
Domains added

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

      }

      void XLogYDomain::zoomOut(const QRectF &rect)

      {

          qreal dx = spanX() / rect.width();

          qreal maxX = m_maxX;

          qreal minX = m_minX;

          minX = maxX - dx * rect.right();

          maxX = minX + dx * m_size.width();

        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
          const qreal factorY = m_size.height() / rect.height();

          qreal newLogMinY = m_logLeftY + (m_logRightY - m_logLeftY) / 2 * (1 - factorY);

          qreal newLogMaxY = m_logLeftY + (m_logRightY - m_logLeftY) / 2 * (1 + factorY);

          qreal leftY = qPow(m_logBaseY, newLogMinY);

          qreal rightY = qPow(m_logBaseY, newLogMaxY);

          qreal minY = leftY < rightY ? leftY : rightY;

          qreal maxY = leftY > rightY ? leftY : rightY;

        Marek Rosa
    
Domains added

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

      }

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

      {

          qreal x = spanX() / m_size.width();

          qreal maxX = m_maxX;

          qreal minX = m_minX;

          if (dx != 0) {

              minX = minX + x * dx;

              maxX = maxX + x * dx;

          }

        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
          qreal stepY = dy * (m_logRightY - m_logLeftY) / m_size.height();

          qreal leftY = qPow(m_logBaseY, m_logLeftY + stepY);

          qreal rightY = qPow(m_logBaseY, m_logRightY + stepY);

          qreal minY = leftY < rightY ? leftY : rightY;

          qreal maxY = leftY > rightY ? leftY : rightY;

        Marek Rosa
    
Log domains zoomin, zoomout and move added

              r2280
            
        Marek Rosa
    
Domains added

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

      }

        Marek Rosa
    
Negative values with log axis handled

              r2356
            
      QPointF XLogYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) const

        Marek Rosa
    
Domains added

              r2275
            
      {

        Marek Rosa
    
Negative values with log axis handled

              r2356
            
          if (point.y() > 0) {

              const qreal deltaX = m_size.width() / (m_maxX - m_minX);

              const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);

              qreal x = (point.x() - m_minX) * deltaX;

              qreal y = (log10(point.y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY + m_size.height();

              ok = true;

              return QPointF(x, y);

          } else {

              qWarning() << "Logarithm of negative value is undefined. Empty layout returned";

              ok = false;

              return QPointF();

          }

        Marek Rosa
    
Domains added

              r2275
            
      }

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

      {

          const qreal deltaX = m_size.width() / (m_maxX - m_minX);

        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
          const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);

        Marek Rosa
    
Domains added

              r2275
            
          QVector<QPointF> result;

          result.resize(vector.count());

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

        Marek Rosa
    
Negative values with log axis handled

              r2356
            
              if (vector[i].y() > 0) {

                  qreal x = (vector[i].x() - m_minX) * deltaX;

                  qreal y = (log10(vector[i].y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY + m_size.height();

                  result[i].setX(x);

                  result[i].setY(y);

              } else {

                  qWarning() << "Logarithm of negative value is undefined. Empty layout returned";

                  return QVector<QPointF>();

              }

        Marek Rosa
    
Domains added

              r2275
            
          }

          return result;

      }

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

      {

          const qreal deltaX = m_size.width() / (m_maxX - m_minX);

        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
          const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);

        Marek Rosa
    
Domains added

              r2275
            
          qreal x = point.x() / deltaX + m_minX;

        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
          qreal y = qPow(m_logBaseY, m_logLeftY + (m_size.height() - point.y()) / deltaY);

        Marek Rosa
    
Domains added

              r2275
            
          return QPointF(x, y);

      }

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
      bool XLogYDomain::attachAxis(QAbstractAxis* 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::Vertical){

        Marek Rosa
    
Added attach/dettach axis domain implementations

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

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

              r2295
            
              handleVerticalAxisBaseChanged(logAxis->base());

        Marek Rosa
    
Negative values with log axis handled

              r2356
            
          }

        Michal Klocek
    
bugfix signals not reconnected when domain changed

              r2292
            
          return  AbstractDomain::attachAxis(axis);

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
      }

      bool XLogYDomain::detachAxis(QAbstractAxis* axis)

      {

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

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

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

        Michal Klocek
    
bugfix signals not reconnected when domain changed

              r2292
            
          return AbstractDomain::detachAxis(axis);

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
      }

      void XLogYDomain::handleVerticalAxisBaseChanged(qreal baseY)

      {

          m_logBaseY = baseY;

        Marek Rosa
    
QChart mapping functions: return QPoint(0, 0) if series type is Pie...

              r2351
            
          qreal logMinY = log10(m_minY) / log10(m_logBaseY);

          qreal logMaxY = log10(m_maxY) / log10(m_logBaseY);

          m_logLeftY = logMinY < logMaxY ? logMinY : logMaxY;

          m_logRightY = logMinY > logMaxY ? logMinY : logMaxY;

        Marek Rosa
    
Fixed: chart not redrawing when logaxis's logBase value changed

              r2322
            
          emit updated();

        Marek Rosa
    
Added attach/dettach axis domain implementations

              r2290
            
      }

        Marek Rosa
    
Domains added

              r2275
            
      // operators

      bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator== (const XLogYDomain &domain1, const XLogYDomain &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 XLogYDomain &domain1, const XLogYDomain &domain2)

      {

          return !(domain1 == domain2);

      }

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

      {

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

          return dbg.maybeSpace();

      }

      #include "moc_xlogydomain_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	/****************************************************************************
		**
Miikka Heikkinen Fixed the copyright year 2012 -> 2013	r2432	** Copyright (C) 2013 Digia Plc
Marek Rosa Domains added	r2275	** 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 "xlogydomain_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

		XLogYDomain::XLogYDomain(QObject *parent)
		: AbstractDomain(parent),
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	m_logLeftY(0),
		m_logRightY(1),
Marek Rosa Domains added	r2275	m_logBaseY(10)
		{
		}

		XLogYDomain::~XLogYDomain()
		{
		}

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

		if (!qFuzzyIsNull(m_minX - minX) \|\| !qFuzzyIsNull(m_maxX - maxX)) {
		m_minX = minX;
		m_maxX = maxX;
		axisXChanged = true;
Michal Klocek Fix domain switching	r2288	if(!m_signalsBlocked)
Marek Rosa Negative values with log axis handled	r2356	emit rangeHorizontalChanged(m_minX, m_maxX);
Marek Rosa Domains added	r2275	}

		if (!qFuzzyIsNull(m_minY - minY) \|\| !qFuzzyIsNull(m_maxY - maxY)) {
		m_minY = minY;
		m_maxY = maxY;
		axisYChanged = true;
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	qreal logMinY = log10(m_minY) / log10(m_logBaseY);
		qreal logMaxY = log10(m_maxY) / log10(m_logBaseY);
		m_logLeftY = logMinY < logMaxY ? logMinY : logMaxY;
		m_logRightY = logMinY > logMaxY ? logMinY : logMaxY;
Michal Klocek Fix domain switching	r2288	if(!m_signalsBlocked)
Marek Rosa Negative values with log axis handled	r2356	emit rangeVerticalChanged(m_minY, m_maxY);
Marek Rosa Domains added	r2275	}

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

		void XLogYDomain::zoomIn(const QRectF &rect)
		{
		qreal dx = spanX() / m_size.width();
		qreal maxX = m_maxX;
		qreal minX = m_minX;

		maxX = minX + dx * rect.right();
		minX = minX + dx * rect.left();
Marek Rosa Log domains zoomin, zoomout and move added	r2280
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	qreal logLeftY = m_logRightY - rect.bottom() * (m_logRightY - m_logLeftY) / m_size.height();
		qreal logRightY = m_logRightY - rect.top() * (m_logRightY - m_logLeftY) / m_size.height();
		qreal leftY = qPow(m_logBaseY, logLeftY);
		qreal rightY = qPow(m_logBaseY, logRightY);
		qreal minY = leftY < rightY ? leftY : rightY;
		qreal maxY = leftY > rightY ? leftY : rightY;
Marek Rosa Domains added	r2275
		setRange(minX, maxX, minY, maxY);
		}

		void XLogYDomain::zoomOut(const QRectF &rect)
		{
		qreal dx = spanX() / rect.width();
		qreal maxX = m_maxX;
		qreal minX = m_minX;

		minX = maxX - dx * rect.right();
		maxX = minX + dx * m_size.width();
Marek Rosa Log domains zoomin, zoomout and move added	r2280
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	const qreal factorY = m_size.height() / rect.height();
		qreal newLogMinY = m_logLeftY + (m_logRightY - m_logLeftY) / 2 * (1 - factorY);
		qreal newLogMaxY = m_logLeftY + (m_logRightY - m_logLeftY) / 2 * (1 + factorY);
		qreal leftY = qPow(m_logBaseY, newLogMinY);
		qreal rightY = qPow(m_logBaseY, newLogMaxY);
		qreal minY = leftY < rightY ? leftY : rightY;
		qreal maxY = leftY > rightY ? leftY : rightY;
Marek Rosa Domains added	r2275
		setRange(minX, maxX, minY, maxY);
		}

		void XLogYDomain::move(qreal dx, qreal dy)
		{
		qreal x = spanX() / m_size.width();
		qreal maxX = m_maxX;
		qreal minX = m_minX;

		if (dx != 0) {
		minX = minX + x * dx;
		maxX = maxX + x * dx;
		}
Marek Rosa Log domains zoomin, zoomout and move added	r2280
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	qreal stepY = dy * (m_logRightY - m_logLeftY) / m_size.height();
		qreal leftY = qPow(m_logBaseY, m_logLeftY + stepY);
		qreal rightY = qPow(m_logBaseY, m_logRightY + stepY);
		qreal minY = leftY < rightY ? leftY : rightY;
		qreal maxY = leftY > rightY ? leftY : rightY;
Marek Rosa Log domains zoomin, zoomout and move added	r2280
Marek Rosa Domains added	r2275	setRange(minX, maxX, minY, maxY);
		}

Marek Rosa Negative values with log axis handled	r2356	QPointF XLogYDomain::calculateGeometryPoint(const QPointF &point, bool &ok) const
Marek Rosa Domains added	r2275	{
Marek Rosa Negative values with log axis handled	r2356	if (point.y() > 0) {
		const qreal deltaX = m_size.width() / (m_maxX - m_minX);
		const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);

		qreal x = (point.x() - m_minX) * deltaX;
		qreal y = (log10(point.y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY + m_size.height();
		ok = true;
		return QPointF(x, y);
		} else {
		qWarning() << "Logarithm of negative value is undefined. Empty layout returned";
		ok = false;
		return QPointF();
		}
Marek Rosa Domains added	r2275	}

		QVector<QPointF> XLogYDomain::calculateGeometryPoints(const QList<QPointF>& vector) const
		{
		const qreal deltaX = m_size.width() / (m_maxX - m_minX);
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);
Marek Rosa Domains added	r2275
		QVector<QPointF> result;
		result.resize(vector.count());

		for (int i = 0; i < vector.count(); ++i) {
Marek Rosa Negative values with log axis handled	r2356	if (vector[i].y() > 0) {
		qreal x = (vector[i].x() - m_minX) * deltaX;
		qreal y = (log10(vector[i].y()) / log10(m_logBaseY)) * -deltaY - m_logLeftY * -deltaY + m_size.height();
		result[i].setX(x);
		result[i].setY(y);
		} else {
		qWarning() << "Logarithm of negative value is undefined. Empty layout returned";
		return QVector<QPointF>();
		}
Marek Rosa Domains added	r2275	}
		return result;
		}

		QPointF XLogYDomain::calculateDomainPoint(const QPointF &point) const
		{
		const qreal deltaX = m_size.width() / (m_maxX - m_minX);
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	const qreal deltaY = m_size.height() / qAbs(m_logRightY - m_logLeftY);
Marek Rosa Domains added	r2275	qreal x = point.x() / deltaX + m_minX;
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	qreal y = qPow(m_logBaseY, m_logLeftY + (m_size.height() - point.y()) / deltaY);
Marek Rosa Domains added	r2275	return QPointF(x, y);
		}

Marek Rosa Added attach/dettach axis domain implementations	r2290	bool XLogYDomain::attachAxis(QAbstractAxis* 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::Vertical){
Marek Rosa Added attach/dettach axis domain implementations	r2290	QObject::connect(logAxis, SIGNAL(baseChanged(qreal)), this, SLOT(handleVerticalAxisBaseChanged(qreal)));
Marek Rosa Fix to domain initialization when log base was preset on axis before adding it to chart	r2295	handleVerticalAxisBaseChanged(logAxis->base());
Marek Rosa Negative values with log axis handled	r2356	}
Michal Klocek bugfix signals not reconnected when domain changed	r2292	return AbstractDomain::attachAxis(axis);
Marek Rosa Added attach/dettach axis domain implementations	r2290	}

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

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

Michal Klocek bugfix signals not reconnected when domain changed	r2292	return AbstractDomain::detachAxis(axis);
Marek Rosa Added attach/dettach axis domain implementations	r2290	}

		void XLogYDomain::handleVerticalAxisBaseChanged(qreal baseY)
		{
		m_logBaseY = baseY;
Marek Rosa QChart mapping functions: return QPoint(0, 0) if series type is Pie...	r2351	qreal logMinY = log10(m_minY) / log10(m_logBaseY);
		qreal logMaxY = log10(m_maxY) / log10(m_logBaseY);
		m_logLeftY = logMinY < logMaxY ? logMinY : logMaxY;
		m_logRightY = logMinY > logMaxY ? logMinY : logMaxY;
Marek Rosa Fixed: chart not redrawing when logaxis's logBase value changed	r2322	emit updated();
Marek Rosa Added attach/dettach axis domain implementations	r2290	}

Marek Rosa Domains added	r2275	// operators

		bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator== (const XLogYDomain &domain1, const XLogYDomain &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 XLogYDomain &domain1, const XLogYDomain &domain2)
		{
		return !(domain1 == domain2);
		}


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

		#include "moc_xlogydomain_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE