HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1332:d53e7bc5ed0a

Removed some model support leftovers from BarSeries

Marek Rosa -

r1332:d53e7bc5ed0a

parent child

Context file:

r1332:d53e7bc5ed0a

Collapse all files

src/barchart/barchartitem.cpp 0 -7

              {
                  setFlag(ItemClipsChildrenToShape);
                  connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
-                 connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleModelChanged()));
                  connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(labelsVisibleChanged(bool)));
                  setZValue(ChartPresenter::BarSeriesZValue);
                  dataChanged();
              }
              //handlers
-             void BarChartItem::handleModelChanged()
+             {
-             //    dataChanged();
-                 presenter()->resetAllElements();
+             }
              void BarChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
              {
                  m_domainMinX = minX;

src/barchart/barchartitem_p.h 0 -1

                  QRectF geometry() const { return m_rect;}
              public Q_SLOTS:
-                 void handleModelChanged();
                  void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                  void handleGeometryChanged(const QRectF &size);
                  void handleLayoutChanged();

src/barchart/qbarseries.cpp +4 -21

              {
              }
-             void QBarSeriesPrivate::setCategories(QStringList categories)
+             {
-                 m_categories = categories;
+             }
-             void QBarSeriesPrivate::insertCategory(int index, const QString category)
+             {
-                 m_categories.insert(index, category);
-                 emit categoriesUpdated();
+             }
-             void QBarSeriesPrivate::removeCategory(int index)
+             {
-                 m_categories.removeAt(index);
-                 emit categoriesUpdated();
+             }
              int QBarSeriesPrivate::categoryCount() const
              {
                  if (m_categories.count() > 0) {
                  if (m_dataset) {
                      m_dataset->updateSeries(q);   // this notifies legend
                  }
-                 emit restructuredBars();      // this notifies barchartitem
+             //    emit restructuredBars();      // this notifies barchartitem
                  return true;
              }
                  if (m_dataset) {
                      m_dataset->updateSeries(q);   // this notifies legend
                  }
-                 emit restructuredBars();        // this notifies barchartitem
+             //    emit restructuredBars();        // this notifies barchartitem
                  return true;
              }
                  if (m_dataset) {
                      m_dataset->updateSeries(q);   // this notifies legend
                  }
-                 emit restructuredBars();        // this notifies barchartitem
+             //    emit restructuredBars();        // this notifies barchartitem
                  return true;
              }
                      if (m_dataset) {
                          m_dataset->updateSeries(q);   // this notifies legend
                      }
-                     emit restructuredBars();        // this notifies barchartitem
+             //        emit restructuredBars();        // this notifies barchartitem
                  }
                  return setsRemoved;
              }

src/barchart/qbarseries_p.h +2 -5

              public:
                  QBarSeriesPrivate(QBarSeries *parent);
                  // TODO: refactor/remove private category stuff
-                 void setCategories(QStringList categories);
-                 void insertCategory(int index, const QString category);
-                 void removeCategory(int index);
                  int categoryCount() const;
                  QStringList categories() const;
              Q_SIGNALS:
                  void clicked(QBarSet *barset, int index);
                  void updatedBars();
-                 void restructuredBars();
-                 void categoriesUpdated();
+             //    void restructuredBars();
+             //    void categoriesUpdated();
                  void labelsVisibleChanged(bool visible);
              private Q_SLOTS:

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