HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r122:a77b38c0fb20

Change background gradient to use ObjectBoundingMode...

Michal Klocek -

r122:a77b38c0fb20

parent child

Context file:

r122:a77b38c0fb20

Collapse all files

example/colorlinechart/main.cpp +6 -1

                  chartView->setTitle("Custom color line chart example");
                  chartView->addSeries(series0);
                  chartView->addSeries(series1);
-                 chartView->setBackground(Qt::blue,Qt::yellow,QChart::HorizonatlGradientOrientation);
+                 QLinearGradient backgroundGradient;
+                 backgroundGradient.setColorAt(0.0, Qt::blue);
+                 backgroundGradient.setColorAt(1.0, Qt::yellow);
+                 backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
+                 chartView->setChartBackgroundBrush(backgroundGradient);
                  window.setCentralWidget(chartView);
                  window.resize(400, 300);

src/qchart.cpp +28 -9

                          domain.m_maxY = qMax(domain.m_maxY,y);
                      }
-                     XYLineChartItem* item = new XYLineChartItem(xyseries,this);
+                     XYLineChartItem* item = new XYLineChartItem(xyseries,0,this);
                      m_chartItems << item;
                      // TODO:
                  m_bacgroundOrinetation = orientation;
                  m_backgroundGradient.setColorAt(0.0, startColor);
                  m_backgroundGradient.setColorAt(1.0, endColor);
-                 m_backgroundGradient.setStart(0,0);
+                 m_backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                  if(orientation == VerticalGradientOrientation){
-                     m_backgroundGradient.setFinalStop(0,m_rect.height());
+                     m_backgroundGradient.setFinalStop(0,1);
                  }else{
-                     m_backgroundGradient.setFinalStop(m_rect.width(),0);
+                     m_backgroundGradient.setFinalStop(1,0);
                  }
                  m_backgroundItem->setBrush(m_backgroundGradient);
                  m_backgroundItem->update();
              }
+             void QChart::setChartBackgroundBrush(const QBrush& brush)
+             {
+                 if(!m_backgroundItem){
+                     m_backgroundItem = new QGraphicsRectItem(this);
+                     m_backgroundItem->setZValue(-1);
+                 }
+                 m_backgroundItem->setBrush(brush);
+                 m_backgroundItem->update();
+             }
+             void QChart::setChartBackgroundPen(const QPen& pen)
+             {
+                 if(!m_backgroundItem){
+                     m_backgroundItem = new QGraphicsRectItem(this);
+                     m_backgroundItem->setZValue(-1);
+                 }
+                 m_backgroundItem->setPen(pen);
+                 m_backgroundItem->update();
+             }
              void QChart::setTitle(const QString& title,const QFont& font)
              {
                  if(!m_titleItem) m_titleItem = new QGraphicsTextItem(this);
                  //recalculate background gradient
                  if (m_backgroundItem) {
                      m_backgroundItem->setRect(rect);
-                     if (m_bacgroundOrinetation == HorizonatlGradientOrientation)
-                     m_backgroundGradient.setFinalStop(m_backgroundItem->rect().width(), 0);
-                     else
-                     m_backgroundGradient.setFinalStop(0, m_backgroundItem->rect().height());
-                     m_backgroundItem->setBrush(m_backgroundGradient);
                  }
                  // resize and reposition childs

src/qchart.h +3 0

                  void setTitle(const QString& title,const QFont& font = QFont());
                  void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, GradientOrientation orientation = VerticalGradientOrientation);
+                 void setChartBackgroundBrush(const QBrush& brush);
+                 void setChartBackgroundPen(const QPen& pen);
                  void zoomInToRect(const QRectF& rectangle);
                  void zoomIn();
                  void zoomOut();

src/qchartview.cpp +8 0

                  m_chart->setBackground(startColor,endColor,orientation);
              }
+             void QChartView::setChartBackgroundBrush(const QBrush& brush)
+             {
+             	 m_chart->setChartBackgroundBrush(brush);
+             }
+             void QChartView::setChartBackgroundPen(const QPen& pen)
+             {
+             	 m_chart->setChartBackgroundPen(pen);
+             }
              QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +7 0

                  int margin() const;
                  void setTitle(const QString& title);
+                 //Obsolete
                  void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, QChart::GradientOrientation orientation = QChart::VerticalGradientOrientation);
+                 void setChartBackgroundBrush(const QBrush& brush);
+                 void setChartBackgroundPen(const QPen& pen);
                  void zoomInToRect(const QRect& rectangle);
                  void zoomIn();
                  void zoomOut();

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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