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

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

QCategoryAxis: some commented out code removed
QCategoryAxis: some commented out code removed
Marek Rosa - - Load All Authors

File last commit:

r1975:34236310382e
r1975:34236310382e
Show More
chartcategoryaxisy.cpp
151 lines | 5.0 KiB | text/x-c | CppLexer
/ src / axis / categoryaxis / chartcategoryaxisy.cpp
History | Source | Raw |Copy content |Copy permalink
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 "chartcategoryaxisy_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 ChartCategoryAxisY::ChartCategoryAxisY(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter)
Marek Rosa
QIntervalsAxis working somewhat
 r1701 {
}
Marek Rosa
Renamed QCategoryAxis related files
 r1817 ChartCategoryAxisY::~ChartCategoryAxisY()
Marek Rosa
QIntervalsAxis working somewhat
 r1701 {
}
Marek Rosa
Renamed QCategoryAxis related files
 r1817 QVector<qreal> ChartCategoryAxisY::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.height() / range;
for (int i = 0; i < tickCount; ++i)
if (i < tickCount - 1) {
Marek Rosa
QCategoryAxis: renamed some functions according to review
 r1847 int y = -(axis->startValue(axis->categoriesLabels().at(i)) - axis->min()) * scale + m_rect.bottom();
Marek Rosa
Fixed range handling in categoryAxis
 r1846 points[i] = y;
} else {
Marek Rosa
QCategoryAxis: renamed some functions according to review
 r1847 int y = -(axis->endValue(axis->categoriesLabels().at(i - 1)) - axis->min()) * scale + m_rect.bottom();
Marek Rosa
Fixed range handling in categoryAxis
 r1846 points[i] = y;
}
}
Marek Rosa
QIntervalsAxis working somewhat
 r1701
return points;
}
Marek Rosa
Renamed QCategoryAxis related files
 r1817 void ChartCategoryAxisY::updateGeometry()
Marek Rosa
QIntervalsAxis working somewhat
 r1701 {
const QVector<qreal> &layout = ChartAxis::layout();
m_minWidth = 0;
m_minHeight = 0;
Michal Klocek
Bugfixes for layout...
 r1837 if(layout.isEmpty()) {
return;
}
Marek Rosa
QIntervalsAxis working somewhat
 r1701
Marek Rosa
QCategoryAxis: fix to grid lines drawing
 r1938 QCategoryAxis *categoryAxis = qobject_cast<QCategoryAxis *>(m_chartAxis);
QStringList ticksList = categoryAxis->categoriesLabels();
Marek Rosa
QIntervalsAxis working somewhat
 r1701
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
Marek Rosa
QCategoryAxis scrolling support added
 r1950 for (int i = 0; i < labels.count(); i++) {
labels.at(i)->setVisible(false);
}
Marek Rosa
QIntervalsAxis working somewhat
 r1701
Marek Rosa
QCategoryAxis: fix to grid lines drawing
 r1938 // axis base line
Marek Rosa
QIntervalsAxis working somewhat
 r1701 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));
lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), m_rect.bottom());
for (int i = 0; i < layout.size(); ++i) {
Marek Rosa
QCategoryAxis: fix to grid lines drawing
 r1938
// label items
Marek Rosa
QIntervalsAxis working somewhat
 r1701 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());
Marek Rosa
QCategoryAxis scrolling support added
 r1950 if (i < layout.size() - 1)
Marek Rosa
QIntervalsAxis working somewhat
 r1701 labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i] + (layout[i + 1] - layout[i]) / 2 - center.y());
else
labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i]-center.y());
Marek Rosa
QCategoryAxis scrolling support added
 r1950 // check if the label should be shown
if (labelItem->pos().y() + center.y() < m_rect.top() || labelItem->pos().y() + center.y() > m_rect.bottom())
Marek Rosa
QIntervalsAxis working somewhat
 r1701 labelItem->setVisible(false);
Marek Rosa
QCategoryAxis scrolling support added
 r1950 else
Marek Rosa
QIntervalsAxis working somewhat
 r1701 labelItem->setVisible(true);
Marek Rosa
QCategoryAxis scrolling support added
 r1950
Marek Rosa
QIntervalsAxis working somewhat
 r1701 m_minWidth=qMax(rect.width()+label_padding,m_minWidth);
m_minHeight+=rect.height();
if ((i+1)%2 && i>1) {
QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);
}
Marek Rosa
QCategoryAxis: fix to grid lines drawing
 r1938
// grid lines and axis line ticks
QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
lineItem->setPos(m_rect.left(), layout[i]);
lineItem->setLine(0, 0, m_rect.width(), 0);
Marek Rosa
QCategoryAxis scrolling support added
 r1950 QGraphicsLineItem *tickLineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
tickLineItem->setPos(m_rect.left(), layout[i]);
tickLineItem->setLine(-5, 0, 0, 0);
// check if the grid line and the axis tick should be shown
if (lineItem->pos().y() < m_rect.top() || lineItem->pos().y() > m_rect.bottom()) {
lineItem->setVisible(false);
tickLineItem->setVisible(false);
} else {
lineItem->setVisible(true);
tickLineItem->setVisible(true);
}
Marek Rosa
QIntervalsAxis working somewhat
 r1701 }
Michal Klocek
Adds checkLayout call, when geometry of axis updated
 r1890
Marek Rosa
QIntervalsAxis working somewhat
 r1701 }
Marek Rosa
Renamed QCategoryAxis related files
 r1817 void ChartCategoryAxisY::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