HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/barchart/stackedbarpresenter.cpp

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

sauimone - - Load All Authors

File last commit:

r273:108ca5a00d74


                r275:e59660aaa64a

Download file

             stackedbarpresenter.cpp
        
                    106 lines
            
             | 3.1 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / barchart / stackedbarpresenter.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
Common naming convention for barcharts

              r216
            
      #include "stackedbarpresenter.h"

        sauimone
    
renamed bar.h to bar_p.h

              r118
            
      #include "bar_p.h"

        sauimone
    
added labels to barcharts

              r114
            
      #include "barlabel_p.h"

        sauimone
    
Floating values to bar charts

              r263
            
      #include "barvalue_p.h"

        sauimone
    
refactored barcharts. layout to derived classess other funtionality to base class

              r126
            
      #include "separator_p.h"

        sauimone
    
Added pen & brush to QBarSet

              r214
            
      #include "qbarset.h"

        sauimone
    
added missing example files :)

              r96
            
      #include <QDebug>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        sauimone
    
Common naming convention for barcharts

              r216
            
      StackedBarPresenter::StackedBarPresenter(BarChartModel& model, QGraphicsItem *parent) :

          BarPresenterBase(model,parent)

        sauimone
    
added missing example files :)

              r96
            
      {

      }

        sauimone
    
Common naming convention for barcharts

              r216
            
      void StackedBarPresenter::layoutChanged()

        sauimone
    
added missing example files :)

              r96
            
      {

          // Scale bars to new layout

          // Layout for bars:

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
          if (mModel.countSets() <= 0) {

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

              r173
            
              qDebug() << "No sets in model!";

        sauimone
    
added missing example files :)

              r96
            
              // Nothing to do.

              return;

          }

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
          if (mModel.countCategories() == 0) {

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

              r173
            
              qDebug() << "No categories in model!";

        sauimone
    
prototyping separators with stacked bars

              r119
            
              // Nothing to do

              return;

          }

        sauimone
    
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.

              r165
            
          if (childItems().count() == 0) {

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

              r256
            
              qDebug() << "WARNING: StackedBarPresenter::layoutChanged called before graphics items are created!";

        sauimone
    
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.

              r165
            
              return;

          }

        sauimone
    
added missing example files :)

              r96
            
          // TODO: better way to auto-layout

        sauimone
    
bar chart layout fixing

              r99
            
          // Use reals for accurancy (we might get some compiler warnings... :)

        sauimone
    
brush support for bargroups

              r183
            
          // TODO: use temp variable for category count...

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
          qreal maxSum = mModel.maxCategorySum();

        sauimone
    
fixed naming mixup with percent and stacked groups

              r105
            
          qreal h = mHeight;

          qreal scale = (h / maxSum);

        sauimone
    
added missing example files :)

              r96
            
          int itemIndex(0);

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

              r256
            
          int labelIndex(0);

        sauimone
    
fixing layout bug on stacked bar chart

              r98
            
          qreal tW = mWidth;

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
          qreal tC = mModel.countCategories() + 1;

        sauimone
    
fixing layout bug on stacked bar chart

              r98
            
          qreal xStep = (tW/tC);

        sauimone
    
theme interface to barcharts. some minor fixes

              r113
            
          qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);

        sauimone
    
fixing layout bug on stacked bar chart

              r98
            
        sauimone
    
brush support for bargroups

              r183
            
          for (int category = 0; category < mModel.countCategories(); category++) {

        sauimone
    
fixing layout bug on stacked bar chart

              r98
            
              qreal yPos = h;

        sauimone
    
brush support for bargroups

              r183
            
              for (int set=0; set < mModel.countSets(); set++) {

                  qreal barHeight = mModel.valueAt(set, category) * scale;

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

              r256
            
                  Bar* bar = mBars.at(itemIndex);

        sauimone
    
added missing example files :)

              r96
            
                  bar->resize(mBarDefaultWidth, barHeight);

        sauimone
    
floating values working now. bounding rect bug fixed

              r273
            
                  bar->setBrush(mModel.setAt(set)->brush());

        sauimone
    
theme interface to barcharts. some minor fixes

              r113
            
                  bar->setPos(xPos, yPos-barHeight);

        sauimone
    
added missing example files :)

              r96
            
                  itemIndex++;

        sauimone
    
Some fixes to bar charts. Now bars draw almost correctly

              r97
            
                  yPos -= barHeight;

        sauimone
    
added missing example files :)

              r96
            
              }

        sauimone
    
added labels to barcharts

              r114
            
              // TODO: Layout for labels, remove magic number

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

              r256
            
              BarLabel* label = mLabels.at(labelIndex);

        sauimone
    
added labels to barcharts

              r114
            
              label->setPos(xPos, mHeight + 20);

              labelIndex++;

        sauimone
    
fixing layout bug on stacked bar chart

              r98
            
              xPos += xStep;

        sauimone
    
added missing example files :)

              r96
            
          }

        sauimone
    
added labels to barcharts

              r114
            
        sauimone
    
prototyping separators with stacked bars

              r119
            
          // Position separators

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

              r256
            
          xPos = xStep + xStep/2;

        sauimone
    
Barset and barcategory implememtation. Updated test application

              r171
            
          for (int s=0; s < mModel.countCategories() - 1; s++) {

        sauimone
    
Floating values to bar charts

              r263
            
              Separator* sep = mSeparators.at(s);

        sauimone
    
refactored barcharts. layout to derived classess other funtionality to base class

              r126
            
              sep->setPos(xPos,0);

              sep->setSize(QSizeF(1,mHeight));

        sauimone
    
prototyping separators with stacked bars

              r119
            
              xPos += xStep;

        sauimone
    
Floating values to bar charts

              r263
            
          }

          // Position floating values

          itemIndex = 0;

          xPos = ((tW/tC) - mBarDefaultWidth / 2);

          for (int category=0; category < mModel.countCategories(); category++) {

              qreal yPos = h;

              for (int set=0; set < mModel.countSets(); set++) {

                  qreal barHeight = mModel.valueAt(set,category) * scale;

                  BarValue* value = mFloatingValues.at(itemIndex);

                  // TODO: remove hard coding, apply layout

                  value->resize(100,50);

                  value->setPos(xPos + mBarDefaultWidth/2, yPos-barHeight/2);

                  value->setPen(QPen(QColor(255,255,255,255)));

                  QString vString(QString::number(mModel.valueAt(set,category)));

                  value->setValueString(vString);

                  itemIndex++;

                  yPos -= barHeight;

              }

              xPos += xStep;

        sauimone
    
prototyping separators with stacked bars

              r119
            
          }

        sauimone
    
model delegate for bar series. updated examples

              r161
            
        sauimone
    
added missing example files :)

              r96
            
          mLayoutDirty = true;

      }

      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

sauimone Common naming convention for barcharts	r216	#include "stackedbarpresenter.h"
sauimone renamed bar.h to bar_p.h	r118	#include "bar_p.h"
sauimone added labels to barcharts	r114	#include "barlabel_p.h"
sauimone Floating values to bar charts	r263	#include "barvalue_p.h"
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	#include "separator_p.h"
sauimone Added pen & brush to QBarSet	r214	#include "qbarset.h"
sauimone added missing example files :)	r96	#include <QDebug>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

sauimone Common naming convention for barcharts	r216	StackedBarPresenter::StackedBarPresenter(BarChartModel& model, QGraphicsItem *parent) :
		BarPresenterBase(model,parent)
sauimone added missing example files :)	r96	{
		}

sauimone Common naming convention for barcharts	r216	void StackedBarPresenter::layoutChanged()
sauimone added missing example files :)	r96	{
		// Scale bars to new layout
		// Layout for bars:
sauimone Barset and barcategory implememtation. Updated test application	r171	if (mModel.countSets() <= 0) {
sauimone fixed bug in category implementation. model now owns the category and sets	r173	qDebug() << "No sets in model!";
sauimone added missing example files :)	r96	// Nothing to do.
		return;
		}

sauimone Barset and barcategory implememtation. Updated test application	r171	if (mModel.countCategories() == 0) {
sauimone fixed bug in category implementation. model now owns the category and sets	r173	qDebug() << "No categories in model!";
sauimone prototyping separators with stacked bars	r119	// Nothing to do
		return;
		}

