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

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

A couple of new bug fixes mentioned in README
A couple of new bug fixes mentioned in README
Michal Klocek - - Load All Authors

File last commit:

r1965:8d7d66e44a18
r2036:8864b0679ca7
Show More
chartaxis.cpp
487 lines | 13.3 KiB | text/x-c | CppLexer
/ src / axis / chartaxis.cpp
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add license headers
 r794 /****************************************************************************
**
** 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$
**
****************************************************************************/
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 #include "chartaxis_p.h"
Michal Klocek
Refactors QAxis to QAbstractAxis...
 r1541 #include "qabstractaxis.h"
#include "qabstractaxis_p.h"
Michal Klocek
Adds ZOrder enum to presenter
 r262 #include "chartpresenter_p.h"
Michal Klocek
Refactors Domain and Axis...
 r1698 #include "domain_p.h"
Michal Klocek
Refactor QChart API...
 r1577 #include <qmath.h>
Marek Rosa
Added QDateTimeAxis
 r1717 #include <QDateTime>
Marek Rosa
QValueAxis: added posibility to specify label format
 r1854 #include <QValueAxis>
Michal Klocek
Adds checkLayout call, when geometry of axis updated
 r1890 #include <QGraphicsLayout>
Michal Klocek
Refactors layout...
 r1965 #include <QFontMetrics>
Michal Klocek
Add zoom support...
 r67
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek
Refactors Chart to ChartElement
 r1736 ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter) : ChartElement(presenter),
sauimone
more minor code review fixes
 r745 m_chartAxis(axis),
m_labelsAngle(0),
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 m_grid(new QGraphicsItemGroup(presenter->rootItem())),
m_shades(new QGraphicsItemGroup(presenter->rootItem())),
m_labels(new QGraphicsItemGroup(presenter->rootItem())),
Michal Klocek
Refactor Visibly methods of axis...
 r1729 m_arrow(new QGraphicsItemGroup(presenter->rootItem())),
Michal Klocek
Refactors layout...
 r1965 m_title(new QGraphicsSimpleTextItem(presenter->rootItem())),
sauimone
more minor code review fixes
 r745 m_min(0),
m_max(0),
Michal Klocek
Refactors layout...
 r1965 m_animation(0)
