@@ -20,10 +20,8 | |||
|
20 | 20 | |
|
21 | 21 | #include "chartcategoriesaxisx_p.h" |
|
22 | 22 | #include "chartpresenter_p.h" |
|
23 |
#include " |
|
|
24 | #include "qbarcategoriesaxis.h" | |
|
25 | #include <QGraphicsLayout> | |
|
26 | #include <QFontMetrics> | |
|
23 | #include "qbarcategoriesaxis_p.h" | |
|
24 | #include <cmath> | |
|
27 | 25 | |
|
28 | 26 | static int label_padding = 5; |
|
29 | 27 | |
@@ -46,12 +44,24 QVector<qreal> ChartCategoriesAxisX::calculateLayout() const | |||
|
46 | 44 | QVector<qreal> points; |
|
47 | 45 | points.resize(m_categoriesAxis->categories().count()+1); |
|
48 | 46 | |
|
49 | // TODO: shift logic | |
|
50 |
const qreal |
|
|
51 | for (int i = 0; i < m_categoriesAxis->categories().count()+1; ++i) { | |
|
52 | int x = i * deltaX + m_rect.left(); | |
|
47 | const qreal delta = m_rect.width()/(m_categoriesAxis->categories().count()); | |
|
48 | const qreal min = m_categoriesAxis->d_ptr->min(); | |
|
49 | const qreal max = m_categoriesAxis->d_ptr->max(); | |
|
50 | qreal start =-min-0.5; | |
|
51 | if(start<=0) { | |
|
52 | start = fmod(start * m_rect.width()/(max - min),delta) + delta; | |
|
53 | } | |
|
54 | else { | |
|
55 | start = fmod(start * m_rect.width()/(max - min),delta); | |
|
56 | } | |
|
57 | ||
|
58 | points[m_categoriesAxis->categories().count()] = m_rect.left() + m_rect.width(); | |
|
59 | ||
|
60 | for (int i = 0; i < m_categoriesAxis->categories().count(); ++i) { | |
|
61 | qreal x = start + i * delta + m_rect.left(); | |
|
53 | 62 | points[i] = x; |
|
54 | 63 | } |
|
64 | ||
|
55 | 65 | return points; |
|
56 | 66 | } |
|
57 | 67 | |
@@ -73,27 +83,40 void ChartCategoriesAxisX::updateGeometry() | |||
|
73 | 83 | QList<QGraphicsItem *> shades = m_shades->childItems(); |
|
74 | 84 | QList<QGraphicsItem *> axis = m_axis->childItems(); |
|
75 | 85 | |
|
76 |
Q_ASSERT(labels.size() |
|
|
77 |
Q_ASSERT(layout.size() |
|
|
86 | Q_ASSERT(labels.size() == ticksList.size()); | |
|
87 | Q_ASSERT(layout.size() == ticksList.size()); | |
|
88 | ||
|
89 | const qreal delta = m_rect.width()/(m_categoriesAxis->categories().count()); | |
|
78 | 90 | |
|
79 | 91 | QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0)); |
|
80 | 92 | lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom()); |
|
81 | 93 | |
|
94 | qreal width = m_rect.left(); | |
|
82 | 95 | for (int i = 0; i < layout.size(); ++i) { |
|
83 | 96 | QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i)); |
|
84 | 97 | lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom()); |
|
85 | 98 | QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i)); |
|
86 | if (i>=1) { | |
|
87 | labelItem->setText(ticksList.at(i-1)); | |
|
99 | labelItem->setText(ticksList.at(i)); | |
|
88 | 100 | const QRectF& rect = labelItem->boundingRect(); |
|
89 | 101 | QPointF center = rect.center(); |
|
90 | 102 | labelItem->setTransformOriginPoint(center.x(), center.y()); |
|
91 | labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding); | |
|
92 | m_minWidth+=rect.width(); | |
|
93 | m_minHeight=qMax(rect.height()+label_padding,m_minHeight); | |
|
103 | ||
|
104 | if(i==layout.size()-1){ | |
|
105 | labelItem->setPos(layout[i-1] + (delta)/2 - center.x(), m_rect.bottom() + label_padding); | |
|
94 | 106 | }else{ |
|
107 | labelItem->setPos(layout[i] - (delta)/2 - center.x(), m_rect.bottom() + label_padding); | |
|
108 | } | |
|
109 | ||
|
110 | if(labelItem->pos().x()<=width || labelItem->pos().x()+ rect.width()>m_rect.right()) { | |
|
95 | 111 | labelItem->setVisible(false); |
|
96 | 112 | } |
|
113 | else { | |
|
114 | labelItem->setVisible(true); | |
|
115 | width=rect.width()+labelItem->pos().x(); | |
|
116 | } | |
|
117 | ||
|
118 | m_minWidth+=rect.width(); | |
|
119 | m_minHeight=qMax(rect.height()+label_padding,m_minHeight); | |
|
97 | 120 | |
|
98 | 121 | if ((i+1)%2 && i>1) { |
|
99 | 122 | QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1)); |
@@ -20,11 +20,9 | |||
|
20 | 20 | |
|
21 | 21 | #include "chartcategoriesaxisy_p.h" |
|
22 | 22 | #include "chartpresenter_p.h" |
|
23 |
#include " |
|
|
24 | #include "qbarcategoriesaxis.h" | |
|
25 |
#include < |
|
|
26 | #include <QFontMetrics> | |
|
27 | #include <QBarCategoriesAxis> | |
|
23 | #include "qbarcategoriesaxis_p.h" | |
|
24 | #include <QDebug> | |
|
25 | #include <cmath> | |
|
28 | 26 | |
|
29 | 27 | static int label_padding = 5; |
|
30 | 28 | |
@@ -46,9 +44,24 QVector<qreal> ChartCategoriesAxisY::calculateLayout() const | |||
|
46 | 44 | QVector<qreal> points; |
|
47 | 45 | points.resize(m_categoriesAxis->categories().count()+1); |
|
48 | 46 | |
|
49 |
|
|
|
50 | for (int i = 0; i < m_categoriesAxis->categories().count()+1; ++i) { | |
|
51 | int y = i * -deltaY + m_rect.bottom(); | |
|
47 | qreal delta = m_rect.height()/(m_categoriesAxis->categories().count()); | |
|
48 | ||
|
49 | const qreal min = m_categoriesAxis->d_ptr->min(); | |
|
50 | const qreal max = m_categoriesAxis->d_ptr->max(); | |
|
51 | ||
|
52 | qreal start =-min-0.5; | |
|
53 | ||
|
54 | if(start<=0) { | |
|
55 | start = fmod(start * m_rect.height()/(max - min),delta) + delta; | |
|
56 | } | |
|
57 | else { | |
|
58 | start = fmod(start * m_rect.height()/(max - min),delta); | |
|
59 | } | |
|
60 | ||
|
61 | points[m_categoriesAxis->categories().count()] = m_rect.top(); | |
|
62 | ||
|
63 | for (int i = 0; i < m_categoriesAxis->categories().count(); ++i) { | |
|
64 | int y = m_rect.bottom() - i * delta - start; | |
|
52 | 65 | points[i] = y; |
|
53 | 66 | } |
|
54 | 67 | |
@@ -73,28 +86,41 void ChartCategoriesAxisY::updateGeometry() | |||
|
73 | 86 | QList<QGraphicsItem *> shades = m_shades->childItems(); |
|
74 | 87 | QList<QGraphicsItem *> axis = m_axis->childItems(); |
|
75 | 88 | |
|
76 |
Q_ASSERT(labels.size() |
|
|
77 |
Q_ASSERT(layout.size() |
|
|
89 | Q_ASSERT(labels.size() == ticksList.size()); | |
|
90 | Q_ASSERT(layout.size() == ticksList.size()); | |
|
91 | ||
|
92 | const qreal delta = m_rect.height()/(m_categoriesAxis->categories().count()); | |
|
78 | 93 | |
|
79 | 94 | QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0)); |
|
80 | 95 | lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom()); |
|
81 | 96 | |
|
97 | qreal height = m_rect.bottom(); | |
|
82 | 98 | for (int i = 0; i < layout.size(); ++i) { |
|
83 | 99 | QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i)); |
|
84 | 100 | lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]); |
|
85 | 101 | QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i)); |
|
86 | if(i>=1){ | |
|
87 | labelItem->setText(ticksList.at(i-1)); | |
|
102 | labelItem->setText(ticksList.at(i)); | |
|
88 | 103 | const QRectF& rect = labelItem->boundingRect(); |
|
89 | 104 | QPointF center = rect.center(); |
|
90 | 105 | labelItem->setTransformOriginPoint(center.x(), center.y()); |
|
91 | labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y()); | |
|
92 | m_minWidth+=rect.width(); | |
|
93 | m_minHeight=qMax(rect.height()+label_padding,m_minHeight); | |
|
94 |
} |
|
|
106 | ||
|
107 | if(i==layout.size()-1) { | |
|
108 | labelItem->setPos(m_rect.left() - rect.width() - label_padding ,layout[i-1] - (delta)/2 - center.y()); | |
|
109 | } | |
|
110 | else { | |
|
111 | labelItem->setPos(m_rect.left() - rect.width() - label_padding ,layout[i] + (delta)/2 - center.y()); | |
|
112 | } | |
|
113 | ||
|
114 | if(labelItem->pos().y()+rect.height()>= height || labelItem->pos().y() < m_rect.top()) { | |
|
95 | 115 |
|
|
96 | 116 | } |
|
117 | else { | |
|
118 | labelItem->setVisible(true); | |
|
119 | height=labelItem->pos().y(); | |
|
120 | } | |
|
97 | 121 | |
|
122 | m_minWidth+=rect.width(); | |
|
123 | m_minHeight=qMax(rect.height()+label_padding,m_minHeight); | |
|
98 | 124 | |
|
99 | 125 | if ((i+1)%2 && i>1) { |
|
100 | 126 | QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1)); |
@@ -105,7 +131,6 void ChartCategoriesAxisY::updateGeometry() | |||
|
105 | 131 | } |
|
106 | 132 | } |
|
107 | 133 | |
|
108 | ||
|
109 | 134 | void ChartCategoriesAxisY::handleAxisUpdated() |
|
110 | 135 | { |
|
111 | 136 |
@@ -311,7 +311,9 QAbstractAxis::AxisType QBarCategoriesAxis::type() const | |||
|
311 | 311 | ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |
|
312 | 312 | |
|
313 | 313 | QBarCategoriesAxisPrivate::QBarCategoriesAxisPrivate(QBarCategoriesAxis* q): |
|
314 | QAbstractAxisPrivate(q) | |
|
314 | QAbstractAxisPrivate(q), | |
|
315 | m_min(0.0), | |
|
316 | m_max(0.0) | |
|
315 | 317 | { |
|
316 | 318 | |
|
317 | 319 | } |
@@ -342,17 +344,27 void QBarCategoriesAxisPrivate::setRange(const QVariant &min, const QVariant &ma | |||
|
342 | 344 | qreal QBarCategoriesAxisPrivate::min() |
|
343 | 345 | { |
|
344 | 346 | //TODO:: cache it |
|
345 |
return |
|
|
347 | return m_min;//m_categories.indexOf(m_minCategory) - 0.5; | |
|
346 | 348 | } |
|
347 | 349 | |
|
348 | 350 | qreal QBarCategoriesAxisPrivate::max() |
|
349 | 351 | { |
|
350 | 352 | //TODO:: cache it |
|
351 |
return |
|
|
353 | return m_max;//m_categories.indexOf(m_maxCategory) + 0.5; | |
|
352 | 354 | } |
|
353 | 355 | |
|
354 | 356 | void QBarCategoriesAxisPrivate::handleDomainUpdated() |
|
355 | 357 | { |
|
358 | Domain* domain = qobject_cast<Domain*>(sender()); | |
|
359 | ||
|
360 | if(m_orientation==Qt::Horizontal){ | |
|
361 | m_min = domain->minX(); | |
|
362 | m_max = domain->maxX(); | |
|
363 | }else if(m_orientation==Qt::Vertical){ | |
|
364 | m_min = domain->minY(); | |
|
365 | m_max = domain->maxY(); | |
|
366 | } | |
|
367 | ||
|
356 | 368 | // Q_Q(QBarCategoriesAxis); |
|
357 | 369 | |
|
358 | 370 | // TODO: causes crash in some situations. added to known issues |
@@ -62,6 +62,8 private: | |||
|
62 | 62 | QStringList m_categories; |
|
63 | 63 | QString m_minCategory; |
|
64 | 64 | QString m_maxCategory; |
|
65 | qreal m_min; | |
|
66 | qreal m_max; | |
|
65 | 67 | |
|
66 | 68 | private: |
|
67 | 69 | Q_DECLARE_PUBLIC(QBarCategoriesAxis) |
@@ -374,11 +374,11 void ChartAxis::createCategoryLabels(QStringList &labels,qreal min, qreal max,co | |||
|
374 | 374 | Q_ASSERT(max>min); |
|
375 | 375 | Q_UNUSED(max); |
|
376 | 376 | |
|
377 |
int x = q |
|
|
377 | int x = qFloor(min+0.5); | |
|
378 | 378 | int count = 0; |
|
379 | 379 | |
|
380 | 380 | // Try to find category for x coordinate |
|
381 | while (count < categories.count()) { | |
|
381 | while (count < categories.count()+1) { | |
|
382 | 382 | if ((x < categories.count()) && (x >= 0)) { |
|
383 | 383 | labels << categories.at(x); |
|
384 | 384 | } else { |
General Comments 0
You need to be logged in to leave comments.
Login now