HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2151:cdaf9997827b

Removed some commented out code in barmodel mapper and replaced one comment with different one

Marek Rosa -

r2151:cdaf9997827b

parent child

Context file:

r2151:cdaf9997827b

Collapse all files

src/barchart/qbarmodelmapper.cpp +14 -21

                  if (m_orientation == Qt::Vertical && index.column() >= m_firstBarSetSection && index.column() <= m_lastBarSetSection) {
                      if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count)) {
-                         //            if (m_model->index(index.row(), m_valuesSection).isValid() && m_model->index(index.row(), m_labelsSection).isValid())
                          return m_series->barSets().at(index.column() - m_firstBarSetSection);
-                         //            else
-                         //                return 0;
                      }
                  } else if (m_orientation == Qt::Horizontal && index.row() >= m_firstBarSetSection && index.row() <= m_lastBarSetSection) {
                      if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count))
              void QBarModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
              {
-                 Q_UNUSED(parent);
-                 Q_UNUSED(end)
+                 Q_UNUSED(parent)
                  if (m_modelSignalsBlock)
                      return;
                  blockSeriesSignals();
                  if (m_orientation == Qt::Vertical)
-                     //        insertData(start, end);
-                     initializeBarFromModel();
+                     insertData(start, end);
                  else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection) // if the changes affect the map - reinitialize
                      initializeBarFromModel();
                  blockSeriesSignals(false);
              void QBarModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
              {
-                 Q_UNUSED(parent);
-                 Q_UNUSED(end)
+                 Q_UNUSED(parent)
                  if (m_modelSignalsBlock)
                      return;
                  blockSeriesSignals();
                  if (m_orientation == Qt::Vertical)
-                     //        removeData(start, end);
-                     initializeBarFromModel();
+                     removeData(start, end);
                  else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection) // if the changes affect the map - reinitialize
                      initializeBarFromModel();
                  blockSeriesSignals(false);
              void QBarModelMapperPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
              {
-                 Q_UNUSED(parent);
-                 Q_UNUSED(end)
+                 Q_UNUSED(parent)
                  if (m_modelSignalsBlock)
                      return;
                  blockSeriesSignals();
                  if (m_orientation == Qt::Horizontal)
-                     //        insertData(start, end);
-                     initializeBarFromModel();
+                     insertData(start, end);
                  else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection) // if the changes affect the map - reinitialize
                      initializeBarFromModel();
                  blockSeriesSignals(false);
              void QBarModelMapperPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
              {
-                 Q_UNUSED(parent);
-                 Q_UNUSED(end)
+                 Q_UNUSED(parent)
                  if (m_modelSignalsBlock)
                      return;
                  blockSeriesSignals();
                  if (m_orientation == Qt::Horizontal)
-                     //        removeData(start, end);
-                     initializeBarFromModel();
+                     removeData(start, end);
                  else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection) // if the changes affect the map - reinitialize
                      initializeBarFromModel();
                  blockSeriesSignals(false);
                  Q_UNUSED(end)
                  Q_UNUSED(start)
                  Q_UNUSED(end)
-                 // To be implemented
+                 // Currently barchart needs to be fully recalculated when change is made.
+                 // Re-initialize
+                 initializeBarFromModel();
              }
              void QBarModelMapperPrivate::removeData(int start, int end)
                  Q_UNUSED(end)
                  Q_UNUSED(start)
                  Q_UNUSED(end)
-                 // To be implemented
+                 // Currently barchart needs to be fully recalculated when change is made.
+                 // Re-initialize
+                 initializeBarFromModel();
              }
              void QBarModelMapperPrivate::barSetsAdded(QList<QBarSet *> sets)

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