HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r453:6668b512a220

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

Marek Rosa -

r453:6668b512a220

parent child

Context file:

r453:6668b512a220

Collapse all files

src/axisanimationitem.cpp +6 -3

              {
              }
-             void AxisAnimationItem::updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout)
+             void AxisAnimationItem::updateItem()
              {
+                 QVector<qreal> oldLayout = layout();
+                 AxisItem::updateItem();
+                 QVector<qreal> newLayout = layout();
                  if(newLayout.count()==0) return;
                  oldLayout.resize(newLayout.size());
                  m_animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                  m_animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
                  QTimer::singleShot(0,m_animation,SLOT(start()));
-                 oldLayout = newLayout;
              }
              void AxisAnimationItem::setLabelsAngle(int angle)
              void AxisAnimator::updateCurrentValue (const QVariant & value )
              {
                  QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);
-                 m_axis->applyLayout(vector);
+                 m_axis->setLayout(vector);
              }
              #include "moc_axisanimationitem_p.cpp"

src/axisanimationitem_p.h +1 -1

                  void setLabelsAngle(int angle);
              protected:
-                 virtual void updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout);
+                 virtual void updateItem();
              private:
                  AxisAnimator *m_animation;
              };

src/axisitem.cpp +51 -35

                  Q_UNUSED(widget);
              }
-             void AxisItem::updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout)
+             void AxisItem::updateItem()
              {
-                 if(newLayout.count()==0) return;
-                 applyLayout(newLayout);
-                 oldLayout=newLayout;
+                 QStringList labels = createLabels(m_ticks,m_min,m_max);
+                 int diff = m_thicksList.size() - labels.size();
+                 if(diff>0) {
+                     clear(diff);
+                 }
+                 else if(diff<0) {
+                     createItems(-diff);
+                 }
+                 if(diff!=0) handleAxisUpdated();
+                 m_thicksList=labels;
+                 QVector<qreal> layout = calculateLayout();
+                 if(layout.count()==0) return;
+                 setLayout(layout);
              }
              QStringList AxisItem::createLabels(int ticks, qreal min, qreal max)
                  return points;
              }
-             void AxisItem::applyLayout(const QVector<qreal>& points)
+             void AxisItem::setLayout(const QVector<qreal>& layout)
              {
-                 Q_ASSERT(points.size() == m_thicksList.size());
                  QList<QGraphicsItem *> lines = m_grid.childItems();
                  QList<QGraphicsItem *> labels = m_labels.childItems();
                  QList<QGraphicsItem *> axis = m_axis.childItems();
                  Q_ASSERT(labels.size() == m_thicksList.size());
+                 Q_ASSERT(layout.size() == m_thicksList.size());
                  switch (m_type)
                       {
                               QGraphicsLineItem *lineItem =  static_cast<QGraphicsLineItem*>(axis.at(0));
                               lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
-                              for (int i = 0; i < points.size(); ++i) {
+                              for (int i = 0; i < layout.size(); ++i) {
                                   QGraphicsLineItem *lineItem =  static_cast<QGraphicsLineItem*>(lines.at(i));
-                                  lineItem->setLine(points[i], m_rect.top(), points[i], m_rect.bottom());
+                                  lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
                                   QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
                                   labelItem->setText(m_thicksList.at(i));
                                   QPointF center = labelItem->boundingRect().center();
                                   labelItem->setTransformOriginPoint(center.x(), center.y());
-                                  labelItem->setPos(points[i] - center.x(), m_rect.bottom() + label_padding);
+                                  labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);
                                   if(i%2){
                                       QGraphicsRectItem *rectItem =  static_cast<QGraphicsRectItem*>(shades.at(i/2));
-                                      rectItem->setRect(points[i],m_rect.top(),points[i+1]-points[i],m_rect.height());
+                                      rectItem->setRect(layout[i],m_rect.top(),layout[i+1]-layout[i],m_rect.height());
                                   }
                                   lineItem =  static_cast<QGraphicsLineItem*>(axis.at(i+1));
-                                  lineItem->setLine(points[i],m_rect.bottom(),points[i],m_rect.bottom()+5);
+                                  lineItem->setLine(layout[i],m_rect.bottom(),layout[i],m_rect.bottom()+5);
                               }
                           }
                           break;
                               QGraphicsLineItem *lineItem =  static_cast<QGraphicsLineItem*>(axis.at(0));
                               lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());
-                              for (int i = 0; i < points.size(); ++i) {
+                              for (int i = 0; i < layout.size(); ++i) {
                                   QGraphicsLineItem *lineItem =  static_cast<QGraphicsLineItem*>(lines.at(i));
-                                  lineItem->setLine(m_rect.left() , points[i], m_rect.right(), points[i]);
+                                  lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
                                   QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
                                   labelItem->setText(m_thicksList.at(i));
                                   QPointF center = labelItem->boundingRect().center();
                                   labelItem->setTransformOriginPoint(center.x(), center.y());
-                                  labelItem->setPos(m_rect.left() -  labelItem->boundingRect().width() - label_padding , points[i]-center.y());
+                                  labelItem->setPos(m_rect.left() -  labelItem->boundingRect().width() - label_padding , layout[i]-center.y());
                                   if(i%2){
                                       QGraphicsRectItem *rectItem =  static_cast<QGraphicsRectItem*>(shades.at(i/2));
-                                      rectItem->setRect(m_rect.left(),points[i],m_rect.width(),points[i]-points[i+1]);
+                                      rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i]-layout[i+1]);
                                   }
                                   lineItem =  static_cast<QGraphicsLineItem*>(axis.at(i+1));
-                                  lineItem->setLine(m_rect.left()-5,points[i],m_rect.left(),points[i]);
+                                  lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);
                               }
                           }
                           break;
                           qDebug()<<"Unknown axis type";
                           break;
                       }
+                 m_layoutVector=layout;
              }
              //handlers
              void AxisItem::handleAxisUpdated()
              {
-                 if(m_layoutVector.count()==0) return;
+                 if(isEmpty()) return;
                  if(m_chartAxis->isAxisVisible()) {
                      setAxisOpacity(100);
                  setGridPen(m_chartAxis->gridPen());
                  setShadesPen(m_chartAxis->shadesPen());
                  setShadesBrush(m_chartAxis->shadesBrush());
              }
              void AxisItem::handleRangeChanged(qreal min, qreal max)
              {
-                 if(min == max) return;
-                 QStringList labels = createLabels(4,min,max);
+                 m_min = min;
+                 m_max = max;
-                 int diff = m_thicksList.size() - labels.size();
+                 if(isEmpty()) return;
+                 updateItem();
-                 if(diff>0){
-                     clear(diff);
-                 }else if(diff<0){
-                     createItems(-diff);
                  }
-                 m_thicksList=labels;
-                 if(m_rect.isEmpty()) return;
-                 QVector<qreal>  vector = calculateLayout();
-                 updateItems(m_layoutVector,vector);
+             void AxisItem::handleTicksCountChanged(int ticks)
+             {
+                 m_ticks=ticks;
-                 if(diff!=0) handleAxisUpdated();
+                 if(isEmpty()) return;
+                 updateItem();
              }
              void AxisItem::handleGeometryChanged(const QRectF& rect)
              {
                  m_rect = rect;
+                 if(isEmpty()) return;
+                 updateItem();
+             }
-                 if(m_thicksList.size()==0) return;
-                 QVector<qreal>  vector = calculateLayout();
-                 updateItems(m_layoutVector,vector);
+             bool AxisItem::isEmpty()
+             {
+                 return m_rect.isEmpty() || m_min==m_max || m_ticks==0;
              }
              //TODO "nice numbers algorithm"

src/axisitem_p.h +8 -2

              public slots:
                  void handleAxisUpdated();//qchartaxis update calls
                  void handleRangeChanged(qreal min , qreal max); //domain update calls
+                 void handleTicksCountChanged(int ticks); //ticks changed
                  void handleGeometryChanged(const QRectF& size); //geometry update calls
              public:
-                 virtual void updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout);
+                 virtual void updateItem();
                  QVector<qreal> calculateLayout() const;
-                 void applyLayout(const QVector<qreal>& points);
+                 void setLayout(const QVector<qreal>& points);
+                 QVector<qreal> layout() { return m_layoutVector;};
              private:
+                 inline bool isEmpty();
                  void clear(int count);
                  void createItems(int count);
                  QStringList createLabels(int ticks, qreal min, qreal max);
                  QGraphicsItemGroup m_axis;
                  QStringList m_thicksList;
                  QVector<qreal> m_layoutVector;
+                 qreal m_min;
+                 qreal m_max;
+                 int m_ticks;
              };

src/chartdataset.cpp +2 -2

                  if(!domain) {
                      domain = new Domain();
-                     QObject::connect(axisY,SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeXChanged(qreal,qreal)));
-                     QObject::connect(axisX(),SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeYChanged(qreal,qreal)));
+                     QObject::connect(axisY,SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeYChanged(qreal,qreal)));
+                     QObject::connect(axisX(),SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeXChanged(qreal,qreal)));
                      //initialize
                      m_axisDomainMap.insert(axisY,domain);
                      emit axisAdded(axisY,domain);

src/chartpresenter.cpp +2 0

                      QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal)),item,SLOT(handleRangeChanged(qreal,qreal)));
                      //initialize
                      item->handleRangeChanged(domain->minX(),domain->maxX());
+                     item->handleTicksCountChanged(4);
                  }
                  else{
                      QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal)),item,SLOT(handleRangeChanged(qreal,qreal)));
                      //initialize
                      item->handleRangeChanged(domain->minY(),domain->maxY());
+                     item->handleTicksCountChanged(4);
                  }
                  QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));

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