HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/axis/logvalueaxis/chartlogvalueaxisy.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:

r2390:ec27a611dd51


                r2401:71e82ffadcde

Download file

             chartlogvalueaxisy.cpp
        
                    139 lines
            
             | 4.2 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / axis / logvalueaxis / chartlogvalueaxisy.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
      /****************************************************************************

      **

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

      #include "chartpresenter_p.h"

      #include "qlogvalueaxis.h"

      #include "chartlayout_p.h"

      #include <QGraphicsLayout>

      #include <QFontMetrics>

      #include <qmath.h>

        Marek Rosa
    
QLogValueAxis number of labels calculation fixed

              r2370
            
      #include <QDebug>

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      ChartLogValueAxisY::ChartLogValueAxisY(QLogValueAxis *axis, QGraphicsItem* item)

          : VerticalAxis(axis, item),

            m_axis(axis)

      {

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

              r2322
            
          QObject::connect(m_axis, SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));

        Marek Rosa
    
Fixed: axis not redrawing when labelFormat changed

              r2323
            
          QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
      }

      ChartLogValueAxisY::~ChartLogValueAxisY()

      {

      }

      QVector<qreal> ChartLogValueAxisY::calculateLayout() const

      {

          QVector<qreal> points;

          qreal logMax = log10(m_axis->max()) / log10(m_axis->base());

          qreal logMin = log10(m_axis->min()) / log10(m_axis->base());

        Marek Rosa
    
Domains added

              r2275
            
          qreal leftEdge = logMin < logMax ? logMin : logMax;

          qreal ceilEdge = ceil(leftEdge);

        Marek Rosa
    
QSplineSeries calculateControlPoints moved to splinechartitem. This way we don't need to deal with controlPoints on logaritmic scale

              r2372
            
          int tickCount = qAbs(ceil(logMax) - ceil(logMin));

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
          points.resize(tickCount);

          const QRectF &gridRect = gridGeometry();

          const qreal deltaY = gridRect.height() / qAbs(logMax - logMin);

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

        Marek Rosa
    
Domains added

              r2275
            
              points[i] = (ceilEdge + i) * -deltaY - leftEdge * -deltaY + gridRect.bottom();

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
          return points;

      }

      void ChartLogValueAxisY::updateGeometry()

      {

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

          if (layout.isEmpty())

              return;

          setLabels(createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), layout.size(), m_axis->labelFormat()));

          VerticalAxis::updateGeometry();

      }

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

              r2322
            
      void ChartLogValueAxisY::handleBaseChanged(qreal base)

      {

          Q_UNUSED(base);

        Michal Klocek
    
Fixes missing layout updated on ticks,base and format calls

              r2333
            
          QGraphicsLayoutItem::updateGeometry();

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

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

      }

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
        Marek Rosa
    
Fixed: axis not redrawing when labelFormat changed

              r2323
            
      void ChartLogValueAxisY::handleLabelFormatChanged(const QString &format)

      {

          Q_UNUSED(format);

        Michal Klocek
    
Fixes missing layout updated on ticks,base and format calls

              r2333
            
          QGraphicsLayoutItem::updateGeometry();

        Marek Rosa
    
Fixed: axis not redrawing when labelFormat changed

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

      }

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
      QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const

      {

          Q_UNUSED(constraint)

          QFontMetrics fn(font());

          QSizeF sh;

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

          QStringList ticksList;

          qreal logMax = log10(m_axis->max()) / log10(m_axis->base());

          qreal logMin = log10(m_axis->min()) / log10(m_axis->base());

        Marek Rosa
    
QLogValueAxis number of labels calculation fixed

              r2370
            
          int tickCount = qAbs(ceil(logMax) - ceil(logMin));

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
          if (m_axis->max() > m_axis->min() && tickCount > 1)

              ticksList = createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), tickCount, m_axis->labelFormat());

          else

              ticksList.append(QString(" "));

          qreal width = 0;

          qreal height = 0;

        Michal Klocek
    
Fix attempt to make logy axis label layout calculation correct

              r2390
            
           int labelWidth = 0;

          foreach(const QString& s, ticksList)

          {

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

          }

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
          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;

          }

          case Qt::PreferredSize: {

        Michal Klocek
    
Fix attempt to make logy axis label layout calculation correct

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

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
              width += base.width();

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

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

              sh = QSizeF(width,height);

              break;

          }

          default:

              break;

          }

          return sh;

      }

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

              r2322
            
      #include "moc_chartlogvalueaxisy_p.cpp"

        Marek Rosa
    
QLogValueAxis added. Log domain missing

              r2274
            
      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 QLogValueAxis added. Log domain missing	r2274	/****************************************************************************
		**
		** 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 "chartlogvalueaxisy_p.h"
		#include "chartpresenter_p.h"
		#include "qlogvalueaxis.h"
		#include "chartlayout_p.h"
		#include <QGraphicsLayout>
		#include <QFontMetrics>
		#include <qmath.h>
Marek Rosa QLogValueAxis number of labels calculation fixed	r2370	#include <QDebug>
Marek Rosa QLogValueAxis added. Log domain missing	r2274
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		ChartLogValueAxisY::ChartLogValueAxisY(QLogValueAxis axis, QGraphicsItem item)
		: VerticalAxis(axis, item),
		m_axis(axis)
		{
Marek Rosa Fixed: chart not redrawing when logaxis's logBase value changed	r2322	QObject::connect(m_axis, SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
Marek Rosa Fixed: axis not redrawing when labelFormat changed	r2323	QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
Marek Rosa QLogValueAxis added. Log domain missing	r2274	}

		ChartLogValueAxisY::~ChartLogValueAxisY()
		{
		}

		QVector<qreal> ChartLogValueAxisY::calculateLayout() const
		{
		QVector<qreal> points;
		qreal logMax = log10(m_axis->max()) / log10(m_axis->base());
		qreal logMin = log10(m_axis->min()) / log10(m_axis->base());
Marek Rosa Domains added	r2275	qreal leftEdge = logMin < logMax ? logMin : logMax;
		qreal ceilEdge = ceil(leftEdge);
Marek Rosa QSplineSeries calculateControlPoints moved to splinechartitem. This way we don't need to deal with controlPoints on logaritmic scale	r2372	int tickCount = qAbs(ceil(logMax) - ceil(logMin));
Marek Rosa QLogValueAxis added. Log domain missing	r2274
		points.resize(tickCount);
		const QRectF &gridRect = gridGeometry();
		const qreal deltaY = gridRect.height() / qAbs(logMax - logMin);
		for (int i = 0; i < tickCount; ++i)
Marek Rosa Domains added	r2275	points[i] = (ceilEdge + i) * -deltaY - leftEdge * -deltaY + gridRect.bottom();
Marek Rosa QLogValueAxis added. Log domain missing	r2274
		return points;
		}


		void ChartLogValueAxisY::updateGeometry()
		{
		const QVector<qreal> &layout = ChartAxis::layout();
		if (layout.isEmpty())
		return;
		setLabels(createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), layout.size(), m_axis->labelFormat()));
		VerticalAxis::updateGeometry();
		}

Marek Rosa Fixed: chart not redrawing when logaxis's logBase value changed	r2322	void ChartLogValueAxisY::handleBaseChanged(qreal base)
		{
		Q_UNUSED(base);
Michal Klocek Fixes missing layout updated on ticks,base and format calls	r2333	QGraphicsLayoutItem::updateGeometry();
Marek Rosa Fixed: chart not redrawing when logaxis's logBase value changed	r2322	if(presenter()) presenter()->layout()->invalidate();
		}
Marek Rosa QLogValueAxis added. Log domain missing	r2274
Marek Rosa Fixed: axis not redrawing when labelFormat changed	r2323	void ChartLogValueAxisY::handleLabelFormatChanged(const QString &format)
		{
		Q_UNUSED(format);
Michal Klocek Fixes missing layout updated on ticks,base and format calls	r2333	QGraphicsLayoutItem::updateGeometry();
Marek Rosa Fixed: axis not redrawing when labelFormat changed	r2323	if(presenter()) presenter()->layout()->invalidate();
		}

Marek Rosa QLogValueAxis added. Log domain missing	r2274	QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
		{
		Q_UNUSED(constraint)

		QFontMetrics fn(font());
		QSizeF sh;

		QSizeF base = VerticalAxis::sizeHint(which, constraint);
		QStringList ticksList;
		qreal logMax = log10(m_axis->max()) / log10(m_axis->base());
		qreal logMin = log10(m_axis->min()) / log10(m_axis->base());
Marek Rosa QLogValueAxis number of labels calculation fixed	r2370	int tickCount = qAbs(ceil(logMax) - ceil(logMin));
Marek Rosa QLogValueAxis added. Log domain missing	r2274	if (m_axis->max() > m_axis->min() && tickCount > 1)
		ticksList = createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), tickCount, m_axis->labelFormat());
		else
		ticksList.append(QString(" "));
		qreal width = 0;
		qreal height = 0;

Michal Klocek Fix attempt to make logy axis label layout calculation correct	r2390
		int labelWidth = 0;

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

Marek Rosa QLogValueAxis added. Log domain missing	r2274	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;
		}
		case Qt::PreferredSize: {
Michal Klocek Fix attempt to make logy axis label layout calculation correct	r2390	width = labelWidth + labelPadding() + 2; //two pixels of tolerance
Marek Rosa QLogValueAxis added. Log domain missing	r2274	width += base.width();
		height = fn.height() * ticksList.count();
		height = qMax(height,base.height());
		sh = QSizeF(width,height);
		break;
		}
		default:
		break;
		}

		return sh;
		}

Marek Rosa Fixed: chart not redrawing when logaxis's logBase value changed	r2322	#include "moc_chartlogvalueaxisy_p.cpp"

Marek Rosa QLogValueAxis added. Log domain missing	r2274	QTCOMMERCIALCHART_END_NAMESPACE