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

correct drawing for barchart

sauimone - - Load All Authors

File last commit:

r82:144fd3c1acc4


                r82:144fd3c1acc4

Download file

             bargroup.cpp
        
                    138 lines
            
             | 3.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / barchart / bargroup.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r56
            
      #include "bargroup.h"

      #include "bar.h"

      #include <QDebug>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        sauimone
    
Improved bar chart series

              r71
            
      // TODO: singleton?

      //BarGroup* BarGroup::mBarGroupInstance = NULL;

      //BarGroup::BarGroup(QGraphicsItem *parent) :

      //    QGraphicsItem(parent)

      //    ,mSeries(series)

        sauimone
    
Added bar chart example

              r78
            
      BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :

        sauimone
    
BarGroup and Bar as ChartItems instead of GraphicItems

              r74
            
        ChartItem(parent)

        sauimone
    
Improved bar chart series

              r71
            
        ,mSeries(series)

        ,mLayoutSet(false)

        ,mLayoutDirty(true)

        sauimone
    
Added bar chart example

              r78
            
        ,mBarDefaultWidth(10)

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

              r56
            
      {

          dataChanged();

      }

        sauimone
    
Added bar chart example

              r78
            
      void BarGroup::setSize(const QSize& size)

      {

          // TODO: refactor this

          qDebug() << "BarGroup::setSize";

          resize(size.width(),size.height());

      }

      void BarGroup::setPlotDomain(const PlotDomain& data)

      {

          qDebug() << "BarGroup::setPlotDomain";

        sauimone
    
correct drawing for barchart

              r82
            
          // TODO:

        sauimone
    
Added bar chart example

              r78
            
      }

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

              r56
            
      void BarGroup::resize( int w, int h )

      {

          qDebug() << "QBarChart::resize";

          mWidth = w;

          mHeight = h;

          layoutChanged();

          mLayoutSet = true;

      }

      void BarGroup::setBarWidth( int w )

      {

          mBarDefaultWidth = w;

      }

        sauimone
    
correct drawing for barchart

              r82
            
      int BarGroup::addColor( QColor color )

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

              r56
            
      {

        sauimone
    
correct drawing for barchart

              r82
            
          int colorIndex = mColors.count();

          mColors.append(color);

          return colorIndex;

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

              r56
            
      }

      void BarGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)

      {

          if (!mLayoutSet) {

              qDebug() << "QBarChart::paint called without layout set. Aborting.";

              return;

          }

          if (mLayoutDirty) {

              // Layout or data has changed. Need to redraw.

              foreach(QGraphicsItem* i, childItems()) {

                  i->paint(painter,option,widget);

              }

          }

      }

      QRectF BarGroup::boundingRect() const

      {

          return QRectF(0,0,mWidth,mHeight);

      }

      void BarGroup::dataChanged()

      {

          qDebug() << "QBarChart::dataChanged mSeries";

          // Find out maximum and minimum of all series

          mMax = mSeries.max();

          mMin = mSeries.min();

          // Delete old bars

          // Is this correct way to delete childItems?

          foreach (QGraphicsItem* item, childItems()) {

              delete item;

          }

          // Create new graphic items for bars

        sauimone
    
Improved bar chart series

              r71
            
          int totalItems = mSeries.countTotalItems();

          for (int i=0; i<totalItems; i++) {

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

              r56
            
              Bar *bar = new Bar(this);

              childItems().append(bar);

          }

          mLayoutDirty = true;

      }

      void BarGroup::layoutChanged()

      {

          // Scale bars to new layout

          // Layout for bars:

        sauimone
    
Added bar chart example

              r78
            
          if (mSeries.countSeries() <= 0) {

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

              r56
            
              // Nothing to do.

              return;

          }

        sauimone
    
correct drawing for barchart

              r82
            
          // TODO: better way to auto-layout

        sauimone
    
Added bar chart example

              r78
            
          int count = mSeries.countItemsInSeries();

        sauimone
    
correct drawing for barchart

              r82
            
          int posStep = (mWidth / (count+1));

          int startPos = (mWidth / (count+1)) - mSeries.countSeries() * mBarDefaultWidth /2;

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

              r56
            
          qDebug() << "startpos" << startPos;

        sauimone
    
correct drawing for barchart

              r82
            
          // Scaling.

        sauimone
    
Improved bar chart series

              r71
            
          int itemIndex(0);

        sauimone
    
Added bar chart example

              r78
            
          for (int series = 0; series < mSeries.countSeries(); series++) {

              for (int item=0; item < mSeries.countItemsInSeries(); item++) {

                  qDebug() << itemIndex;

        sauimone
    
Improved bar chart series

              r71
            
                  int barHeight = mSeries.valueAt(series, item) * mHeight / mMax;

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

        sauimone
    
correct drawing for barchart

              r82
            
                  // TODO: width settable per bar?

                  bar->resize(mBarDefaultWidth, barHeight);

                  bar->setColor(mColors.at(series));

                  // TODO: bar width shouldn't affect height. Currently it does because pen width also affects height. (QPainter thingy...)

                  bar->setPos(item*posStep+startPos + series * mBarDefaultWidth, mHeight - barHeight + mBarDefaultWidth);

        sauimone
    
Improved bar chart series

              r71
            
                  itemIndex++;

              }

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

              r56
            
          }

          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 Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	#include "bargroup.h"
		#include "bar.h"
		#include <QDebug>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

sauimone Improved bar chart series	r71	// TODO: singleton?
		//BarGroup* BarGroup::mBarGroupInstance = NULL;

		//BarGroup::BarGroup(QGraphicsItem *parent) :
		// QGraphicsItem(parent)
		// ,mSeries(series)
sauimone Added bar chart example	r78	BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
sauimone BarGroup and Bar as ChartItems instead of GraphicItems	r74	ChartItem(parent)
sauimone Improved bar chart series	r71	,mSeries(series)
		,mLayoutSet(false)
		,mLayoutDirty(true)
sauimone Added bar chart example	r78	,mBarDefaultWidth(10)
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	{
		dataChanged();
		}

sauimone Added bar chart example	r78
		void BarGroup::setSize(const QSize& size)
		{
		// TODO: refactor this
		qDebug() << "BarGroup::setSize";
		resize(size.width(),size.height());
		}

		void BarGroup::setPlotDomain(const PlotDomain& data)
		{
		qDebug() << "BarGroup::setPlotDomain";
sauimone correct drawing for barchart	r82	// TODO:
sauimone Added bar chart example	r78	}


sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	void BarGroup::resize( int w, int h )
		{
		qDebug() << "QBarChart::resize";
		mWidth = w;
		mHeight = h;
		layoutChanged();
		mLayoutSet = true;
		}

		void BarGroup::setBarWidth( int w )
		{
		mBarDefaultWidth = w;
		}

sauimone correct drawing for barchart	r82	int BarGroup::addColor( QColor color )
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	{
sauimone correct drawing for barchart	r82	int colorIndex = mColors.count();
		mColors.append(color);
		return colorIndex;
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	}

		void BarGroup::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
		{
		if (!mLayoutSet) {
		qDebug() << "QBarChart::paint called without layout set. Aborting.";
		return;
		}
		if (mLayoutDirty) {
		// Layout or data has changed. Need to redraw.
		foreach(QGraphicsItem* i, childItems()) {
		i->paint(painter,option,widget);
		}
		}
		}

		QRectF BarGroup::boundingRect() const
		{
		return QRectF(0,0,mWidth,mHeight);
		}


		void BarGroup::dataChanged()
		{
		qDebug() << "QBarChart::dataChanged mSeries";

		// Find out maximum and minimum of all series
		mMax = mSeries.max();
		mMin = mSeries.min();

		// Delete old bars
		// Is this correct way to delete childItems?
		foreach (QGraphicsItem* item, childItems()) {
		delete item;
		}

		// Create new graphic items for bars
sauimone Improved bar chart series	r71	int totalItems = mSeries.countTotalItems();
		for (int i=0; i<totalItems; i++) {
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	Bar *bar = new Bar(this);
		childItems().append(bar);
		}

		mLayoutDirty = true;
		}

		void BarGroup::layoutChanged()
		{
		// Scale bars to new layout
		// Layout for bars:
sauimone Added bar chart example	r78	if (mSeries.countSeries() <= 0) {
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	// Nothing to do.
		return;
		}

sauimone correct drawing for barchart	r82	// TODO: better way to auto-layout
sauimone Added bar chart example	r78	int count = mSeries.countItemsInSeries();
sauimone correct drawing for barchart	r82	int posStep = (mWidth / (count+1));
		int startPos = (mWidth / (count+1)) - mSeries.countSeries() * mBarDefaultWidth /2;
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	qDebug() << "startpos" << startPos;

sauimone correct drawing for barchart	r82	// Scaling.
sauimone Improved bar chart series	r71	int itemIndex(0);
sauimone Added bar chart example	r78	for (int series = 0; series < mSeries.countSeries(); series++) {
		for (int item=0; item < mSeries.countItemsInSeries(); item++) {
		qDebug() << itemIndex;
sauimone Improved bar chart series	r71	int barHeight = mSeries.valueAt(series, item) * mHeight / mMax;
		Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));

sauimone correct drawing for barchart	r82	// TODO: width settable per bar?
		bar->resize(mBarDefaultWidth, barHeight);
		bar->setColor(mColors.at(series));

		// TODO: bar width shouldn't affect height. Currently it does because pen width also affects height. (QPainter thingy...)
		bar->setPos(itemposStep+startPos + series mBarDefaultWidth, mHeight - barHeight + mBarDefaultWidth);
sauimone Improved bar chart series	r71	itemIndex++;
		}
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	}
		mLayoutDirty = true;
		}

		QTCOMMERCIALCHART_END_NAMESPACE