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

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:

r183:45734e367adb


                r207:1bc0eafcd96e

Download file

             stackedbargroup.cpp
        
                    86 lines
            
             | 2.7 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / barchart / stackedbargroup.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
fixed naming mixup with percent and stacked groups

              r105
            
      #include "stackedbargroup.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
    
refactored barcharts. layout to derived classess other funtionality to base class

              r126
            
      #include "separator_p.h"

        sauimone
    
added missing example files :)

              r96
            
      #include <QDebug>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
      StackedBarGroup::StackedBarGroup(BarChartModel& model, QGraphicsItem *parent) :

          BarGroupBase(model,parent)

        sauimone
    
added missing example files :)

              r96
            
      {

      }

        sauimone
    
fixed naming mixup with percent and stacked groups

              r105
            
      void StackedBarGroup::layoutChanged()

        sauimone
    
added missing example files :)

              r96
            
      {

        sauimone
    
proof of concept implementation for barset and barcategory

              r169
            
      //    qDebug() << "StackedBarGroup::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) {

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

              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
    
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
    
Barset and barcategory implememtation. Updated test application

              r171
            
          int labelIndex = mModel.countSets() * mModel.countCategories();

        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
    
added missing example files :)

              r96
            
                  Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));

                  bar->resize(mBarDefaultWidth, barHeight);

        sauimone
    
brush support for bargroups

              r183
            
                  bar->setBrush(mBrushes.at(set));

      //            bar->setBrush(mBrush);

      //            bar->setColor(mColors.at(set));

        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

              BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));

              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
    
refactored barcharts. layout to derived classess other funtionality to base class

              r126
            
          int separatorIndex = labelIndex;    // Separators are after labels in childItems(). TODO: better way to store these?

          xPos = xStep + xStep/2;             // Initial position is between first and second group. ie one and half steps from left.

        sauimone
    
Barset and barcategory implememtation. Updated test application

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

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

              r126
            
              Separator* sep = reinterpret_cast<Separator*> (childItems().at(separatorIndex));

              sep->setPos(xPos,0);

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

        sauimone
    
prototyping separators with stacked bars

              r119
            
              xPos += xStep;

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

              r126
            
              separatorIndex++;

        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 fixed naming mixup with percent and stacked groups	r105	#include "stackedbargroup.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 refactored barcharts. layout to derived classess other funtionality to base class	r126	#include "separator_p.h"
sauimone added missing example files :)	r96	#include <QDebug>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

sauimone removed barchartseriesbase. functionality is now in model	r172	StackedBarGroup::StackedBarGroup(BarChartModel& model, QGraphicsItem *parent) :
		BarGroupBase(model,parent)
sauimone added missing example files :)	r96	{
		}

sauimone fixed naming mixup with percent and stacked groups	r105	void StackedBarGroup::layoutChanged()
sauimone added missing example files :)	r96	{
sauimone proof of concept implementation for barset and barcategory	r169	// qDebug() << "StackedBarGroup::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) {
		qDebug() << "WARNING: StackedBarGroup::layoutChanged called before graphics items are created!";
		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 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 Barset and barcategory implememtation. Updated test application	r171	int labelIndex = mModel.countSets() * mModel.countCategories();
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 added missing example files :)	r96	Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));

		bar->resize(mBarDefaultWidth, barHeight);
sauimone brush support for bargroups	r183	bar->setBrush(mBrushes.at(set));
		// bar->setBrush(mBrush);
		// bar->setColor(mColors.at(set));
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
		BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
		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 refactored barcharts. layout to derived classess other funtionality to base class	r126	int separatorIndex = labelIndex; // Separators are after labels in childItems(). TODO: better way to store these?
		xPos = xStep + xStep/2; // Initial position is between first and second group. ie one and half steps from left.
sauimone Barset and barcategory implememtation. Updated test application	r171	for (int s=0; s < mModel.countCategories() - 1; s++) {
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	Separator* sep = reinterpret_cast<Separator*> (childItems().at(separatorIndex));
		sep->setPos(xPos,0);
		sep->setSize(QSizeF(1,mHeight));
sauimone prototyping separators with stacked bars	r119	xPos += xStep;
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	separatorIndex++;
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