sauimone bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.	r165	if (childItems().count() == 0) {
sauimone Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash	r256	qDebug() << "WARNING: StackedBarPresenter::layoutChanged called before graphics items are created!";
sauimone bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.	r165	return;
		}

sauimone added missing example files :)	r96	// TODO: better way to auto-layout
sauimone bar chart layout fixing	r99	// Use reals for accurancy (we might get some compiler warnings... :)
sauimone brush support for bargroups	r183	// TODO: use temp variable for category count...
sauimone Barset and barcategory implememtation. Updated test application	r171	qreal maxSum = mModel.maxCategorySum();
sauimone fixed naming mixup with percent and stacked groups	r105	qreal h = mHeight;
		qreal scale = (h / maxSum);

sauimone added missing example files :)	r96	int itemIndex(0);
sauimone Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash	r256	int labelIndex(0);
sauimone fixing layout bug on stacked bar chart	r98	qreal tW = mWidth;
sauimone Barset and barcategory implememtation. Updated test application	r171	qreal tC = mModel.countCategories() + 1;
sauimone fixing layout bug on stacked bar chart	r98	qreal xStep = (tW/tC);
sauimone theme interface to barcharts. some minor fixes	r113	qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
sauimone fixing layout bug on stacked bar chart	r98
sauimone brush support for bargroups	r183	for (int category = 0; category < mModel.countCategories(); category++) {
sauimone fixing layout bug on stacked bar chart	r98	qreal yPos = h;
sauimone brush support for bargroups	r183	for (int set=0; set < mModel.countSets(); set++) {
		qreal barHeight = mModel.valueAt(set, category) * scale;
sauimone Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash	r256	Bar* bar = mBars.at(itemIndex);
sauimone added missing example files :)	r96
		bar->resize(mBarDefaultWidth, barHeight);
sauimone floating values working now. bounding rect bug fixed	r273	bar->setBrush(mModel.setAt(set)->brush());
sauimone theme interface to barcharts. some minor fixes	r113	bar->setPos(xPos, yPos-barHeight);
sauimone added missing example files :)	r96	itemIndex++;
sauimone Some fixes to bar charts. Now bars draw almost correctly	r97	yPos -= barHeight;
sauimone added missing example files :)	r96	}
sauimone added labels to barcharts	r114
		// TODO: Layout for labels, remove magic number
sauimone Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash	r256	BarLabel* label = mLabels.at(labelIndex);
sauimone added labels to barcharts	r114	label->setPos(xPos, mHeight + 20);
		labelIndex++;
sauimone fixing layout bug on stacked bar chart	r98	xPos += xStep;
sauimone added missing example files :)	r96	}
sauimone added labels to barcharts	r114
sauimone prototyping separators with stacked bars	r119	// Position separators
sauimone Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash	r256	xPos = xStep + xStep/2;
sauimone Barset and barcategory implememtation. Updated test application	r171	for (int s=0; s < mModel.countCategories() - 1; s++) {
sauimone Floating values to bar charts	r263	Separator* sep = mSeparators.at(s);
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	sep->setPos(xPos,0);
		sep->setSize(QSizeF(1,mHeight));
sauimone prototyping separators with stacked bars	r119	xPos += xStep;
sauimone Floating values to bar charts	r263	}

		// Position floating values
		itemIndex = 0;
		xPos = ((tW/tC) - mBarDefaultWidth / 2);
		for (int category=0; category < mModel.countCategories(); category++) {
		qreal yPos = h;
		for (int set=0; set < mModel.countSets(); set++) {
		qreal barHeight = mModel.valueAt(set,category) * scale;
		BarValue* value = mFloatingValues.at(itemIndex);

		// TODO: remove hard coding, apply layout
		value->resize(100,50);
		value->setPos(xPos + mBarDefaultWidth/2, yPos-barHeight/2);
		value->setPen(QPen(QColor(255,255,255,255)));

		QString vString(QString::number(mModel.valueAt(set,category)));
		value->setValueString(vString);

		itemIndex++;
		yPos -= barHeight;
		}
		xPos += xStep;
sauimone prototyping separators with stacked bars	r119	}
sauimone model delegate for bar series. updated examples	r161
sauimone added missing example files :)	r96	mLayoutDirty = true;
		}

		QTCOMMERCIALCHART_END_NAMESPACE