HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r241:0019f0f15db3

Bugfix shades not updated aftet tick changed

Michal Klocek -

r241:0019f0f15db3

parent child

Context file:

r241:0019f0f15db3

src/axisitem.cpp +2 -3

                               if(i%2){
                                   QGraphicsRectItem *rectItem =  static_cast<QGraphicsRectItem*>(shades.at(i/2));
                                   rectItem->setRect(x,m_rect.top(),deltaX,m_rect.height());
-                                  rectItem->setOpacity( 0.5 );
                               }
                           }
                       }
                               if(i%2){
                                   QGraphicsRectItem *rectItem =  static_cast<QGraphicsRectItem*>(shades.at(i/2));
                                   rectItem->setRect(m_rect.left(),y,m_rect.width(),deltaY);
                               }
                           }
                       }
                 setShadesBrush(axis->shadesBrush());
             }
-            void AxisItem::handleLabelsChanged(const QStringList& labels)
+            void AxisItem::handleLabelsChanged(QChartAxis* axis,const QStringList& labels)
             {
                 m_thicksList=labels;
                 QList<QGraphicsItem*> items = m_labels.childItems();
                    m_thicksList=labels;
                    createItems(m_thicksList.size());
                    items = m_labels.childItems();
+                   handleAxisUpdate(axis);
                  }
                 Q_ASSERT(items.size()==m_thicksList.size());

src/axisitem_p.h +1 -1

             public slots:
                 void handleAxisUpdate(QChartAxis* axis);
-                void handleLabelsChanged(const QStringList& labels);
+                void handleLabelsChanged(QChartAxis* axis,const QStringList& labels);
                 void handleGeometryChanged(const QRectF& size);
             protected:
                 void updateItem(int count);

src/chartdataset.cpp +1 -1

                 QStringList labels;
-                int ticks = axis->ticksCount();
+                int ticks = axis->ticksCount()-1;
                 for(int i=0; i<= ticks; i++){
                     qreal value = min + (i * (max - min)/ ticks);

src/chartpresenter.cpp +1 -1

             void ChartPresenter::handleAxisLabelsChanged(QChartAxis* axis,const QStringList& labels)
             {
-                m_axisItems.value(axis)->handleLabelsChanged(labels);
+                m_axisItems.value(axis)->handleLabelsChanged(axis,labels);
             }
             void ChartPresenter::setChartTheme(QChart::ChartTheme theme)

src/qchartaxis.cpp +1 -1

             m_shadesOpacity(1.0),
             m_min(0),
             m_max(0),
-            m_ticksCount(4)
+            m_ticksCount(5)
             {
             }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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