##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fixes customchart, barcategoryaxisy
Michal Klocek -
r1655:f1c3fb22a206
parent child
Show More
Side by Side Unified
Context file:
r1655:f1c3fb22a206 Loading diff...:
Show file before | Show file after | Hide comments
@@ -63,8 +63,8 int main(int argc, char *argv[])
63 63 //![2]
64 64
65 65 //![3]
66 QBarCategoriesAxis* axisX = new QBarCategoriesAxis;
67 QBarCategoriesAxis* axisY = new QBarCategoriesAxis;
66 QBarCategoriesAxis* axisX = new QBarCategoriesAxis();
67 QBarCategoriesAxis* axisY = new QBarCategoriesAxis();
68 68
69 69 // Customize axis label font
70 70 QFont labelsFont;
@@ -95,13 +95,13 int main(int argc, char *argv[])
95 95 axisX->append("low");
96 96 axisX->append("optimal");
97 97 axisX->append("high");
98
99 98 axisX->setRange("low","high");
99
100 100 axisY->append("slow");
101 axisY->append("medium");
101 axisY->append("med");
102 102 axisY->append("fast");
103 103 axisY->setRange("slow","fast");
104 // axisY->setTicksCount(4);
104
105 105 chart->setAxisX(axisX, series);
106 106 chart->setAxisY(axisY, series);
107 107 //![4]
Show file before | Show file after | Hide comments
@@ -19,13 +19,11
19 19 ****************************************************************************/
20 20
21 21 #include "chartcategoriesaxisx_p.h"
22 #include "qabstractaxis.h"
23 22 #include "chartpresenter_p.h"
24 23 #include "chartanimator_p.h"
24 #include "qbarcategoriesaxis.h"
25 25 #include <QGraphicsLayout>
26 #include <QDebug>
27 26 #include <QFontMetrics>
28 #include <QBarCategoriesAxis>
29 27
30 28 static int label_padding = 5;
31 29
Show file before | Show file after | Hide comments
@@ -19,11 +19,10
19 19 ****************************************************************************/
20 20
21 21 #include "chartcategoriesaxisy_p.h"
22 #include "qabstractaxis.h"
23 22 #include "chartpresenter_p.h"
24 23 #include "chartanimator_p.h"
24 #include "qbarcategoriesaxis.h"
25 25 #include <QGraphicsLayout>
26 #include <QDebug>
27 26 #include <QFontMetrics>
28 27 #include <QBarCategoriesAxis>
29 28
@@ -31,7 +30,8 static int label_padding = 5;
31 30
32 31 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33 32
34 ChartCategoriesAxisY::ChartCategoriesAxisY(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter)
33 ChartCategoriesAxisY::ChartCategoriesAxisY(QBarCategoriesAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
34 m_categoriesAxis(axis)
35 35 {
36 36 }
37 37
@@ -77,7 +77,7 void ChartCategoriesAxisY::updateGeometry()
77 77 Q_ASSERT(layout.size() == ticksList.size());
78 78
79 79 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));
80 lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
80 lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());
81 81
82 82 for (int i = 0; i < layout.size(); ++i) {
83 83 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
@@ -88,7 +88,7 void ChartCategoriesAxisY::updateGeometry()
88 88 const QRectF& rect = labelItem->boundingRect();
89 89 QPointF center = rect.center();
90 90 labelItem->setTransformOriginPoint(center.x(), center.y());
91 labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
91 labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y());
92 92 m_minWidth+=rect.width();
93 93 m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
94 94 }else{
@@ -98,10 +98,10 void ChartCategoriesAxisY::updateGeometry()
98 98
99 99 if ((i+1)%2 && i>1) {
100 100 QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
101 rectItem->setRect(layout[i-1],m_rect.top(),layout[i]-layout[i-1],m_rect.height());
101 rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);
102 102 }
103 103 lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
104 lineItem->setLine(layout[i],m_rect.bottom(),layout[i],m_rect.bottom()+5);
104 lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);
105 105 }
106 106 }
107 107
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 class ChartPresenter;
41 41 class ChartCategoriesAxisY : public ChartAxis
42 42 {
43 43 public:
44 ChartCategoriesAxisY(QAbstractAxis *axis, ChartPresenter *presenter);
44 ChartCategoriesAxisY(QBarCategoriesAxis *axis, ChartPresenter *presenter);
45 45 ~ChartCategoriesAxisY();
46 46
47 47 AxisType axisType() const { return Y_AXIS;}
General Comments 0
You need to be logged in to leave comments. Login now