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

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

sauimone - - Load All Authors

File last commit:

r183:45734e367adb


                r238:7ad0e7194aa9

Download file

             bar.cpp
        
                    74 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / barchart / bar.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
renamed bar.h to bar_p.h

              r118
            
      #include "bar_p.h"

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

              r56
            
      #include <QDebug>

        Michal Klocek
    
minor.

              r59
            
      #include <QPainter>

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

              r56
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Tero Ahola
    
Refactored themes; now enabled for line, scatter and pies...

              r103
            
      Bar::Bar(QGraphicsItem *parent)

        Tero Ahola
    
Refactoring continued: restored ChartItem class

              r104
            
          : ChartItem(parent)

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

              r56
            
      {

      }

        Michal Klocek
    
Adds layout support for charts....

              r115
            
      void Bar::setSize(const QSizeF& size)

        sauimone
    
BarGroup and Bar as ChartItems instead of GraphicItems

              r74
            
      {

          mWidth = size.width();

          mHeight = size.height();

      }

        sauimone
    
theme interface to barcharts. some minor fixes

              r113
            
      void Bar::resize( qreal w, qreal h )

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

              r56
            
      {

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

              r97
            
      //    qDebug() << "bar::resize" << w << h;

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

              r56
            
          mWidth = w;

          mHeight = h;

      }

      void Bar::setColor( QColor col )

      {

          mColor = col;

      }

        sauimone
    
brush support for bargroups

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

              r56
            
      void Bar::setPos(qreal x, qreal y)

      {

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

              r97
            
       //   qDebug() << "Bar::setpos" << x << y;

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

              r56
            
          mXpos = x;

          mYpos = y;

      }

        sauimone
    
brush support for bargroups

              r183
            
      void Bar::setPen(QPen pen)

      {

          mPen = pen;

      }

      void Bar::setBrush(QBrush brush)

      {

          mBrush = brush;

      }

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

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

      {

        sauimone
    
correct drawing for barchart

              r82
            
          if (0 == mHeight) {

              return;

          }

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

              r97
            
          // TODO: accept brush instead of color

        sauimone
    
brush support for bargroups

              r183
            
          painter->setBrush(mBrush);

      //    QBrush brush(mColor);

      //    painter->setBrush(brush);

        sauimone
    
theme interface to barcharts. some minor fixes

              r113
            
          // This compensates for rounding errors. drawRect takes ints and cumulative error of pos + size may be over 1.

          int x0 = mXpos;

          int x1 = (mXpos + mWidth);

          int w = x1-x0;

          int y0 = mYpos;

          int y1 = (mYpos + mHeight);

          int h = y1-y0;

          painter->drawRect(x0, y0 ,w ,h);

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

              r56
            
      }

      QRectF Bar::boundingRect() const

      {

          QRectF r(mXpos, mYpos, mXpos + mWidth, mYpos + mHeight);

          return r;

      }

      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 renamed bar.h to bar_p.h	r118	#include "bar_p.h"
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	#include <QDebug>
Michal Klocek minor.	r59	#include <QPainter>
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Tero Ahola Refactored themes; now enabled for line, scatter and pies...	r103	Bar::Bar(QGraphicsItem *parent)
Tero Ahola Refactoring continued: restored ChartItem class	r104	: ChartItem(parent)
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	{
		}

Michal Klocek Adds layout support for charts....	r115	void Bar::setSize(const QSizeF& size)
sauimone BarGroup and Bar as ChartItems instead of GraphicItems	r74	{
		mWidth = size.width();
		mHeight = size.height();
		}


sauimone theme interface to barcharts. some minor fixes	r113	void Bar::resize( qreal w, qreal h )
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	{
sauimone Some fixes to bar charts. Now bars draw almost correctly	r97	// qDebug() << "bar::resize" << w << h;
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	mWidth = w;
		mHeight = h;
		}

		void Bar::setColor( QColor col )
		{
		mColor = col;
		}
sauimone brush support for bargroups	r183
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	void Bar::setPos(qreal x, qreal y)
		{
sauimone Some fixes to bar charts. Now bars draw almost correctly	r97	// qDebug() << "Bar::setpos" << x << y;
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	mXpos = x;
		mYpos = y;
		}

sauimone brush support for bargroups	r183	void Bar::setPen(QPen pen)
		{
		mPen = pen;
		}

		void Bar::setBrush(QBrush brush)
		{
		mBrush = brush;
		}

sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	void Bar::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
		{
sauimone correct drawing for barchart	r82	if (0 == mHeight) {
		return;
		}
sauimone Some fixes to bar charts. Now bars draw almost correctly	r97	// TODO: accept brush instead of color
sauimone brush support for bargroups	r183	painter->setBrush(mBrush);
		// QBrush brush(mColor);
		// painter->setBrush(brush);
sauimone theme interface to barcharts. some minor fixes	r113
		// This compensates for rounding errors. drawRect takes ints and cumulative error of pos + size may be over 1.
		int x0 = mXpos;
		int x1 = (mXpos + mWidth);
		int w = x1-x0;
		int y0 = mYpos;
		int y1 = (mYpos + mHeight);
		int h = y1-y0;
		painter->drawRect(x0, y0 ,w ,h);
sauimone Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?	r56	}

		QRectF Bar::boundingRect() const
		{
		QRectF r(mXpos, mYpos, mXpos + mWidth, mYpos + mHeight);
		return r;
		}

		QTCOMMERCIALCHART_END_NAMESPACE