HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/boxplotchart/qboxplotseries_p.h

Adjust various margins and paddings....

Adjust various margins and paddings. The text items have been changed to use QGraphicsTextItem bounding rects instead of calculating dimensions using QFontMetrics. It seems that QGraphicsTextItem boundingRect involves a lot more of a margin than QFontMetrics provided. To compensate, various margins and paddings have been adjusted lower. Change-Id: Idebf939f5dd804fb96daeaea4bbf1b45f4f02908 Reviewed-by: Mika Salmela <mika.salmela@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2560:a2f72685ff33


                r2569:f4eaee212ddc

Download file

             qboxplotseries_p.h
        
                    98 lines
            
             | 2.7 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / boxplotchart / qboxplotseries_p.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      /****************************************************************************

      **

      ** Copyright (C) 2013 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$

      **

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

      //  W A R N I N G

      //  -------------

      //

      // This file is not part of the QtCommercial Chart API.  It exists purely as an

      // implementation detail.  This header file may change from version to

      // version without notice, or even be removed.

      //

      // We mean it.

      #ifndef QBOXPLOTSERIES_P_H

      #define QBOXPLOTSERIES_P_H

      #include "qboxplotseries.h"

      #include "qabstractbarseries_p.h"

      #include "abstractdomain_p.h"

      #include "qbarset.h"

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Miikka Heikkinen
    
Fix box-and-whiskers animations...

              r2560
            
      class BoxPlotAnimation;

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      class QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate

      {

          Q_OBJECT

      public:

          QBoxPlotSeriesPrivate(QBoxPlotSeries *q);

          ~QBoxPlotSeriesPrivate();

          void initializeGraphics(QGraphicsItem *parent);

          void initializeDomain();

          void initializeAxes();

          void initializeAnimations(QChart::AnimationOptions options);

          void initializeTheme(int index, ChartTheme *theme, bool forced = false);

          QList<QLegendMarker*> createLegendMarkers(QLegend *legend);

          virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;

          QAbstractAxis *createDefaultAxis(Qt::Orientation orientation) const;

          bool append(QBoxSet *set);

          bool remove(QBoxSet *set);

          bool append(QList<QBoxSet *> sets);

          bool remove(QList<QBoxSet *> sets);

          bool insert(int index, QBoxSet *set);

          QBoxSet *boxSetAt(int index);

          qreal max();

          qreal min();

      private:

          void populateCategories(QBarCategoryAxis *axis);

      Q_SIGNALS:

          void updated();

          void clicked(int index, QBoxSet *barset);

          void updatedBoxes();

          void updatedLayout();

          void restructuredBoxes();

      private slots:

          void handleSeriesChange(QAbstractSeries *series);

          void handleSeriesRemove(QAbstractSeries *series);

      protected:

          QList<QBoxSet *> m_boxSets;

          QPen m_pen;

          QBrush m_brush;

          int m_index;

        Miikka Heikkinen
    
Fix box-and-whiskers animations...

              r2560
            
          BoxPlotAnimation *m_animation;

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      private:

          Q_DECLARE_PUBLIC(QBoxPlotSeries)

      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif

	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

Mika Salmela A new box-and-whiskers series type added to charts....	r2548	/****************************************************************************
		**
		** Copyright (C) 2013 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$
		**
		****************************************************************************/

		// W A R N I N G
		// -------------
		//
		// This file is not part of the QtCommercial Chart API. It exists purely as an
		// implementation detail. This header file may change from version to
		// version without notice, or even be removed.
		//
		// We mean it.

		#ifndef QBOXPLOTSERIES_P_H
		#define QBOXPLOTSERIES_P_H

		#include "qboxplotseries.h"
		#include "qabstractbarseries_p.h"
		#include "abstractdomain_p.h"
		#include "qbarset.h"

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Miikka Heikkinen Fix box-and-whiskers animations...	r2560	class BoxPlotAnimation;

Mika Salmela A new box-and-whiskers series type added to charts....	r2548	class QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate
		{
		Q_OBJECT

		public:
		QBoxPlotSeriesPrivate(QBoxPlotSeries *q);
		~QBoxPlotSeriesPrivate();

		void initializeGraphics(QGraphicsItem *parent);
		void initializeDomain();
		void initializeAxes();
		void initializeAnimations(QChart::AnimationOptions options);
		void initializeTheme(int index, ChartTheme *theme, bool forced = false);

		QList<QLegendMarker> createLegendMarkers(QLegend legend);

		virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
		QAbstractAxis *createDefaultAxis(Qt::Orientation orientation) const;

		bool append(QBoxSet *set);
		bool remove(QBoxSet *set);
		bool append(QList<QBoxSet *> sets);
		bool remove(QList<QBoxSet *> sets);
		bool insert(int index, QBoxSet *set);
		QBoxSet *boxSetAt(int index);

		qreal max();
		qreal min();

		private:
		void populateCategories(QBarCategoryAxis *axis);

		Q_SIGNALS:
		void updated();
		void clicked(int index, QBoxSet *barset);
		void updatedBoxes();
		void updatedLayout();
		void restructuredBoxes();

		private slots:
		void handleSeriesChange(QAbstractSeries *series);
		void handleSeriesRemove(QAbstractSeries *series);

		protected:
		QList<QBoxSet *> m_boxSets;
		QPen m_pen;
		QBrush m_brush;
		int m_index;
Miikka Heikkinen Fix box-and-whiskers animations...	r2560	BoxPlotAnimation *m_animation;
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		private:
		Q_DECLARE_PUBLIC(QBoxPlotSeries)
		};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif