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

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

sauimone - - Load All Authors

File last commit:

r217:97e8d42197e7


                r238:7ad0e7194aa9

Download file

             barpresenterbase.cpp
        
                    111 lines
            
             | 2.9 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / barchart / barpresenterbase.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
Common naming convention for barcharts

              r216
            
      #include "barpresenterbase.h"

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

              r126
            
      #include "bar_p.h"

      #include "barlabel_p.h"

      #include "separator_p.h"

      #include <QDebug>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        sauimone
    
Common naming convention for barcharts

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

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

              r126
            
          : ChartItem(parent)

          ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready

          ,mLayoutSet(false)

          ,mLayoutDirty(true)

          ,mSeparatorsVisible(true)

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
          ,mModel(model)

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

              r126
            
      {

        sauimone
    
added labels to series, intergrated with test app. minor hack to test app

              r167
            
          dataChanged();

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

              r126
            
      }

        sauimone
    
Common naming convention for barcharts

              r216
            
      void BarPresenterBase::setSeparatorsVisible(bool visible)

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

              r126
            
      {

          mSeparatorsVisible = visible;

      }

        sauimone
    
Common naming convention for barcharts

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

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

              r126
            
      {

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

              r165
            
      //    qDebug() << "BarGroupBase::paint" << childItems().count();

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

              r126
            
          if (!mLayoutSet) {

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

              return;

          }

        sauimone
    
model delegate for bar series. updated examples

              r161
            
      //    if (mLayoutDirty) {

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

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

              foreach(QGraphicsItem* i, childItems()) {

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

              }

        sauimone
    
model delegate for bar series. updated examples

              r161
            
      //    }

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

              r126
            
      }

        sauimone
    
Common naming convention for barcharts

              r216
            
      QRectF BarPresenterBase::boundingRect() const

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

              r126
            
      {

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

      }

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

              r165
            
        sauimone
    
Common naming convention for barcharts

              r216
            
      void BarPresenterBase::setBarWidth( int w )

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

              r126
            
      {

          mBarDefaultWidth = w;

      }

        sauimone
    
brush support for bargroups

              r183
            
        sauimone
    
Common naming convention for barcharts

              r216
            
      void BarPresenterBase::dataChanged()

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

              r126
            
      {

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
          // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?

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

              r126
            
          // Delete old bars

          foreach (QGraphicsItem* item, childItems()) {

              delete item;

          }

          // Create new graphic items for bars

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

              r173
            
          int totalItems = mModel.countTotalItems();

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

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

              Bar *bar = new Bar(this);

              childItems().append(bar);

          }

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

              r173
            
          int count = mModel.countCategories();

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

              r126
            
          for (int i=0; i<count; i++) {

              BarLabel* label = new BarLabel(this);

        sauimone
    
removed barchartseriesbase. functionality is now in model

              r172
            
              label->set(mModel.label(i));

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

              r126
            
              childItems().append(label);

          }

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

              r173
            
          count = mModel.countCategories() - 1;   // There is one less separator than columns

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

              r126
            
          for (int i=0; i<count; i++) {

              Separator* sep = new Separator(this);

              sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme

              childItems().append(sep);

          }

          // TODO: if (autolayout) { layoutChanged() } or something

          mLayoutDirty = true;

      }

        Michal Klocek
    
Refactored for MVP...

              r139
            
      //handlers

        sauimone
    
Common naming convention for barcharts

              r216
            
      void BarPresenterBase::handleModelChanged(int index)

        Michal Klocek
    
Refactored for MVP...

              r139
            
      {

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

              r173
            
      //    qDebug() << "BarGroupBase::handleModelChanged" << index;

        sauimone
    
model delegate for bar series. updated examples

              r161
            
          dataChanged();

        Michal Klocek
    
Refactored for MVP...

              r139
            
      }

        sauimone
    
Common naming convention for barcharts

              r216
            
      void BarPresenterBase::handleDomainChanged(const Domain& domain)

        Michal Klocek
    
Refactored for MVP...

              r139
            
      {

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

              r165
            
      //    qDebug() << "BarGroupBase::handleDomainChanged";

        sauimone
    
added labels to series, intergrated with test app. minor hack to test app

              r167
            
          // TODO: Figure out the use case for this.

          // Affects the size of visible item, so layout is changed.

      //    layoutChanged();

        Michal Klocek
    
Refactored for MVP...

              r139
            
      }

        sauimone
    
Common naming convention for barcharts

              r216
            
      void BarPresenterBase::handleGeometryChanged(const QRectF& rect)

        Michal Klocek
    
Refactored for MVP...

              r139
            
      {

          mWidth = rect.width();

          mHeight = rect.height();

          layoutChanged();

          mLayoutSet = true;

          setPos(rect.topLeft());

      }

        sauimone
    
Common naming convention for barcharts

              r216
            
      #include "moc_barpresenterbase.cpp"

        Michal Klocek
    
Refactored for MVP...

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

              r126
            
      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 "barpresenterbase.h"
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	#include "bar_p.h"
		#include "barlabel_p.h"
		#include "separator_p.h"
		#include <QDebug>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

sauimone Common naming convention for barcharts	r216	BarPresenterBase::BarPresenterBase(BarChartModel& model, QGraphicsItem *parent)
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	: ChartItem(parent)
		,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
		,mLayoutSet(false)
		,mLayoutDirty(true)
		,mSeparatorsVisible(true)
sauimone removed barchartseriesbase. functionality is now in model	r172	,mModel(model)
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	{
sauimone added labels to series, intergrated with test app. minor hack to test app	r167	dataChanged();
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	}

sauimone Common naming convention for barcharts	r216	void BarPresenterBase::setSeparatorsVisible(bool visible)
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	{
		mSeparatorsVisible = visible;
		}

sauimone Common naming convention for barcharts	r216	void BarPresenterBase::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	{
sauimone bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.	r165	// qDebug() << "BarGroupBase::paint" << childItems().count();
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	if (!mLayoutSet) {
		qDebug() << "BarGroupBase::paint called without layout set. Aborting.";
		return;
		}
sauimone model delegate for bar series. updated examples	r161	// if (mLayoutDirty) {
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	// Layout or data has changed. Need to redraw.
		foreach(QGraphicsItem* i, childItems()) {
		i->paint(painter,option,widget);
		}
sauimone model delegate for bar series. updated examples	r161	// }
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	}

sauimone Common naming convention for barcharts	r216	QRectF BarPresenterBase::boundingRect() const
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	{
		return QRectF(0,0,mWidth,mHeight);
		}
sauimone bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.	r165
sauimone Common naming convention for barcharts	r216	void BarPresenterBase::setBarWidth( int w )
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	{
		mBarDefaultWidth = w;
		}
sauimone brush support for bargroups	r183
sauimone Common naming convention for barcharts	r216	void BarPresenterBase::dataChanged()
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	{
sauimone removed barchartseriesbase. functionality is now in model	r172	// TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126
		// Delete old bars
		foreach (QGraphicsItem* item, childItems()) {
		delete item;
		}

		// Create new graphic items for bars
sauimone fixed bug in category implementation. model now owns the category and sets	r173	int totalItems = mModel.countTotalItems();
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	for (int i=0; i<totalItems; i++) {
		Bar *bar = new Bar(this);
		childItems().append(bar);
		}

sauimone fixed bug in category implementation. model now owns the category and sets	r173	int count = mModel.countCategories();
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	for (int i=0; i<count; i++) {
		BarLabel* label = new BarLabel(this);
sauimone removed barchartseriesbase. functionality is now in model	r172	label->set(mModel.label(i));
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	childItems().append(label);
		}

sauimone fixed bug in category implementation. model now owns the category and sets	r173	count = mModel.countCategories() - 1; // There is one less separator than columns
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	for (int i=0; i<count; i++) {
		Separator* sep = new Separator(this);
		sep->setColor(QColor(255,0,0,255)); // TODO: color for separations from theme
		childItems().append(sep);
		}

		// TODO: if (autolayout) { layoutChanged() } or something
		mLayoutDirty = true;
		}

Michal Klocek Refactored for MVP...	r139	//handlers

sauimone Common naming convention for barcharts	r216	void BarPresenterBase::handleModelChanged(int index)
Michal Klocek Refactored for MVP...	r139	{
sauimone fixed bug in category implementation. model now owns the category and sets	r173	// qDebug() << "BarGroupBase::handleModelChanged" << index;
sauimone model delegate for bar series. updated examples	r161	dataChanged();
Michal Klocek Refactored for MVP...	r139	}

sauimone Common naming convention for barcharts	r216	void BarPresenterBase::handleDomainChanged(const Domain& domain)
Michal Klocek Refactored for MVP...	r139	{
sauimone bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.	r165	// qDebug() << "BarGroupBase::handleDomainChanged";
sauimone added labels to series, intergrated with test app. minor hack to test app	r167	// TODO: Figure out the use case for this.
		// Affects the size of visible item, so layout is changed.
		// layoutChanged();
Michal Klocek Refactored for MVP...	r139	}

sauimone Common naming convention for barcharts	r216	void BarPresenterBase::handleGeometryChanged(const QRectF& rect)
Michal Klocek Refactored for MVP...	r139	{
		mWidth = rect.width();
		mHeight = rect.height();
		layoutChanged();
		mLayoutSet = true;
		setPos(rect.topLeft());
		}

sauimone Common naming convention for barcharts	r216	#include "moc_barpresenterbase.cpp"
Michal Klocek Refactored for MVP...	r139
sauimone refactored barcharts. layout to derived classess other funtionality to base class	r126	QTCOMMERCIALCHART_END_NAMESPACE