##// END OF EJS Templates
Small code comments fixes
Small code comments fixes

File last commit:

r1847:b4417f867c2c
r1880:a21a3c098ff7
Show More
chartcategoryaxisx.cpp
131 lines | 4.5 KiB | text/x-c | CppLexer
/ src / axis / categoryaxis / chartcategoryaxisx.cpp
Marek Rosa
QIntervalsAxis working somewhat
r1701 /****************************************************************************
**
** Copyright (C) 2012 Digia Plc
** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
** This file is part of the Qt Commercial Charts Add-on.
**
** $QT_BEGIN_LICENSE$
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.digia.com
** $QT_END_LICENSE$
**
****************************************************************************/
Marek Rosa
Renamed QCategoryAxis related files
r1817 #include "chartcategoryaxisx_p.h"
#include "qcategoryaxis.h"
Marek Rosa
QIntervalsAxis working somewhat
r1701 #include "qabstractaxis.h"
#include "chartpresenter_p.h"
#include <QGraphicsLayout>
#include <QFontMetrics>
Michal Klocek
Refactor animator...
r1735 #include <qmath.h>
Marek Rosa
QIntervalsAxis working somewhat
r1701
static int label_padding = 5;
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Marek Rosa
Renamed QCategoryAxis related files
r1817 ChartCategoryAxisX::ChartCategoryAxisX(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter)
Marek Rosa
QIntervalsAxis working somewhat
r1701 {
}
Marek Rosa
Renamed QCategoryAxis related files
r1817 ChartCategoryAxisX::~ChartCategoryAxisX()
Marek Rosa
QIntervalsAxis working somewhat
r1701 {
}
Marek Rosa
Renamed QCategoryAxis related files
r1817 QVector<qreal> ChartCategoryAxisX::calculateLayout() const
Marek Rosa
QIntervalsAxis working somewhat
r1701 {
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 QCategoryAxis *axis = qobject_cast<QCategoryAxis *>(m_chartAxis);
Marek Rosa
QCategoryAxis renamed some methods names according to review
r1829 int tickCount = axis->categoriesLabels().count() + 1;
Marek Rosa
QIntervalsAxis working somewhat
r1701 QVector<qreal> points;
Marek Rosa
Fixes and tests to Interval axis
r1708
if (tickCount < 2)
return points;
Marek Rosa
Fixed range handling in categoryAxis
r1846 qreal range = axis->max() - axis->min();
if (range > 0) {
points.resize(tickCount);
qreal scale = m_rect.width() / range;
for (int i = 0; i < tickCount; ++i)
if (i < tickCount - 1) {
Marek Rosa
QCategoryAxis: renamed some functions according to review
r1847 int x = (axis->startValue(axis->categoriesLabels().at(i)) - axis->min()) * scale + m_rect.left();
Marek Rosa
Fixed range handling in categoryAxis
r1846 points[i] = x;
} else {
Marek Rosa
QCategoryAxis: renamed some functions according to review
r1847 int x = (axis->endValue(axis->categoriesLabels().at(i - 1)) - axis->min()) * scale + m_rect.left();
Marek Rosa
Fixed range handling in categoryAxis
r1846 points[i] = x;
}
}
Marek Rosa
QIntervalsAxis working somewhat
r1701 return points;
}
Marek Rosa
Renamed QCategoryAxis related files
r1817 void ChartCategoryAxisX::updateGeometry()
Marek Rosa
QIntervalsAxis working somewhat
r1701 {
const QVector<qreal>& layout = ChartAxis::layout();
m_minWidth = 0;
m_minHeight = 0;
if(layout.isEmpty()) return;
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 QCategoryAxis *intervalAxis = qobject_cast<QCategoryAxis *>(m_chartAxis);
Marek Rosa
QIntervalsAxis working somewhat
r1701
Marek Rosa
QCategoryAxis renamed some methods names according to review
r1829 QStringList ticksList = intervalAxis->categoriesLabels();
Marek Rosa
QIntervalsAxis working somewhat
r1701
// createNumberLabels(ticksList,m_min,m_max,layout.size());
QList<QGraphicsItem *> lines = m_grid->childItems();
QList<QGraphicsItem *> labels = m_labels->childItems();
QList<QGraphicsItem *> shades = m_shades->childItems();
Michal Klocek
Refactor Visibly methods of axis...
r1729 QList<QGraphicsItem *> axis = m_arrow->childItems();
Marek Rosa
QIntervalsAxis working somewhat
r1701
// Q_ASSERT(labels.size() == ticksList.size());
// 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());
// qreal width = 0;
for (int i = 0; i < layout.size(); ++i) {
QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
if (i < ticksList.count()) {
labelItem->setText(ticksList.at(i));
}
const QRectF& rect = labelItem->boundingRect();
QPointF center = rect.center();
labelItem->setTransformOriginPoint(center.x(), center.y());
if (i < ticksList.count())
labelItem->setPos(layout[i] + (layout[i + 1] - layout[i]) / 2 - center.x(), m_rect.bottom() + label_padding);
else
labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);
if(labelItem->pos().x() > m_rect.width() + m_rect.left() - rect.width() / 2){
labelItem->setVisible(false);
lineItem->setVisible(false);
}
m_minWidth += rect.width();
Michal Klocek
Bugfixes for layout...
r1837 m_minHeight = qMax(rect.height()+ label_padding, m_minHeight);
Marek Rosa
QIntervalsAxis working somewhat
r1701
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());
}
lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
lineItem->setLine(layout[i],m_rect.bottom(),layout[i], m_rect.bottom() + 5);
}
}
Marek Rosa
Renamed QCategoryAxis related files
r1817 void ChartCategoryAxisX::handleAxisUpdated()
Marek Rosa
Added posibility to replace interval's label in QIntervalsAxis
r1777 {
updateGeometry();
ChartAxis::handleAxisUpdated();
}
Marek Rosa
QIntervalsAxis working somewhat
r1701 QTCOMMERCIALCHART_END_NAMESPACE