HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r420:ad444fe37cf4

minor. formating

Michal Klocek -

r420:ad444fe37cf4

parent child

Context file:

r420:ad444fe37cf4

Collapse all files

src/chartdataset.cpp +34 -35

              const Domain ChartDataSet::domain(QChartAxis *axisY) const
              {
-             	int i = m_domainMap.count(axisY);
-             	if(i == 0){
-             		return Domain();
+             	}
-             	i = i - m_domainIndex -1;
+                 int i = m_domainMap.count(axisY);
+                 if(i == 0) {
+                     return Domain();
+                 }
+                 i = i - m_domainIndex -1;
                  return m_domainMap.values(axisY).at(i);
              }
              {
                  // TODO: we should check the series not already added
-                 series->setParent(this); // take ownership
+                 series->setParent(this);// take ownership
                  clearDomains();
                  if(axisY==0) axisY = m_axisY;
-                 axisY->setParent(this); // take ownership
+                 axisY->setParent(this);// take ownership
-                 QList<QSeries*>  seriesList = m_seriesMap.values(axisY);
+                 QList<QSeries*> seriesList = m_seriesMap.values(axisY);
                  QList<Domain> domainList = m_domainMap.values(axisY);
                          break;
                      }
                      case QSeries::SeriesTypeBar: {
-                     qDebug() << "QChartSeries::SeriesTypeBar";
+                         qDebug() << "QChartSeries::SeriesTypeBar";
                          QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                          qreal x = barSeries->categoryCount();
                          qreal y = barSeries->max();
                          break;
                      }
                      case QSeries::SeriesTypeStackedBar: {
-                     qDebug() << "QChartSeries::SeriesTypeStackedBar";
+                         qDebug() << "QChartSeries::SeriesTypeStackedBar";
                          QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                          qreal x = stackedBarSeries->categoryCount();
                          break;
                      }
                      case QSeries::SeriesTypePercentBar: {
-                     qDebug() << "QChartSeries::SeriesTypePercentBar";
+                         qDebug() << "QChartSeries::SeriesTypePercentBar";
                          QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                          qreal x = percentBarSeries->categoryCount();
              {
                  QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
                  foreach(QChartAxis* axis , keys) {
-                     if(m_seriesMap.contains(axis,series)){
+                     if(m_seriesMap.contains(axis,series)) {
                          emit seriesRemoved(series);
                          m_seriesMap.remove(axis,series);
                          //remove axis if no longer there
-                         if(!m_seriesMap.contains(axis)){
+                         if(!m_seriesMap.contains(axis)) {
                              emit axisRemoved(axis);
                              m_domainMap.remove(axis);
                              if(axis != m_axisY)
                  QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
                  foreach(QChartAxis* axis , keys) {
                      QList<QSeries*> seriesList = m_seriesMap.values(axis);
-                     for(int i =0 ; i < seriesList.size();i++ )
+                     for(int i =0; i < seriesList.size();i++ )
                      {
                          emit seriesRemoved(seriesList.at(i));
                          delete(seriesList.at(i));
                      m_domainMap.remove(axis);
                      emit axisRemoved(axis);
                      if(axis != m_axisY) delete axis;
+                     }
+                 }
                  m_domainIndex=0;
              }
                  Q_ASSERT(i>=0);
                  Domain domain = m_domainMap.values(axis).at(i);
                  {
-                 QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
-                 QList<QSeries*> seriesList = m_seriesMap.values(axis);
-                 foreach(QSeries* series, seriesList) {
-                     emit seriesDomainChanged(series,domain);
+                 }
-                 axis->updateRange(domain.m_minY,domain.m_maxY);
-                 emit axisRangeChanged(axis,labels);
+                     QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
+                     QList<QSeries*> seriesList = m_seriesMap.values(axis);
+                     foreach(QSeries* series, seriesList) {
+                         emit seriesDomainChanged(series,domain);
+                     }
+                     axis->updateRange(domain.m_minY,domain.m_maxY);
+                     emit axisRangeChanged(axis,labels);
                  }
                  QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
                  emit axisRangeChanged(axisX(),labels);
              }
              void ChartDataSet::clearDomains(int toIndex)
              {
                  Q_ASSERT(toIndex>=0);
                      QList<Domain> domains = m_domainMap.values(key);
                      m_domainMap.remove(key);
                      int i = domains.size() - toIndex - 1;
-                     while(i--){
+                     while(i--) {
                          domains.removeFirst();
                      }
-                     for(int j=domains.size()-1; j>=0 ;j--)
-                         m_domainMap.insert(key,domains.at(j));
+                     for(int j=domains.size()-1; j>=0;j--)
+                     m_domainMap.insert(key,domains.at(j));
                  }
              }
                  Domain domain;
-                 foreach (QChartAxis* axis , domainList){
+                 foreach (QChartAxis* axis , domainList) {
                      domain = m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height());
                      m_domainMap.insert(axis,domain);
                  }
                  QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
                  foreach(QChartAxis* axis , keys) {
-                     if(m_seriesMap.contains(axis,series)){
+                     if(m_seriesMap.contains(axis,series)) {
                          return axis;
                      }
                  }
                  int ticks = axis->ticksCount()-1;
-                 for(int i=0; i<= ticks; i++){
+                 for(int i=0; i<= ticks; i++) {
                      qreal value = min + (i * (max - min)/ ticks);
                      QString label = axis->axisTickLabel(value);
-                     if(label.isEmpty()){
+                     if(label.isEmpty()) {
                          labels << QString::number(value);
-                     }else{
+                     }
+                     else {
                          labels << label;
                      }
                  }
                  return labels;
              }
              void ChartDataSet::handleRangeChanged(QChartAxis* axis)
              {
                  qreal min = axis->min();
                      setDomain(m_domainIndex,axis);
                  }
              }
              void ChartDataSet::handleTickChanged(QChartAxis* axis)
              {
-                 if(axis==axisX()){
+                 if(axis==axisX()) {
                      Domain domain = m_domainMap.value(axisY());
                      QStringList labels = createLabels(axis,domain.m_minX,domain.m_maxX);
                      emit axisRangeChanged(axis,labels);
-                 }else{
+                 }
+                 else {
                      Domain domain = m_domainMap.value(axis);
                      QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
                      emit axisRangeChanged(axis,labels);

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