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

Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...

Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts Conflicts: example/example.pro

sauimone - - Load All Authors

File last commit:

r173:5bd6f6e4373b


                r207:1bc0eafcd96e

Download file

             barchartseries.h
        
                    54 lines
            
             | 1.2 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / barchart / barchartseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r56
            
      #ifndef BARCHARTSERIES_H

      #define BARCHARTSERIES_H

      #include <QList>

        sauimone
    
Improved bar chart series

              r71
            
      #include <QAbstractItemModel>

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
      #include "qchartseries.h"

        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
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
      class QBarCategory;

      class QBarSet;

      class BarGroup;

      class BarChartModel;

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

              r56
            
      // Container for series

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
      class QTCOMMERCIALCHART_EXPORT BarChartSeries : public QChartSeries

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

              r56
            
      {

        sauimone
    
Improved bar chart series

              r71
            
          Q_OBJECT

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

              r56
            
      public:

        sauimone
    
fixed bug in category implementation. model now owns the category and sets

              r173
            
          BarChartSeries(QBarCategory *category, QObject* parent=0);

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

              r56
            
          virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }

        sauimone
    
fixed bug in category implementation. model now owns the category and sets

              r173
            
          void addBarSet(QBarSet *set);       // Takes ownership

          void removeBarSet(QBarSet *set);    // Also deletes the set, if set is owned.

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
        sauimone
    
fixed bug in category implementation. model now owns the category and sets

              r173
            
          //TODO:

          //QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)

          // TODO: Functions below this are not part of api and will be moved

          // to private implementation, when we start using it (not part of api)

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
          int countCategories();

          qreal min();

          qreal max();

          qreal valueAt(int set, int category);

          qreal maxCategorySum();

          BarChartModel& model();

      signals:

          void changed(int index);

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
      public Q_SLOTS:

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

              r56
            
      private:

        sauimone
    
BarGroup and Bar as ChartItems instead of GraphicItems

              r74
            
          BarGroup* mBarGroup;

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
          BarChartModel* mModel;

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

              r56
            
      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif // BARCHARTSERIES_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

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

		#include <QList>
sauimone Improved bar chart series	r71	#include <QAbstractItemModel>
sauimone removed barchartseriesbase. functionality is now in model	r172	#include "qchartseries.h"
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	QTCOMMERCIALCHART_BEGIN_NAMESPACE

sauimone removed barchartseriesbase. functionality is now in model	r172	class QBarCategory;
		class QBarSet;
		class BarGroup;
		class BarChartModel;

sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	// Container for series
sauimone removed barchartseriesbase. functionality is now in model	r172	class QTCOMMERCIALCHART_EXPORT BarChartSeries : public QChartSeries
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	{
sauimone Improved bar chart series	r71	Q_OBJECT
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	public:
sauimone fixed bug in category implementation. model now owns the category and sets	r173	BarChartSeries(QBarCategory category, QObject parent=0);
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56
		virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }

sauimone fixed bug in category implementation. model now owns the category and sets	r173	void addBarSet(QBarSet *set); // Takes ownership
		void removeBarSet(QBarSet *set); // Also deletes the set, if set is owned.
sauimone Barset and barcategory implememtation. Updated test application	r171
sauimone fixed bug in category implementation. model now owns the category and sets	r173	//TODO:
		//QList<QString> legend(); // Returns legend of series (ie. names of all sets in series)

		// TODO: Functions below this are not part of api and will be moved
		// to private implementation, when we start using it (not part of api)
sauimone removed barchartseriesbase. functionality is now in model	r172	int countCategories();
		qreal min();
		qreal max();
		qreal valueAt(int set, int category);
		qreal maxCategorySum();

		BarChartModel& model();

		signals:
		void changed(int index);

sauimone Barset and barcategory implememtation. Updated test application	r171	public Q_SLOTS:

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

sauimone BarGroup and Bar as ChartItems instead of GraphicItems	r74	BarGroup* mBarGroup;
sauimone removed barchartseriesbase. functionality is now in model	r172	BarChartModel* mModel;

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

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // BARCHARTSERIES_H