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

fixed bug in legend name drawing

sauimone - - Load All Authors

File last commit:

r585:b761105be1ea


                r585:b761105be1ea

Download file

             legendmarker.cpp
        
                    121 lines
            
             | 2.9 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / legendmarker.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
      #include "qchartglobal.h"

      #include "legendmarker_p.h"

      #include <QPainter>

      #include <QGraphicsSceneEvent>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      LegendMarker::LegendMarker(QSeries* series, QGraphicsItem *parent)

          : QGraphicsObject(parent)

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          ,mBoundingRect(0,0,1,1)

        sauimone
    
fixed bug in legend name drawing

              r585
            
          ,mMarkerBoundingRect(0,0,1,1)

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
          ,mSeries(series)

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          ,mBarset(0)

          ,mPieslice(0)

          ,mType(LegendMarkerTypeSeries)

        sauimone
    
fixed bug in legend name drawing

              r585
            
          ,mTextItem(new QGraphicsSimpleTextItem(this))

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          {

              setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);

          }

        sauimone
    
Legend can handle removing of series

              r576
            
      LegendMarker::LegendMarker(QSeries *series, QBarSet *barset, QGraphicsItem *parent)

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          : QGraphicsObject(parent)

          ,mBoundingRect(0,0,1,1)

        sauimone
    
fixed bug in legend name drawing

              r585
            
          ,mMarkerBoundingRect(0,0,1,1)

        sauimone
    
Legend can handle removing of series

              r576
            
          ,mSeries(series)

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          ,mBarset(barset)

          ,mPieslice(0)

          ,mType(LegendMarkerTypeBarset)

        sauimone
    
fixed bug in legend name drawing

              r585
            
          ,mTextItem(new QGraphicsSimpleTextItem(this))

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          {

              setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);

          }

        sauimone
    
Legend can handle removing of series

              r576
            
      LegendMarker::LegendMarker(QSeries *series, QPieSlice *pieslice, QGraphicsItem *parent)

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          : QGraphicsObject(parent)

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
          ,mBoundingRect(0,0,1,1)

        sauimone
    
fixed bug in legend name drawing

              r585
            
          ,mMarkerBoundingRect(0,0,1,1)

        sauimone
    
Legend can handle removing of series

              r576
            
          ,mSeries(series)

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          ,mBarset(0)

          ,mPieslice(pieslice)

          ,mType(LegendMarkerTypePieslice)

        sauimone
    
fixed bug in legend name drawing

              r585
            
          ,mTextItem(new QGraphicsSimpleTextItem(this))

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
          {

              setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);

          }

      void LegendMarker::setBoundingRect(const QRectF rect)

      {

          mBoundingRect = rect;

        sauimone
    
fixed bug in legend name drawing

              r585
            
          // Calculate Marker pos

          // TODO: remove hard coding. 5 is marigin around marker

          QSizeF markerSize(10,10);

          qreal x = mBoundingRect.x() + 5;

          qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2;

          mMarkerBoundingRect = QRectF(x,y,markerSize.width(),markerSize.height());

          mTextItem.setPos(mBoundingRect.x() + markerSize.width() + 10, y );

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
      }

      void LegendMarker::setBrush(const QBrush brush)

      {

          mBrush = brush;

      }

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
      QBrush LegendMarker::brush() const

      {

          return mBrush;

      }

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
      void LegendMarker::setName(const QString name)

      {

        sauimone
    
fixed bug in legend name drawing

              r585
            
          mTextItem.setText(name);

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
      }

      QString LegendMarker::name() const

      {

        sauimone
    
fixed bug in legend name drawing

              r585
            
          return mTextItem.text();

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
      }

        sauimone
    
Legend can handle removing of series

              r576
            
      QSeries* LegendMarker::series() const

      {

          return mSeries;

      }

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

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

      {

          painter->setBrush(mBrush);

        sauimone
    
fixed bug in legend name drawing

              r585
            
          painter->drawRect(mMarkerBoundingRect);

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
      }

      QRectF LegendMarker::boundingRect() const

      {

          return mBoundingRect;

      }

      void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event)

      {

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          switch (mType)

          {

          case LegendMarkerTypeSeries: {

        sauimone
    
combined clicked and rightclicked events of legend to one event with parameter

              r567
            
              emit clicked(mSeries,event->button());

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
              break;

        sauimone
    
bug fix in legend signals

              r569
            
              }

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          case LegendMarkerTypeBarset: {

        sauimone
    
combined clicked and rightclicked events of legend to one event with parameter

              r567
            
              emit clicked(mBarset,event->button());

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
              break;

        sauimone
    
bug fix in legend signals

              r569
            
              }

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          case LegendMarkerTypePieslice: {

        sauimone
    
combined clicked and rightclicked events of legend to one event with parameter

              r567
            
              emit clicked(mPieslice,event->button());

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
              break;

              }

          default: {

              break;

        sauimone
    
bug fix in legend signals

              r569
            
              }

        sauimone
    
more intelligent legend. fixed compiler warning in bar.cpp

              r565
            
          }

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
      }

      #include "moc_legendmarker_p.cpp"

      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 Separated legend marker to private header. Added signals for left and right mouse click	r547	#include "qchartglobal.h"
		#include "legendmarker_p.h"
		#include <QPainter>
		#include <QGraphicsSceneEvent>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		LegendMarker::LegendMarker(QSeries* series, QGraphicsItem *parent)
		: QGraphicsObject(parent)
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	,mBoundingRect(0,0,1,1)
sauimone fixed bug in legend name drawing	r585	,mMarkerBoundingRect(0,0,1,1)
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	,mSeries(series)
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	,mBarset(0)
		,mPieslice(0)
		,mType(LegendMarkerTypeSeries)
