HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1655:f1c3fb22a206

Fixes customchart, barcategoryaxisy

Michal Klocek -

r1655:f1c3fb22a206

parent child

Context file:

r1655:f1c3fb22a206

Collapse all files

examples/customchart/main.cpp +6 -6

             //![2]
             //![3]
-                QBarCategoriesAxis* axisX = new QBarCategoriesAxis;
+                QBarCategoriesAxis* axisX = new QBarCategoriesAxis();
-                QBarCategoriesAxis* axisY = new QBarCategoriesAxis;
+                QBarCategoriesAxis* axisY = new QBarCategoriesAxis();
                 // Customize axis label font
                 QFont labelsFont;
             //![4]
                 axisX->append("low");
                 axisX->append("optimal");
                 axisX->append("high");
                 axisX->setRange("low","high");
                 axisY->append("slow");
-                axisY->append("medium");
+                axisY->append("med");
                 axisY->append("fast");
                 axisY->setRange("slow","fast");
-            //    axisY->setTicksCount(4);
                 chart->setAxisX(axisX, series);
                 chart->setAxisY(axisY, series);
             //![4]

src/axis/chartcategoriesaxisx.cpp +1 -3

             ****************************************************************************/
             #include "chartcategoriesaxisx_p.h"
-            #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
+            #include "qbarcategoriesaxis.h"
             #include <QGraphicsLayout>
-            #include <QDebug>
             #include <QFontMetrics>
-            #include <QBarCategoriesAxis>
             static int label_padding = 5;

src/axis/chartcategoriesaxisy.cpp +7 -7

             ****************************************************************************/
             #include "chartcategoriesaxisy_p.h"
-            #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
+            #include "qbarcategoriesaxis.h"
             #include <QGraphicsLayout>
-            #include <QDebug>
             #include <QFontMetrics>
             #include <QBarCategoriesAxis>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartCategoriesAxisY::ChartCategoriesAxisY(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter)
+            ChartCategoriesAxisY::ChartCategoriesAxisY(QBarCategoriesAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
+                m_categoriesAxis(axis)
             {
             }
                 Q_ASSERT(layout.size() == ticksList.size());
                 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));
-                lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
+                lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());
                 for (int i = 0; i < layout.size(); ++i) {
                     QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
                     const QRectF& rect = labelItem->boundingRect();
                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
-                    labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
+                    labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y());
                     m_minWidth+=rect.width();
                     m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
                     }else{
                     if ((i+1)%2 && i>1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
-                        rectItem->setRect(layout[i-1],m_rect.top(),layout[i]-layout[i-1],m_rect.height());
+                        rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);
                     }
                     lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
-                    lineItem->setLine(layout[i],m_rect.bottom(),layout[i],m_rect.bottom()+5);
+                    lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);
                 }
             }

src/axis/chartcategoriesaxisy_p.h +1 -1

             class ChartCategoriesAxisY : public ChartAxis
             {
             public:
-                ChartCategoriesAxisY(QAbstractAxis *axis, ChartPresenter *presenter);
+                ChartCategoriesAxisY(QBarCategoriesAxis *axis, ChartPresenter *presenter);
                 ~ChartCategoriesAxisY();
                 AxisType axisType() const { return Y_AXIS;}

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