Michal Klocek
Add zoom support...
 r67 {
Michal Klocek
Fix previous broken commit
 r145 //initial initialization
Michal Klocek
Refactor Visibly methods of axis...
 r1729 m_arrow->setZValue(ChartPresenter::AxisZValue);
m_arrow->setHandlesChildEvents(false);
Michal Klocek
Add missing zvalue setting in axis
 r1745 m_labels->setZValue(ChartPresenter::AxisZValue);
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 m_shades->setZValue(ChartPresenter::ShadesZValue);
m_grid->setZValue(ChartPresenter::GridZValue);
Michal Klocek
Refactor domain model...
 r439
Michal Klocek
Adds pimpl for qchartaxis and qchartaxiscategories
 r963 QObject::connect(m_chartAxis->d_ptr.data(),SIGNAL(updated()),this,SLOT(handleAxisUpdated()));
Michal Klocek
Axis refactoring to support better barcharts
 r502
Michal Klocek
Refactors layout managment...
 r1534 QGraphicsSimpleTextItem item;
m_font = item.font();
Michal Klocek
Bugfixes for layout...
 r1837
Michal Klocek
Add zoom support...
 r67 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 ChartAxis::~ChartAxis()
Michal Klocek
Add zoom support...
 r67 {
}
Michal Klocek
Refactors axis animation, line animations
 r1241 void ChartAxis::setAnimation(AxisAnimation* animation)
Michal Klocek
Adds more axis handling...
 r176 {
Michal Klocek
Refactors axis animation, line animations
 r1241 m_animation=animation;
}
Michal Klocek
Animation refactor...
 r530
Michal Klocek
Refactors axis animation, line animations
 r1241 void ChartAxis::setLayout(QVector<qreal> &layout)
{
m_layoutVector=layout;
}
void ChartAxis::createItems(int count)
{
Michal Klocek
Refactor Visibly methods of axis...
 r1729 if (m_arrow->children().size() == 0)
Michal Klocek
Serious bugfix of wrong parenting of axis grid, shades, and arrow
 r1744 m_arrow->addToGroup(new AxisItem(this,presenter()->rootItem()));
Michal Klocek
Refactors axis handling...
 r223 for (int i = 0; i < count; ++i) {
Michal Klocek
Serious bugfix of wrong parenting of axis grid, shades, and arrow
 r1744 m_grid->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
m_labels->addToGroup(new QGraphicsSimpleTextItem(presenter()->rootItem()));
m_arrow->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
if ((m_grid->childItems().size())%2 && m_grid->childItems().size()>2) m_shades->addToGroup(new QGraphicsRectItem(presenter()->rootItem()));
Michal Klocek
Refactors axis animation, line animations
 r1241 }
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::deleteItems(int count)
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 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();
Michal Klocek
Adds more axis handling...
 r176
Michal Klocek
Refactors axis layout managment...
 r291 for (int i = 0; i < count; ++i) {
sauimone
more minor code review fixes
 r745 if (lines.size()%2 && lines.size() > 1) delete(shades.takeLast());
Michal Klocek
Refactors axis layout managment...
 r291 delete(lines.takeLast());
delete(labels.takeLast());
delete(axis.takeLast());
Michal Klocek
Fix zorder of axis, and ticks
 r272 }
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::updateLayout(QVector<qreal> &layout)
Michal Klocek
Adds more axis handling...
 r176 {
Michal Klocek
Refactors axis animation, line animations
 r1241 int diff = m_layoutVector.size() - layout.size();
if (diff>0) {
deleteItems(diff);
}
else if (diff<0) {
createItems(-diff);
}
Michal Klocek
Refactors Domain and Axis...
 r1698 if(diff<0) handleAxisUpdated();
Michal Klocek
Refactors axis animation, line animations
 r1241
if (m_animation) {
switch(presenter()->state()){
case ChartPresenter::ZoomInState:
m_animation->setAnimationType(AxisAnimation::ZoomInAnimation);
m_animation->setAnimationPoint(presenter()->statePoint());
break;
case ChartPresenter::ZoomOutState:
m_animation->setAnimationType(AxisAnimation::ZoomOutAnimation);
m_animation->setAnimationPoint(presenter()->statePoint());
break;
case ChartPresenter::ScrollUpState:
case ChartPresenter::ScrollLeftState:
m_animation->setAnimationType(AxisAnimation::MoveBackwordAnimation);
break;
case ChartPresenter::ScrollDownState:
case ChartPresenter::ScrollRightState:
m_animation->setAnimationType(AxisAnimation::MoveForwardAnimation);
break;
case ChartPresenter::ShowState:
m_animation->setAnimationType(AxisAnimation::DefaultAnimation);
break;
}
m_animation->setValues(m_layoutVector,layout);
presenter()->startAnimation(m_animation);
}
else {
sauimone
more minor code review fixes
 r745 setLayout(layout);
Michal Klocek
Refactors axis animation, line animations
 r1241 updateGeometry();
Michal Klocek
Animation refactor...
 r530 }
Michal Klocek
Refactora axis and line chart to use graphics items insted of painter.
 r85 }
Michal Klocek
Adds more axis handling...
 r176
Michal Klocek
Refactor Visibly methods of axis...
 r1729 void ChartAxis::setArrowOpacity(qreal opacity)
Michal Klocek
Fixes wrong shades zvalues
 r184 {
Michal Klocek
Refactor Visibly methods of axis...
 r1729 m_arrow->setOpacity(opacity);
Michal Klocek
Fixes wrong shades zvalues
 r184 }
Michal Klocek
Refactor Visibly methods of axis...
 r1729 qreal ChartAxis::arrowOpacity() const
Michal Klocek
Fixes wrong shades zvalues
 r184 {
Michal Klocek
Refactor Visibly methods of axis...
 r1729 return m_arrow->opacity();
}
void ChartAxis::setArrowVisibility(bool visible)
{
m_arrow->setOpacity(visible);
Michal Klocek
Fixes wrong shades zvalues
 r184 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setGridOpacity(qreal opacity)
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 m_grid->setOpacity(opacity);
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Refactora axis and line chart to use graphics items insted of painter.
 r85
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 qreal ChartAxis::gridOpacity() const
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 return m_grid->opacity();
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Refactora axis and line chart to use graphics items insted of painter.
 r85
Michal Klocek
Refactor Visibly methods of axis...
 r1729 void ChartAxis::setGridVisibility(bool visible)
{
m_grid->setOpacity(visible);
}
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setLabelsOpacity(qreal opacity)
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 m_labels->setOpacity(opacity);
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Refactora axis and line chart to use graphics items insted of painter.
 r85
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 qreal ChartAxis::labelsOpacity() const
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 return m_labels->opacity();
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Refactora axis and line chart to use graphics items insted of painter.
 r85
Michal Klocek
Refactor Visibly methods of axis...
 r1729 void ChartAxis::setLabelsVisibility(bool visible)
{
m_labels->setOpacity(visible);
}
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setShadesOpacity(qreal opacity)
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 m_shades->setOpacity(opacity);
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Refactora axis and line chart to use graphics items insted of painter.
 r85
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 qreal ChartAxis::shadesOpacity() const
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 return m_shades->opacity();
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Add zoom support...
 r67
Michal Klocek
Refactor Visibly methods of axis...
 r1729 void ChartAxis::setShadesVisibility(bool visible)
{
m_shades->setVisible(visible);
}
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setLabelsAngle(int angle)
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 foreach(QGraphicsItem* item , m_labels->childItems()) {
Michal Klocek
Adds more axis handling...
 r176 item->setRotation(angle);
Michal Klocek
Fix previous broken commit
 r145 }
Michal Klocek
Adds more axis handling...
 r176
m_labelsAngle=angle;
Michal Klocek
Add zoom support...
 r67 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setLabelsPen(const QPen &pen)
Michal Klocek
Adds refactored axis to presenter
 r140 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 foreach(QGraphicsItem* item , m_labels->childItems()) {
Michal Klocek
Adds more axis handling...
 r176 static_cast<QGraphicsSimpleTextItem*>(item)->setPen(pen);
}
Michal Klocek
Adds refactored axis to presenter
 r140 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setLabelsBrush(const QBrush &brush)
Michal Klocek
Adds refactored axis to presenter
 r140 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 foreach(QGraphicsItem* item , m_labels->childItems()) {
Michal Klocek
Adds more axis handling...
 r176 static_cast<QGraphicsSimpleTextItem*>(item)->setBrush(brush);
}
Michal Klocek
Adds refactored axis to presenter
 r140 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setLabelsFont(const QFont &font)
Michal Klocek
Adds refactored axis to presenter
 r140 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 foreach(QGraphicsItem* item , m_labels->childItems()) {
Michal Klocek
Adds more axis handling...
 r176 static_cast<QGraphicsSimpleTextItem*>(item)->setFont(font);
}
Michal Klocek
Refactors layout...
 r1965 if(m_font!=font) {
m_font = font;
foreach(QGraphicsItem* item , m_labels->childItems()) {
static_cast<QGraphicsSimpleTextItem*>(item)->setFont(font);
}
QGraphicsLayoutItem::updateGeometry();
presenter()->layout()->invalidate();
}
Michal Klocek
Adds refactored axis to presenter
 r140 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setShadesBrush(const QBrush &brush)
Michal Klocek
Adds refactored axis to presenter
 r140 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 foreach(QGraphicsItem* item , m_shades->childItems()) {
Michal Klocek
Adds more axis handling...
 r176 static_cast<QGraphicsRectItem*>(item)->setBrush(brush);
}
Michal Klocek
Adds refactored axis to presenter
 r140 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setShadesPen(const QPen &pen)
Michal Klocek
Adds refactored axis to presenter
 r140 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 foreach(QGraphicsItem* item , m_shades->childItems()) {
Michal Klocek
Adds more axis handling...
 r176 static_cast<QGraphicsRectItem*>(item)->setPen(pen);
}
}
Michal Klocek
Refactor Visibly methods of axis...
 r1729 void ChartAxis::setArrowPen(const QPen &pen)
Michal Klocek
Fixes wrong shades zvalues
 r184 {
Michal Klocek
Refactor Visibly methods of axis...
 r1729 foreach(QGraphicsItem* item , m_arrow->childItems()) {
Michal Klocek
Fix zorder of axis, and ticks
 r272 static_cast<QGraphicsLineItem*>(item)->setPen(pen);
}
Michal Klocek
Fixes wrong shades zvalues
 r184 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::setGridPen(const QPen &pen)
Michal Klocek
Adds more axis handling...
 r176 {
Jani Honkonen
make QGraphicsItemGroup a pointer in axis
 r784 foreach(QGraphicsItem* item , m_grid->childItems()) {
Michal Klocek
Adds more axis handling...
 r176 static_cast<QGraphicsLineItem*>(item)->setPen(pen);
}
}
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 bool ChartAxis::isEmpty()
Michal Klocek
Axis refactoring to support better barcharts
 r502 {
Michal Klocek
Refactors layout...
 r1965 return !m_rect.isValid() || presenter()->chartsGeometry().isEmpty() || qFuzzyIsNull(m_min - m_max);
Michal Klocek
Refactors axis layout managment...
 r291 }
Michal Klocek
Adds refactored axis to presenter
 r140
Michal Klocek
Refactors Domain and Axis...
 r1698 void ChartAxis::handleDomainUpdated()
Michal Klocek
Adds draft of axis bar label support
 r497 {
Michal Klocek
Refactors Domain and Axis...
 r1698 Domain* domain = qobject_cast<Domain*>(sender());
qreal min(0);
qreal max(0);
if(m_chartAxis->orientation()==Qt::Horizontal) {
min = domain->minX();
max = domain->maxX();
}
else if (m_chartAxis->orientation()==Qt::Vertical)
{
min = domain->minY();
max = domain->maxY();
}
if (!qFuzzyIsNull(m_min - min) || !qFuzzyIsNull(m_max - max))
{
m_min = min;
m_max = max;
if (!isEmpty()) {
Michal Klocek
Refactors layout...
 r1965
Michal Klocek
Refactors Domain and Axis...
 r1698 QVector<qreal> layout = calculateLayout();
updateLayout(layout);
Michal Klocek
Refactors layout...
 r1965 QSizeF before = effectiveSizeHint(Qt::MinimumSize);
QSizeF after= sizeHint(Qt::MinimumSize);
if(before!=after) {
QGraphicsLayoutItem::updateGeometry();
//we don't want to call invalidate on layout, since it will change minimum size of component,
//which we would like to avoid since it causes nasty flips when scrolling or zooming,
//instead recalculate layout and use plotArea for extra space.
presenter()->layout()->setGeometry(presenter()->layout()->geometry());
}
Michal Klocek
Refactors Domain and Axis...
 r1698 }
}
Michal Klocek
Adds draft of axis bar label support
 r497 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::handleAxisUpdated()
Michal Klocek
Refactor domain model...
 r439 {
Michal Klocek
Refactors Domain and Axis...
 r1698 if(isEmpty()) return;
Michal Klocek
Refactor domain model...
 r439
Michal Klocek
Adds visibity paramter to axis
 r1617
Michal Klocek
Refactor Visibly methods of axis...
 r1729 bool visible = m_chartAxis->isVisible();
Michal Klocek
Adds visibity paramter to axis
 r1617
Marek Rosa
QAbstractAxis: renamed Arrow and Axis to line in methods names
 r1844 setArrowVisibility(visible && m_chartAxis->isLineVisible());
Michal Klocek
Refactor Visibly methods of axis...
 r1729 setGridVisibility(visible && m_chartAxis->isGridLineVisible());
setLabelsVisibility(visible && m_chartAxis->labelsVisible());
setShadesVisibility(visible && m_chartAxis->shadesVisible());
Michal Klocek
Refactor domain model...
 r439 setLabelsAngle(m_chartAxis->labelsAngle());
Marek Rosa
QAbstractAxis: renamed Arrow and Axis to line in methods names
 r1844 setArrowPen(m_chartAxis->linePen());
Michal Klocek
Refactor domain model...
 r439 setLabelsPen(m_chartAxis->labelsPen());
setLabelsBrush(m_chartAxis->labelsBrush());
setLabelsFont(m_chartAxis->labelsFont());
Michal Klocek
Renames Grid to GridLine
 r535 setGridPen(m_chartAxis->gridLinePen());
Michal Klocek
Refactor domain model...
 r439 setShadesPen(m_chartAxis->shadesPen());
setShadesBrush(m_chartAxis->shadesBrush());
Michal Klocek
Refactors layout...
 r1965 setTitleText(m_chartAxis->title());
}
Michal Klocek
Refacotr axisitem to handle ticks changes
 r452
Michal Klocek
Refactors layout...
 r1965 void ChartAxis::setTitleText(const QString& title)
{
if(m_titleText!=title) {
m_titleText = title;
m_rect = QRect();
QGraphicsLayoutItem::updateGeometry();
presenter()->layout()->invalidate();
}
Michal Klocek
Refactor domain model...
 r439 }
Michal Klocek
Refactor Visibly methods of axis...
 r1729 void ChartAxis::hide()
{
setArrowVisibility(false);
setGridVisibility(false);
setLabelsVisibility(false);
setShadesVisibility(false);
}
Michal Klocek
Refactors layout...
 r1965 void ChartAxis::setGeometry(const QRectF &rect)
Michal Klocek
Refactor domain model...
 r439 {
Michal Klocek
Refactors layout...
 r1965
Michal Klocek
Refactor qledgend handling...
 r855 m_rect = rect;
Michal Klocek
Refactors layout...
 r1965
Michal Klocek
Refactor qledgend handling...
 r855 if (isEmpty()) return;
Michal Klocek
Refactors layout...
 r1965
if(!m_titleText.isNull()) {
QFontMetrics fn(m_title->font());
int size(0);
QRectF chartRect = presenter()->chartsGeometry();
if(orientation()==Qt::Horizontal)
size = chartRect.width();
else if(orientation()==Qt::Vertical)
size = chartRect.height();
if (fn.boundingRect(m_titleText).width() > size)
{
QString string = m_titleText + "...";
while (fn.boundingRect(string).width() > size && string.length() > 3)
string.remove(string.length() - 4, 1);
m_title->setText(string);
}
else
m_title->setText(m_titleText);
QPointF center = chartRect.center() - m_title->boundingRect().center();
if(orientation()==Qt::Horizontal) {
m_title->setPos(center.x(),m_rect.bottom()-m_title->boundingRect().height());
}
else if(orientation()==Qt::Vertical) {
m_title->setTransformOriginPoint(m_title->boundingRect().center());
m_title->setRotation(270);
m_title->setPos(m_rect.left()- m_title->boundingRect().width()/2+m_title->boundingRect().height()/2,center.y());
}
}
Michal Klocek
Refactor qledgend handling...
 r855 QVector<qreal> layout = calculateLayout();
updateLayout(layout);
Michal Klocek
Refactors layout managment...
 r1534
}
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 void ChartAxis::axisSelected()
Michal Klocek
Refacotr axisitem to handle ticks changes
 r452 {
Michal Klocek
Refactors layout...
 r1965 //TODO: axis clicked;
Michal Klocek
Refactor domain model...
 r439 }
Michal Klocek
Refactor QChart API...
 r1577
Michal Klocek
Refactors layout...
 r1965 QStringList ChartAxis::createNumberLabels(qreal min, qreal max, int ticks) const
Michal Klocek
Refactor QChart API...
 r1577 {
Q_ASSERT(max>min);
Q_ASSERT(ticks>1);
Michal Klocek
Refactors layout...
 r1965 QStringList labels;
Michal Klocek
Fixes rounding issue with labels numbering
 r1720 int n = qMax(int(-qFloor(log10((max-min)/(ticks-1)))),0);
Michal Klocek
Refactor QChart API...
 r1577 n++;
Marek Rosa
QValueAxis: added posibility to specify label format
 r1854
QValueAxis *axis = qobject_cast<QValueAxis *>(m_chartAxis);
Michal Klocek
Fix formating, do not show shit if no format set
 r1889
QString format = axis->labelFormat();
if(format.isNull()) {
for (int i=0; i< ticks; i++) {
qreal value = min + (i * (max - min)/ (ticks-1));
labels << QString::number(value,'f',n);
}
}
else {
QByteArray array = format.toAscii();
for (int i=0; i< ticks; i++) {
qreal value = min + (i * (max - min)/ (ticks-1));
labels << QString().sprintf(array, value);
}
Michal Klocek
Refactor QChart API...
 r1577 }
Michal Klocek
Refactors layout...
 r1965
return labels;
Michal Klocek
Refactor QChart API...
 r1577 }
Michal Klocek
Refactors layout...
 r1965 Qt::Orientation ChartAxis::orientation() const
Michal Klocek
Adds checkLayout call, when geometry of axis updated
 r1890 {
Michal Klocek
Refactors layout...
 r1965 return m_chartAxis->orientation();
}
Michal Klocek
Adds checkLayout call, when geometry of axis updated
 r1890
Michal Klocek
Refactors layout...
 r1965 bool ChartAxis::isVisible()
{
return m_chartAxis->isVisible();
}
QSizeF ChartAxis::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const
{
Q_UNUSED(constraint);
QFontMetrics fn(m_title->font());
QSizeF sh;
if(m_titleText.isNull()) return sh;
switch(which) {
case Qt::MinimumSize:
if(orientation()==Qt::Horizontal) {
sh = QSizeF(fn.boundingRect ("...").width(),fn.height());
}
else if(orientation()==Qt::Vertical) {
sh = QSizeF(fn.height(),fn.boundingRect ("...").width());
}
break;
case Qt::MaximumSize:
case Qt::PreferredSize:
if(orientation()==Qt::Horizontal) {
sh = QSizeF(fn.boundingRect(m_chartAxis->title()).width(),fn.height());
}
else if(orientation()==Qt::Vertical) {
sh = QSizeF(fn.height(),fn.boundingRect(m_chartAxis->title()).width());
}
break;
default:
break;
Michal Klocek
Adds checkLayout call, when geometry of axis updated
 r1890 }
Michal Klocek
Refactors layout...
 r1965
return sh;
Michal Klocek
Adds checkLayout call, when geometry of axis updated
 r1890 }
Michal Klocek
Changes QChartAxis -> QAxis
 r1006 #include "moc_chartaxis_p.cpp"
Michal Klocek
Add zoom support...
 r67
QTCOMMERCIALCHART_END_NAMESPACE