HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r497:9455cddd70de

Adds draft of axis bar label support

Michal Klocek -

r497:9455cddd70de

parent child

Context file:

r497:9455cddd70de

Collapse all files

src/axis/axisitem.cpp +19 -15

                  setFlags(QGraphicsItem::ItemHasNoContents);
                  QObject::connect(m_chartAxis,SIGNAL(updated()),this,SLOT(handleAxisUpdated()));
+                 QObject::connect(m_chartAxis->categories(),SIGNAL(updated()),this,SLOT(handleAxisCategoriesUpdated()));
              }
              AxisItem::~AxisItem()
              QStringList AxisItem::createLabels(int ticks, qreal min, qreal max)
              {
                  Q_ASSERT(max>=min);
                  QStringList labels;
-                 //int ticks = axis->ticksCount()-1;
+                 QChartAxisCategories* categories = m_chartAxis->categories();
                  for(int i=0; i<= ticks; i++) {
                      qreal value = min + (i * (max - min)/ ticks);
-                     QString label ;//= axis->axisTickLabel(value);
-                     if(label.isEmpty()) {
+                     if(categories->count()==0) {
                          labels << QString::number(value);
                      }
                      else {
+                         QString label = categories->label(value);
                          labels << label;
                      }
                  }
                                   QPointF center = labelItem->boundingRect().center();
                                   labelItem->setTransformOriginPoint(center.x(), center.y());
                                   labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);
-                                  if(i%2){
+                                  if(i%2 && i+1 < layout.size()){
                                       QGraphicsRectItem *rectItem =  static_cast<QGraphicsRectItem*>(shades.at(i/2));
                                       rectItem->setRect(layout[i],m_rect.top(),layout[i+1]-layout[i],m_rect.height());
                                   }
                                   QPointF center = labelItem->boundingRect().center();
                                   labelItem->setTransformOriginPoint(center.x(), center.y());
                                   labelItem->setPos(m_rect.left() -  labelItem->boundingRect().width() - label_padding , layout[i]-center.y());
-                                  if(i%2){
+                                  if(i%2 && i+1 < layout.size()){
                                       QGraphicsRectItem *rectItem =  static_cast<QGraphicsRectItem*>(shades.at(i/2));
                                       rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i]-layout[i+1]);
                                   }
              //handlers
+             void AxisItem::handleAxisCategoriesUpdated()
+             {
+                updateItem();
+             }
              void AxisItem::handleAxisUpdated()
              {
+                 int count = m_chartAxis->ticksCount();
+                 if(m_ticks!=count){
+                 m_ticks=count;
+                 updateItem();
+                 }
                  if(isEmpty()) return;
                  if(m_chartAxis->isAxisVisible()) {
              }
-             void AxisItem::handleTicksCountChanged(int ticks)
+             {
-                 m_ticks=ticks;
-                 if(isEmpty()) return;
-                 updateItem();
+             }
              void AxisItem::handleGeometryChanged(const QRectF& rect)
              {
                  m_rect = rect;

src/axis/axisitem_p.h +2 -1

              public slots:
                  void handleAxisUpdated();//qchartaxis update calls
+                 void handleAxisCategoriesUpdated();//qchartaxis update calls
                  void handleRangeChanged(qreal min , qreal max); //domain update calls
-                 void handleTicksCountChanged(int ticks); //ticks changed
                  void handleGeometryChanged(const QRectF& size); //geometry update calls
              public:
                  void clear(int count);
                  void createItems(int count);
                  QStringList createLabels(int ticks, qreal min, qreal max);
              private:
                  QChartAxis* m_chartAxis;
                  AxisType m_type;

src/axis/qchartaxis.h +1 -1

                  void setTicksCount(int count);
                  int ticksCount() const { return m_ticksCount;}
-                 QChartAxisCategories& categories() { return m_category; }
+                 QChartAxisCategories* categories() { return &m_category; }
              signals:
              	void minChanged(qreal min);

src/axis/qchartaxiscategories.cpp +5 0

                  emit updated();
              }
+             QString QChartAxisCategories::label(qreal value) const
+             {
+                 return m_map.value(value);
+             }
              #include "moc_qchartaxiscategories.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qchartaxiscategories.h +1 0

                  void insert(qreal value,QString label);
                  void remove(qreal value);
+                 QString label(qreal value) const;
                  void clear();
                  int count();

src/barchart/barpresenterbase.cpp +8 -8

                  if (0 == count) {
                      return;
                  }
+                 count++;
                  mChart->axisX()->setTicksCount(count);
                  qreal min = 0;
-                 qreal max = mSeries->categoryCount();
+                 qreal max = count;
                  mChart->axisX()->setMin(min);
                  mChart->axisX()->setMax(max);
-                 qreal step = (max-min)/count;
-                 QChartAxisCategories& categories = mChart->axisX()->categories();
-                 categories.clear();
-                 for (int i=0; i<count; i++) {
-                     qDebug() << "initAxisLabels" << min << mSeries->categoryName(i);
-                     categories.insert(min,mSeries->categoryName(i));
-                     min += step;
+                 min++;
+                 QChartAxisCategories* categories = mChart->axisX()->categories();
+                 categories->clear();
+                 for (int i=0; i<count-1; i++) {
+                     categories->insert(min,mSeries->categoryName(i));
+                     min++;
                  }
                  mChart->axisX()->setLabelsVisible(true);
              }

src/chartpresenter.cpp +1 -2

                      QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal)),item,SLOT(handleRangeChanged(qreal,qreal)));
                      //initialize
                      item->handleRangeChanged(domain->minX(),domain->maxX());
-                     item->handleTicksCountChanged(4);
                  }
                  else{
                      QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal)),item,SLOT(handleRangeChanged(qreal,qreal)));
                      //initialize
                      item->handleRangeChanged(domain->minY(),domain->maxY());
-                     item->handleTicksCountChanged(4);
                  }
                  QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));

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