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

Fix worng slot signature in axis initilization

Michal Klocek - - Load All Authors

File last commit:

r679:2f2494d0880e


                r688:4ee85b7c4526

Download file

             percentbarchartitem.cpp
        
                    94 lines
            
             | 3.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / barchart / percentbarchartitem.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems

              r666
            
      #include "percentbarchartitem_p.h"

        sauimone
    
renamed bar.h to bar_p.h

              r118
            
      #include "bar_p.h"

        sauimone
    
Floating values to bar charts

              r263
            
      #include "barvalue_p.h"

        sauimone
    
Added pen & brush to QBarSet

              r214
            
      #include "qbarset.h"

        sauimone
    
percent bar chart

              r101
            
      #include <QDebug>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Refactors chartitem...

              r677
            
      PercentBarChartItem::PercentBarChartItem(QBarSeries *series, ChartPresenter* presenter) :

          BarChartItem(series, presenter)

        sauimone
    
percent bar chart

              r101
            
      {

      }

        sauimone
    
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems

              r666
            
      void PercentBarChartItem::layoutChanged()

        sauimone
    
percent bar chart

              r101
            
      {

          // Scale bars to new layout

          // Layout for bars:

        sauimone
    
review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()

              r366
            
          if (mSeries->barsetCount() <= 0) {

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

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

        sauimone
    
percent bar chart

              r101
            
              // 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
    
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems

              r666
            
              qDebug() << "WARNING: PercentBarChartItem::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
    
Fixed layout for barcharts

              r473
            
          // Use temporary qreals for accurancy (we might get some compiler warnings... :)

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
          qreal width = geometry().width();

          qreal height = geometry().height();

          qreal categoryCount = mSeries->categoryCount();

          qreal barWidth = width / (mSeries->categoryCount() * 2);

          qreal xStep = width/categoryCount;

          qreal xPos =  xStep/2 - barWidth / 2;

        sauimone
    
percent bar chart

              r101
            
        sauimone
    
Fixed layout for barcharts

              r473
            
          int itemIndex(0);

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
          for (int category = 0; category < categoryCount ; category++) {

        sauimone
    
moved tooltip to presenter

              r288
            
              qreal colSum = mSeries->categorySum(category);

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
              qreal scale = (height / colSum);

              qreal yPos = height;

        sauimone
    
review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()

              r366
            
              for (int set=0; set < mSeries->barsetCount(); set++) {

        sauimone
    
moved tooltip to presenter

              r288
            
                  qreal barHeight = mSeries->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
    
percent bar chart

              r101
            
                  // TODO: width settable per bar?

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
        Tero Ahola
    
Use light outline color instead of dark for bar, area and scatter

              r653
            
                  bar->setPen(mSeries->barsetAt(set)->pen());

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
                  bar->setRect(xPos, yPos-barHeight,barWidth, barHeight);

        sauimone
    
review fix: Removed iterator from barseries. Remove const from brush and pen. Renamed setters for tooltip, floating values and separators

              r357
            
                  bar->setBrush(mSeries->barsetAt(set)->brush());

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
        sauimone
    
percent bar chart

              r101
            
                  itemIndex++;

                  yPos -= barHeight;

              }

              xPos += xStep;

          }

        sauimone
    
cleanup on barseries. removed old commented out separator code

              r654
            
        sauimone
    
Floating values to bar charts

              r263
            
          // Position floating values

          itemIndex = 0;

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
          xPos = (width/categoryCount);

        sauimone
    
review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()

              r366
            
          for (int category=0; category < mSeries->categoryCount(); category++) {

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
              qreal yPos = height;

        sauimone
    
moved tooltip to presenter

              r288
            
              qreal colSum = mSeries->categorySum(category);

        Michal Klocek
    
Refactors barchart axis hadnling...

              r679
            
              qreal scale = (height / colSum);

        sauimone
    
review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()

              r366
            
              for (int set=0; set < mSeries->barsetCount(); set++) {

        sauimone
    
moved tooltip to presenter

              r288
            
                  qreal barHeight = mSeries->valueAt(set,category) * scale;

        sauimone
    
Floating values to bar charts

              r263
            
                  BarValue* value = mFloatingValues.at(itemIndex);

        sauimone
    
better use of gradients in barcharts

              r512
            
                  QBarSet* barSet = mSeries->barsetAt(set);

                  value->resize(100,50);  // TODO: proper layout for this.

        sauimone
    
updated barchart examples. minor fixes

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

        sauimone
    
better use of gradients in barcharts

              r512
            
                  value->setPen(barSet->floatingValuePen());

        sauimone
    
Floating values to bar charts

              r263
            
        sauimone
    
moved tooltip to presenter

              r288
            
                  if (mSeries->valueAt(set,category) != 0) {

                      int p = mSeries->percentageAt(set,category) * 100;

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

              r280
            
                      QString vString(QString::number(p));

                      vString.truncate(3);

        sauimone
    
updated barchart examples. minor fixes

              r276
            
                      vString.append("%");

                      value->setValueString(vString);

                  } else {

                      value->setValueString(QString(""));

                  }

        sauimone
    
Floating values to bar charts

              r263
            
                  itemIndex++;

                  yPos -= barHeight;

              }

              xPos += xStep;

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

              r126
            
          }

        sauimone
    
percent bar chart

              r101
            
      }

        sauimone
    
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems

              r666
            
      #include "moc_percentbarchartitem_p.cpp"

        sauimone
    
moved tooltip to presenter

              r288
            
        sauimone
    
percent bar chart

              r101
            
      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 combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems	r666	#include "percentbarchartitem_p.h"
sauimone renamed bar.h to bar_p.h	r118	#include "bar_p.h"
sauimone Floating values to bar charts	r263	#include "barvalue_p.h"
sauimone Added pen & brush to QBarSet	r214	#include "qbarset.h"
sauimone percent bar chart	r101	#include <QDebug>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Michal Klocek Refactors chartitem...	r677	PercentBarChartItem::PercentBarChartItem(QBarSeries series, ChartPresenter presenter) :
		BarChartItem(series, presenter)
sauimone percent bar chart	r101	{
		}

sauimone combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems	r666	void PercentBarChartItem::layoutChanged()
sauimone percent bar chart	r101	{
		// Scale bars to new layout
		// Layout for bars:
sauimone review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()	r366	if (mSeries->barsetCount() <= 0) {
sauimone fixed bug in category implementation. model now owns the category and sets	r173	qDebug() << "No sets in model!";
sauimone percent bar chart	r101	// 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 combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems	r666	qDebug() << "WARNING: PercentBarChartItem::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 Fixed layout for barcharts	r473	// Use temporary qreals for accurancy (we might get some compiler warnings... :)
Michal Klocek Refactors barchart axis hadnling...	r679	qreal width = geometry().width();
		qreal height = geometry().height();

		qreal categoryCount = mSeries->categoryCount();
		qreal barWidth = width / (mSeries->categoryCount() * 2);
		qreal xStep = width/categoryCount;
		qreal xPos = xStep/2 - barWidth / 2;
sauimone percent bar chart	r101
sauimone Fixed layout for barcharts	r473	int itemIndex(0);
Michal Klocek Refactors barchart axis hadnling...	r679	for (int category = 0; category < categoryCount ; category++) {
sauimone moved tooltip to presenter	r288	qreal colSum = mSeries->categorySum(category);
Michal Klocek Refactors barchart axis hadnling...	r679	qreal scale = (height / colSum);
		qreal yPos = height;
sauimone review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()	r366	for (int set=0; set < mSeries->barsetCount(); set++) {
sauimone moved tooltip to presenter	r288	qreal barHeight = mSeries->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 percent bar chart	r101
		// TODO: width settable per bar?
Michal Klocek Refactors barchart axis hadnling...	r679
Tero Ahola Use light outline color instead of dark for bar, area and scatter	r653	bar->setPen(mSeries->barsetAt(set)->pen());
Michal Klocek Refactors barchart axis hadnling...	r679	bar->setRect(xPos, yPos-barHeight,barWidth, barHeight);
sauimone review fix: Removed iterator from barseries. Remove const from brush and pen. Renamed setters for tooltip, floating values and separators	r357	bar->setBrush(mSeries->barsetAt(set)->brush());
Michal Klocek Refactors barchart axis hadnling...	r679
sauimone percent bar chart	r101	itemIndex++;
		yPos -= barHeight;
		}
		xPos += xStep;
		}
sauimone cleanup on barseries. removed old commented out separator code	r654
sauimone Floating values to bar charts	r263	// Position floating values
		itemIndex = 0;
Michal Klocek Refactors barchart axis hadnling...	r679	xPos = (width/categoryCount);
sauimone review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()	r366	for (int category=0; category < mSeries->categoryCount(); category++) {
Michal Klocek Refactors barchart axis hadnling...	r679	qreal yPos = height;
sauimone moved tooltip to presenter	r288	qreal colSum = mSeries->categorySum(category);
Michal Klocek Refactors barchart axis hadnling...	r679	qreal scale = (height / colSum);
sauimone review fixes. countCategories() -> categoryCount(). countSets -> barsetCount()	r366	for (int set=0; set < mSeries->barsetCount(); set++) {
sauimone moved tooltip to presenter	r288	qreal barHeight = mSeries->valueAt(set,category) * scale;
sauimone Floating values to bar charts	r263	BarValue* value = mFloatingValues.at(itemIndex);

sauimone better use of gradients in barcharts	r512	QBarSet* barSet = mSeries->barsetAt(set);
		value->resize(100,50); // TODO: proper layout for this.
sauimone updated barchart examples. minor fixes	r276	value->setPos(xPos, yPos-barHeight/2);
sauimone better use of gradients in barcharts	r512	value->setPen(barSet->floatingValuePen());
sauimone Floating values to bar charts	r263
sauimone moved tooltip to presenter	r288	if (mSeries->valueAt(set,category) != 0) {
		int p = mSeries->percentageAt(set,category) * 100;
sauimone barcharts: added legend to model. added signals for hover events (for tooltip). updated examples	r280	QString vString(QString::number(p));
		vString.truncate(3);
sauimone updated barchart examples. minor fixes	r276	vString.append("%");
		value->setValueString(vString);
		} else {
		value->setValueString(QString(""));
		}
sauimone Floating values to bar charts	r263
		itemIndex++;
		yPos -= barHeight;
		}
		xPos += xStep;
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	}
sauimone percent bar chart	r101	}

sauimone combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems	r666	#include "moc_percentbarchartitem_p.cpp"
sauimone moved tooltip to presenter	r288
sauimone percent bar chart	r101	QTCOMMERCIALCHART_END_NAMESPACE