sauimone fixed bug in legend name drawing	r585	,mTextItem(new QGraphicsSimpleTextItem(this))
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	{
		setAcceptedMouseButtons(Qt::LeftButton\|Qt::RightButton);
		}

sauimone Legend can handle removing of series	r576	LegendMarker::LegendMarker(QSeries series, QBarSet barset, QGraphicsItem *parent)
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	: QGraphicsObject(parent)
		,mBoundingRect(0,0,1,1)
sauimone fixed bug in legend name drawing	r585	,mMarkerBoundingRect(0,0,1,1)
sauimone Legend can handle removing of series	r576	,mSeries(series)
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	,mBarset(barset)
		,mPieslice(0)
		,mType(LegendMarkerTypeBarset)
sauimone fixed bug in legend name drawing	r585	,mTextItem(new QGraphicsSimpleTextItem(this))
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	{
		setAcceptedMouseButtons(Qt::LeftButton\|Qt::RightButton);
		}

sauimone Legend can handle removing of series	r576	LegendMarker::LegendMarker(QSeries series, QPieSlice pieslice, QGraphicsItem *parent)
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	: QGraphicsObject(parent)
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	,mBoundingRect(0,0,1,1)
sauimone fixed bug in legend name drawing	r585	,mMarkerBoundingRect(0,0,1,1)
sauimone Legend can handle removing of series	r576	,mSeries(series)
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	,mBarset(0)
		,mPieslice(pieslice)
		,mType(LegendMarkerTypePieslice)
sauimone fixed bug in legend name drawing	r585	,mTextItem(new QGraphicsSimpleTextItem(this))
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	{
		setAcceptedMouseButtons(Qt::LeftButton\|Qt::RightButton);
		}

		void LegendMarker::setBoundingRect(const QRectF rect)
		{
		mBoundingRect = rect;
sauimone fixed bug in legend name drawing	r585	// Calculate Marker pos

		// TODO: remove hard coding. 5 is marigin around marker
		QSizeF markerSize(10,10);
		qreal x = mBoundingRect.x() + 5;
		qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2;
		mMarkerBoundingRect = QRectF(x,y,markerSize.width(),markerSize.height());

		mTextItem.setPos(mBoundingRect.x() + markerSize.width() + 10, y );
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	}

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

sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	QBrush LegendMarker::brush() const
		{
		return mBrush;
		}

sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	void LegendMarker::setName(const QString name)
		{
sauimone fixed bug in legend name drawing	r585	mTextItem.setText(name);
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	}

		QString LegendMarker::name() const
		{
sauimone fixed bug in legend name drawing	r585	return mTextItem.text();
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	}

sauimone Legend can handle removing of series	r576	QSeries* LegendMarker::series() const
		{
		return mSeries;
		}

sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	void LegendMarker::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
		{
		painter->setBrush(mBrush);
sauimone fixed bug in legend name drawing	r585	painter->drawRect(mMarkerBoundingRect);
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	}

		QRectF LegendMarker::boundingRect() const
		{
		return mBoundingRect;
		}

		void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event)
		{
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	switch (mType)
		{
		case LegendMarkerTypeSeries: {
sauimone combined clicked and rightclicked events of legend to one event with parameter	r567	emit clicked(mSeries,event->button());
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	break;
sauimone bug fix in legend signals	r569	}
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	case LegendMarkerTypeBarset: {
sauimone combined clicked and rightclicked events of legend to one event with parameter	r567	emit clicked(mBarset,event->button());
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	break;
sauimone bug fix in legend signals	r569	}
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	case LegendMarkerTypePieslice: {
sauimone combined clicked and rightclicked events of legend to one event with parameter	r567	emit clicked(mPieslice,event->button());
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	break;
		}
		default: {
		break;
sauimone bug fix in legend signals	r569	}
sauimone more intelligent legend. fixed compiler warning in bar.cpp	r565	}
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	}

		#include "moc_legendmarker_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE