HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2561:3dd93906f007

Further crash fixes to boxplot...

Miikka Heikkinen -

r2561:3dd93906f007

parent child

Context file:

r2561:3dd93906f007

Collapse all files

src/animations/boxplotanimation.cpp +9 -3

              {
                  BoxWhiskersAnimation *animation = m_animations.value(box);
                  if (!animation) {
-                     animation = new BoxWhiskersAnimation(box);
+                     animation = new BoxWhiskersAnimation(box, this);
                      m_animations.insert(box, animation);
                      BoxWhiskersData start;
                      start.m_median = box->m_data.m_median;
              void BoxPlotAnimation::stopAll()
              {
-                 foreach (BoxWhiskersAnimation *animation, m_animations.values())
+                 foreach (BoxWhiskers *box, m_animations.keys()) {
+                     BoxWhiskersAnimation *animation = m_animations.value(box);
                      animation->stopAndDestroyLater();
+                     m_animations.remove(box);
+                 }
              }
-             //#include "moc_boxplotanimation_p.cpp"
+             void BoxPlotAnimation::removeBoxAnimation(BoxWhiskers *box)
+             {
+                 m_animations.remove(box);
+             }
              QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxplotanimation_p.h +1 0

                  void setAnimationStart(BoxWhiskers *box);
                  void stopAll();
+                 void removeBoxAnimation(BoxWhiskers *box);
              protected:
                  BoxPlotChartItem *m_item;

src/animations/boxwhiskersanimation.cpp +5 -2

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers *box)
+             BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers *box, BoxPlotAnimation *boxPlotAnimation)
                  : ChartAnimation(box),
-                   m_box(box)
+                   m_box(box),
+                   m_boxPlotAnimation(boxPlotAnimation)
              {
                  setDuration(ChartAnimationDuration);
                  setEasingCurve(QEasingCurve::OutQuart);
              BoxWhiskersAnimation::~BoxWhiskersAnimation()
              {
+                 if (m_boxPlotAnimation)
+                     m_boxPlotAnimation->removeBoxAnimation(m_box);
              }
              QVariant BoxWhiskersAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const

src/animations/boxwhiskersanimation_p.h +2 -1

                  Q_OBJECT
              public:
-                 BoxWhiskersAnimation(BoxWhiskers *box);
+                 BoxWhiskersAnimation(BoxWhiskers *box, BoxPlotAnimation *boxPlotAnimation);
                  ~BoxWhiskersAnimation();
              public: // from QVariantAnimation
                  friend class BoxPlotAnimation;
                  BoxWhiskers *m_box;
                  bool m_moveMedianLine;
+                 BoxPlotAnimation *m_boxPlotAnimation;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/boxplotchart/qboxplotseries.cpp +8 -3

              bool QBoxPlotSeriesPrivate::append(QBoxSet *set)
              {
-                 if ((m_boxSets.contains(set)) || (set == 0))
+                 if (m_boxSets.contains(set) || (set == 0) || set->d_ptr->m_series)
                      return false; // Fail if set is already in list or set is null.
                  m_boxSets.append(set);
                  QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                  QObject::connect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
                  QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBox()), this, SIGNAL(restructuredBoxes()));
+                 set->d_ptr->m_series = this;
                  emit restructuredBoxes(); // this notifies boxplotchartitem
                  return true;
                  if (!m_boxSets.contains(set))
                      return false; // Fail if set is not in list
+                 set->d_ptr->m_series = 0;
                  m_boxSets.removeOne(set);
                  QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                  QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
              bool QBoxPlotSeriesPrivate::append(QList<QBoxSet *> sets)
              {
                  foreach (QBoxSet *set, sets) {
-                     if ((set == 0) || (m_boxSets.contains(set)))
+                     if ((set == 0) || m_boxSets.contains(set) || set->d_ptr->m_series)
                          return false; // Fail if any of the sets is null or is already appended.
                      if (sets.count(set) != 1)
                          return false; // Also fail if same set is more than once in given list.
                      QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                      QObject::connect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
                      QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBox()), this, SIGNAL(restructuredBoxes()));
+                     set->d_ptr->m_series = this;
                  }
                  emit restructuredBoxes(); // this notifies boxplotchartitem
                  }
                  foreach (QBoxSet *set, sets) {
+                     set->d_ptr->m_series = 0;
                      m_boxSets.removeOne(set);
                      QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                      QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
              bool QBoxPlotSeriesPrivate::insert(int index, QBoxSet *set)
              {
-                 if ((m_boxSets.contains(set)) || (set == 0))
+                 if ((m_boxSets.contains(set)) || (set == 0) || set->d_ptr->m_series)
                      return false; // Fail if set is already in list or set is null.
                  m_boxSets.insert(index, set);
+                 set->d_ptr->m_series = this;
                  QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                  QObject::connect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
                  QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBox()), this, SIGNAL(restructuredBoxes()));

src/boxplotchart/qboxset.cpp +2 -1

                  m_valuesCount(5),
                  m_appendCount(0),
                  m_pen(QPen(Qt::NoPen)),
-                 m_brush(QBrush(Qt::NoBrush))
+                 m_brush(QBrush(Qt::NoBrush)),
+                 m_series(0)
              {
                  m_values = new qreal[m_valuesCount];
              }

src/boxplotchart/qboxset_p.h +3 0

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
+             class QBoxPlotSeriesPrivate;
              class QBoxSetPrivate : public QObject
              {
                  Q_OBJECT
                  QBrush m_brush;
                  QBrush m_labelBrush;
                  QFont m_labelFont;
+                 QBoxPlotSeriesPrivate *m_series;
                  friend class QBoxSet;
                  friend class QBoxPlotSeriesPrivate;

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