HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · qmlplugin/declarativechart.cpp

Fixed bug in setting chart theme...

Fixed bug in setting chart theme The bug was that if you first add a series, then change theme and then restore the original theme, the color of the series was changed even though it should have been restored to match the original color.

Tero Ahola - - Load All Authors

File last commit:

r311:e1f0c8c24a70


                r312:0677c9dd6d92

Download file

             declarativechart.cpp
        
                    38 lines
            
             | 1.2 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / qmlplugin / declarativechart.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
First draft of project structure

              r1
            
      #include "declarativechart.h"

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Jani Honkonen
    
First draft of project structure

              r1
            
      DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
          : QDeclarativeItem(parent),

            m_chart(new QChart(this))

        Jani Honkonen
    
First draft of project structure

              r1
            
      {

          setFlag(QGraphicsItem::ItemHasNoContents, false);

      }

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      DeclarativeChart::ChartTheme DeclarativeChart::theme()

      {

        Tero Ahola
    
Removed unused DeclarativeSeries class

              r311
            
          return (ChartTheme) m_chart->chartTheme();

        Jani Honkonen
    
First draft of project structure

              r1
            
      }

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)

        Jani Honkonen
    
First draft of project structure

              r1
            
      {

        Tero Ahola
    
Set margins to 30 on QML impl

              r200
            
          qDebug() << "geometryChanged " << this << " old geometry: " << oldGeometry;

          if (newGeometry.isValid()) {

              if (newGeometry.width() > 0 && newGeometry.height() > 0) {

                  // TODO: setting margin should not be needed to make axis visible?

                  const int margin = 30;

                  if (m_chart->margin() == 0

                          && newGeometry.width() > (margin * 2)

                          && newGeometry.height() > (margin * 2)) {

                      m_chart->setMargin(margin);

                      m_chart->resize(newGeometry.width(), newGeometry.height());

                  } else {

                      m_chart->resize(newGeometry.width(), newGeometry.height());

                  }

              }

          }

        Jani Honkonen
    
First draft of project structure

              r1
            
      }

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      #include "moc_declarativechart.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

Jani Honkonen First draft of project structure	r1	#include "declarativechart.h"

Tero Ahola Proof-of-concept for QML api...	r120	QTCOMMERCIALCHART_BEGIN_NAMESPACE

Jani Honkonen First draft of project structure	r1	DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
Tero Ahola Proof-of-concept for QML api...	r120	: QDeclarativeItem(parent),
		m_chart(new QChart(this))
Jani Honkonen First draft of project structure	r1	{
		setFlag(QGraphicsItem::ItemHasNoContents, false);
		}

Tero Ahola Proof-of-concept for QML api...	r120	DeclarativeChart::ChartTheme DeclarativeChart::theme()
		{
Tero Ahola Removed unused DeclarativeSeries class	r311	return (ChartTheme) m_chart->chartTheme();
Jani Honkonen First draft of project structure	r1	}

Tero Ahola Proof-of-concept for QML api...	r120	void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
Jani Honkonen First draft of project structure	r1	{
Tero Ahola Set margins to 30 on QML impl	r200	qDebug() << "geometryChanged " << this << " old geometry: " << oldGeometry;
		if (newGeometry.isValid()) {
		if (newGeometry.width() > 0 && newGeometry.height() > 0) {
		// TODO: setting margin should not be needed to make axis visible?
		const int margin = 30;
		if (m_chart->margin() == 0
		&& newGeometry.width() > (margin * 2)
		&& newGeometry.height() > (margin * 2)) {
		m_chart->setMargin(margin);
		m_chart->resize(newGeometry.width(), newGeometry.height());
		} else {
		m_chart->resize(newGeometry.width(), newGeometry.height());
		}
		}
		}
Jani Honkonen First draft of project structure	r1	}

Tero Ahola Proof-of-concept for QML api...	r120	#include "moc_declarativechart.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE