HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/barchart/bar_p.h

Merge remote-tracking branch 'origin/5.6' into 5.7...

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2898:03a6177a3223

master

Download file

             bar_p.h
        
                    83 lines
            
             | 2.7 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / charts / barchart / bar_p.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

      ** Contact: https://www.qt.io/licensing/

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** and conditions see https://www.qt.io/terms-conditions. For further

      ** information use the contact form at https://www.qt.io/contact-us.

      **

      ** GNU General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU

      ** General Public License version 3 or (at your option) any later version

      ** approved by the KDE Free Qt Foundation. The licenses are as published by

      ** the Free Software Foundation and appearing in the file LICENSE.GPL3

      ** included in the packaging of this file. Please review the following

      ** information to ensure the GNU General Public License requirements will

      ** be met: https://www.gnu.org/licenses/gpl-3.0.html.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        Jani Honkonen
    
Add license headers

              r794
            
        sauimone
    
cleaned crap from barseries private headers. Added missing license texts

              r1248
            
      //  W A R N I N G

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

      //

        Titta Heikkala
    
Updated private header warning...

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

        sauimone
    
cleaned crap from barseries private headers. Added missing license texts

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

      // version without notice, or even be removed.

      //

      // We mean it.

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      #ifndef BAR_H

      #define BAR_H

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <QtCharts/QChartGlobal>

      #include <QtWidgets/QGraphicsRectItem>

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
        sauimone
    
fixed barchart signals with pimpl. drilldown works now

              r968
            
      class QBarSet;

        sauimone
    
barcharts: added legend to model. added signals for hover events (for tooltip). updated examples

              r280
            
      // Single visual bar item of chart

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
      class Bar : public QObject, public QGraphicsRectItem

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      {

        sauimone
    
Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash

              r256
            
          Q_OBJECT

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      public:

        sauimone
    
removed categories from barseries. categories are now only on axis

              r1321
            
          Bar(QBarSet *barset, int index, QGraphicsItem *parent = 0);

        sauimone
    
removed double signal emitting from barseries/set

              r1563
            
          ~Bar();

        sauimone
    
BarGroup and Bar as ChartItems instead of GraphicItems

              r74
            
        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      public:

        sauimone
    
Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash

              r256
            
          void mousePressEvent(QGraphicsSceneMouseEvent *event);

        sauimone
    
updated barchart examples. minor fixes

              r276
            
          void hoverEnterEvent(QGraphicsSceneHoverEvent *event);

          void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);

        Titta Heikkala
    
Add pressed, released and doubleClicked signals...

              r2739
            
          void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);

          void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);

          void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);

        sauimone
    
Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash

              r256
            
      Q_SIGNALS:

        sauimone
    
removed double signal emitting from barseries/set

              r1563
            
          void clicked(int index, QBarSet *barset);

        Titta Heikkala
    
Add hovered signal with index for bar charts...

              r2600
            
          void hovered(bool status, int index, QBarSet *barset);

        Titta Heikkala
    
Add pressed, released and doubleClicked signals...

              r2739
            
          void pressed(int index, QBarSet *barset);

          void released(int index, QBarSet *barset);

          void doubleClicked(int index, QBarSet *barset);

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      private:

        sauimone
    
removed categories from barseries. categories are now only on axis

              r1321
            
          int m_index;

        sauimone
    
fixed barchart signals with pimpl. drilldown works now

              r968
            
          QBarSet *m_barset;

        Michal Klocek
    
Adds compilation fix

              r1565
            
          bool m_hovering;

        Titta Heikkala
    
Add pressed, released and doubleClicked signals...

              r2739
            
          bool m_mousePressed;

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      };

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        sauimone
    
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?

              r56
            
      #endif // BAR_H

	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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen Updated license...	r2854	** and conditions see https://www.qt.io/terms-conditions. For further
		** information use the contact form at https://www.qt.io/contact-us.
		**
		** GNU General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU
		** General Public License version 3 or (at your option) any later version
		** approved by the KDE Free Qt Foundation. The licenses are as published by
		** the Free Software Foundation and appearing in the file LICENSE.GPL3
		** included in the packaging of this file. Please review the following
		** information to ensure the GNU General Public License requirements will
		** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Jani Honkonen Add license headers	r794
sauimone cleaned crap from barseries private headers. Added missing license texts	r1248	// W A R N I N G
		// -------------
		//
Titta Heikkala Updated private header warning...	r2807	// This file is not part of the Qt Chart API. It exists purely as an
sauimone cleaned crap from barseries private headers. Added missing license texts	r1248	// implementation detail. This header file may change from version to
		// version without notice, or even be removed.
		//
		// We mean it.

sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	#ifndef BAR_H
		#define BAR_H

Titta Heikkala Fix include syntax...	r2714	#include <QtCharts/QChartGlobal>
		#include <QtWidgets/QGraphicsRectItem>
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56
sauimone fixed barchart signals with pimpl. drilldown works now	r968	class QBarSet;

sauimone barcharts: added legend to model. added signals for hover events (for tooltip). updated examples	r280	// Single visual bar item of chart
Michal Klocek Refactors barchart axis hadnling...	r679	class Bar : public QObject, public QGraphicsRectItem
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	{
sauimone Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash	r256	Q_OBJECT
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	public:
sauimone removed categories from barseries. categories are now only on axis	r1321	Bar(QBarSet barset, int index, QGraphicsItem parent = 0);
sauimone removed double signal emitting from barseries/set	r1563	~Bar();
sauimone BarGroup and Bar as ChartItems instead of GraphicItems	r74
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	public:
sauimone Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash	r256	void mousePressEvent(QGraphicsSceneMouseEvent *event);
sauimone updated barchart examples. minor fixes	r276	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
		void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
Titta Heikkala Add pressed, released and doubleClicked signals...	r2739	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
		void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);

		void paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget = 0);
sauimone Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash	r256
		Q_SIGNALS:
sauimone removed double signal emitting from barseries/set	r1563	void clicked(int index, QBarSet *barset);
Titta Heikkala Add hovered signal with index for bar charts...	r2600	void hovered(bool status, int index, QBarSet *barset);
Titta Heikkala Add pressed, released and doubleClicked signals...	r2739	void pressed(int index, QBarSet *barset);
		void released(int index, QBarSet *barset);
		void doubleClicked(int index, QBarSet *barset);
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56
		private:
sauimone removed categories from barseries. categories are now only on axis	r1321	int m_index;
sauimone fixed barchart signals with pimpl. drilldown works now	r968	QBarSet *m_barset;
Michal Klocek Adds compilation fix	r1565	bool m_hovering;
Titta Heikkala Add pressed, released and doubleClicked signals...	r2739
		bool m_mousePressed;
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	};

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56
		#endif // BAR_H