HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1706:368f6161c675

Fixes categories wrong labeling issue for *barseries

Michal Klocek -

r1706:368f6161c675

parent child

Context file:

r1706:368f6161c675

Collapse all files

src/axis/categoriesaxis/chartcategoriesaxisx.cpp +6 -6

             QVector<qreal> ChartCategoriesAxisX::calculateLayout() const
             {
-                Q_ASSERT(m_categoriesAxis->categories().count()>=2);
+                Q_ASSERT(m_categoriesAxis->categories().count()>=1);
                 QVector<qreal> points;
-                points.resize(m_categoriesAxis->categories().count());
+                points.resize(m_categoriesAxis->categories().count()+1);
                 // TODO: shift logic
-                const qreal deltaX = m_rect.width()/(m_categoriesAxis->categories().count()-1);
+                const qreal deltaX = m_rect.width()/(m_categoriesAxis->categories().count());
-                for (int i = 0; i < m_categoriesAxis->categories().count(); ++i) {
+                for (int i = 0; i < m_categoriesAxis->categories().count()+1; ++i) {
                     int x = i * deltaX + m_rect.left();
                     points[i] = x;
                 }
                 QList<QGraphicsItem *> shades = m_shades->childItems();
                 QList<QGraphicsItem *> axis = m_axis->childItems();
-                Q_ASSERT(labels.size() == ticksList.size());
+                Q_ASSERT(labels.size()-1 == ticksList.size());
-                Q_ASSERT(layout.size() == ticksList.size());
+                Q_ASSERT(layout.size()-1 == ticksList.size());
                 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));
                 lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());

src/axis/categoriesaxis/chartcategoriesaxisy.cpp +6 -6

             QVector<qreal> ChartCategoriesAxisY::calculateLayout() const
             {
-                Q_ASSERT(m_categoriesAxis->categories().count()>=2);
+                Q_ASSERT(m_categoriesAxis->categories().count()>=1);
                 QVector<qreal> points;
-                points.resize(m_categoriesAxis->categories().count());
+                points.resize(m_categoriesAxis->categories().count()+1);
-                const qreal deltaY = m_rect.height()/(m_categoriesAxis->categories().count()-1);
+                const qreal deltaY = m_rect.height()/(m_categoriesAxis->categories().count());
-                for (int i = 0; i < m_categoriesAxis->categories().count(); ++i) {
+                for (int i = 0; i < m_categoriesAxis->categories().count()+1; ++i) {
                     int y = i * -deltaY + m_rect.bottom();
                     points[i] = y;
                 }
                 QList<QGraphicsItem *> shades = m_shades->childItems();
                 QList<QGraphicsItem *> axis = m_axis->childItems();
-                Q_ASSERT(labels.size() == ticksList.size());
+                Q_ASSERT(labels.size()-1 == ticksList.size());
-                Q_ASSERT(layout.size() == ticksList.size());
+                Q_ASSERT(layout.size()-1 == ticksList.size());
                 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));
                 lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());

src/axis/categoriesaxis/qbarcategoriesaxis.cpp +1 -1

             qreal QBarCategoriesAxisPrivate::min()
             {
                 //TODO:: cache it
-                return m_categories.indexOf(m_minCategory) + 0.5;
+                return m_categories.indexOf(m_minCategory) - 0.5;
             }
             qreal QBarCategoriesAxisPrivate::max()

src/barchart/qabstractbarseries.cpp +2 0

                     QBarCategoriesAxis* cataxis = qobject_cast<QBarCategoriesAxis*>(axis);
                     Q_ASSERT(cataxis);
                     QStringList categories;
+                    if(cataxis->categories().isEmpty()){
                     for (int i(1); i < categoryCount()+1; i++)
                     categories << QString::number(i);
                     cataxis->append(categories);
                     }
                 }
+            }
             QAbstractAxis::AxisType QAbstractBarSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
             {

src/barchart/qhorizontalbarseries.cpp +2 0

                     QBarCategoriesAxis* cataxis = qobject_cast<QBarCategoriesAxis*>(axis);
                     Q_ASSERT(cataxis);
                     QStringList categories;
+                    if(cataxis->categories().isEmpty()){
                     for (int i(1); i < categoryCount()+1; i++)
                     categories << QString::number(i);
                     cataxis->append(categories);
                     }
                 }
+            }
             QAbstractAxis::AxisType QHorizontalBarSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
             {

src/barchart/qhorizontalpercentbarseries.cpp 0 -10

@@ -56,16 +56,6 Chart* QHorizontalPercentBarSeriesPrivate::createGraphics(ChartPresenter* presen
56	return bar;	56	return bar;
57	}	57	}
58		58
59	QAbstractAxis::AxisType QHorizontalPercentBarSeriesPrivate::defaultAxisXType() const
60	{
61	return QAbstractAxis::AxisTypeValues;
62	}
63
64	QAbstractAxis::AxisType QHorizontalPercentBarSeriesPrivate::defaultAxisYType() const
65	{
66	return QAbstractAxis::AxisTypeCategories;
67	}
68
69		59
70	#include "moc_qhorizontalpercentbarseries.cpp"	60	#include "moc_qhorizontalpercentbarseries.cpp"
71		61

src/barchart/qhorizontalpercentbarseries_p.h 0 -2

                 QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
-                QAbstractAxis::AxisType defaultAxisXType() const;
-                QAbstractAxis::AxisType defaultAxisYType() const;
             private:
                 Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries)

src/chartdataset.cpp 0 -1

                 if(orientation==Qt::Vertical) {
                     seriesAxisMap= &m_seriesAxisYMap;
                 }else{
                     seriesAxisMap= &m_seriesAxisXMap;
                 }

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