HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1362:978d41b59ab7

Added insert method to QBarSeries

Marek Rosa -

r1362:978d41b59ab7

parent child

Context file:

r1362:978d41b59ab7

Collapse all files

doc/src/classes.qdoc +1 -1

                  series->add(0, 6);
                  series->add(2, 4);
                  ...
-                 chartView->addSeries(series);
+                 chart->addSeries(series);
                  \endcode
                  \raw HTML

src/barchart/qbarseries.cpp +36 -2

                   This signal is emitted when labels visibility have changed.
-                 \sa labelsVisible(), setLabelsVisible()
+                 \sa isLabelsVisible(), setLabelsVisible()
              */
              /*!
              }
              /*!
+                 Insert a set of bars to series at \a index postion. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
+                 Returns true, if inserting succeeded.
+             */
+             bool QBarSeries::insert(int index, QBarSet *set)
+             {
+                 Q_D(QBarSeries);
+                 bool success = d->insert(index, set);
+                 if (success) {
+                     QList<QBarSet*> sets;
+                     sets.append(set);
+                     emit barsetsAdded(sets);
+                 }
+                 return success;
+             }
+             /*!
                  Removes all of the bar sets from the series
              */
              void QBarSeries::clear()
              /*!
                  Returns the visibility of labels
              */
-             bool QBarSeries::labelsVisible() const
+             bool QBarSeries::isLabelsVisible() const
              {
                  Q_D(const QBarSeries);
                  return d->m_labelsVisible;
                  return true;
              }
+             bool QBarSeriesPrivate::insert(int index, QBarSet *set)
+             {
+                 Q_Q(QBarSeries);
+                 if ((m_barSets.contains(set)) || (set == 0)) {
+                     // Fail if set is already in list or set is null.
+                     return false;
+                 }
+                 m_barSets.insert(index, set);
+                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
+                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
+                 if (m_dataset) {
+                     m_dataset->updateSeries(q);   // this notifies legend
+                 }
+                 emit restructuredBars();      // this notifies barchartitem
+                 return true;
+             }
              #include "moc_qbarseries.cpp"
              #include "moc_qbarseries_p.cpp"

src/barchart/qbarseries.h +3 -2

                  Q_OBJECT
                  Q_PROPERTY(qreal barMargin READ barMargin WRITE setBarMargin)
                  Q_PROPERTY(int count READ barsetCount)
-                 Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible)
+                 Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible)
              public:
                  explicit QBarSeries(QObject *parent = 0);
                  bool remove(QBarSet *set);
                  bool append(QList<QBarSet* > sets);
                  bool remove(QList<QBarSet* > sets);
+                 bool insert(int index, QBarSet *set);
                  int barsetCount() const;
                  QList<QBarSet*> barSets() const;
                  void clear();
                  void setLabelsVisible(bool visible = true);
-                 bool labelsVisible() const;
+                 bool isLabelsVisible() const;
              protected:
                  explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0);

src/barchart/qbarseries_p.h +1 0

                  bool remove(QBarSet *set);
                  bool append(QList<QBarSet* > sets);
                  bool remove(QList<QBarSet* > sets);
+                 bool insert(int index, QBarSet *set);
                  QBarSet* barsetAt(int index);
                  QString categoryName(int category);

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