HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2118:7942a7e7245e

src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis,ChartPresenter *presenter) : HorizontalAxis(axis,presenter),
+            ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis,ChartPresenter *presenter) : HorizontalAxis(axis,presenter,true),
             m_categoriesAxis(axis)
             {
-                setLabelBetweenTicks(true);
             }
             ChartBarCategoryAxisX::~ChartBarCategoryAxisX()

src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +1 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartBarCategoryAxisY::ChartBarCategoryAxisY(QBarCategoryAxis *axis,ChartPresenter *presenter) : VerticalAxis(axis,presenter),
+            ChartBarCategoryAxisY::ChartBarCategoryAxisY(QBarCategoryAxis *axis,ChartPresenter *presenter) : VerticalAxis(axis,presenter,true),
             m_categoriesAxis(axis)
             {
-                setLabelBetweenTicks(true);
             }
             ChartBarCategoryAxisY::~ChartBarCategoryAxisY()

src/axis/categoryaxis/chartcategoryaxisx.cpp +1 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartCategoryAxisX::ChartCategoryAxisX(QCategoryAxis *axis,ChartPresenter *presenter) : HorizontalAxis(axis,presenter),
+            ChartCategoryAxisX::ChartCategoryAxisX(QCategoryAxis *axis,ChartPresenter *presenter) : HorizontalAxis(axis,presenter,true),
                 m_axis(axis)
             {
-                setLabelBetweenTicks(true);
             }
             ChartCategoryAxisX::~ChartCategoryAxisX()

src/axis/categoryaxis/chartcategoryaxisy.cpp +1 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartCategoryAxisY::ChartCategoryAxisY(QCategoryAxis *axis,ChartPresenter *presenter) : VerticalAxis(axis,presenter),
+            ChartCategoryAxisY::ChartCategoryAxisY(QCategoryAxis *axis,ChartPresenter *presenter) : VerticalAxis(axis,presenter,true),
                  m_axis(axis)
             {
-                setLabelBetweenTicks(true);
             }
             ChartCategoryAxisY::~ChartCategoryAxisY()

src/axis/chartaxis.cpp +3 -8

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter) : ChartElement(presenter),
+            ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter, bool intervalAxis) : ChartElement(presenter),
                 m_chartAxis(axis),
                 m_labelsAngle(0),
                 m_grid(new QGraphicsItemGroup(presenter->rootItem())),
                 m_max(0),
                 m_animation(0),
                 m_labelPadding(5),
-                m_labelBetween(false)
+                m_intervalAxis(intervalAxis)
             {
                 //initial initialization
                 m_arrow->setZValue(ChartPresenter::AxisZValue);
             {
                 if (m_arrow->children().size() == 0)
                     m_arrow->addToGroup(new AxisItem(this,presenter()->rootItem()));
-                if (m_grid->children().size() == 0){
+                if (m_intervalAxis && m_grid->children().size() == 0){
                     for(int i = 0 ; i < 2 ;i  ++)
                         m_grid->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
                 }
                 //TODO: axis clicked;
             }
-            void ChartAxis::setLabelBetweenTicks(bool enabled)
-                m_labelBetween=enabled;
             Qt::Orientation ChartAxis::orientation() const
             {
                 return m_chartAxis->orientation();

src/axis/chartaxis_p.h +4 -4

                 Q_INTERFACES(QGraphicsLayoutItem)
             public:
-                ChartAxis(QAbstractAxis *axis, ChartPresenter *presenter);
+                ChartAxis(QAbstractAxis *axis, ChartPresenter *presenter, bool intervalAxis = false);
                 ~ChartAxis();
                 void setArrowOpacity(qreal opacity);
                 void setLabels(const QStringList& labels);
                 QStringList labels() const { return m_labelsList; }
-                void setLabelBetweenTicks(bool enabled);
+                //this flag indicates that axis is used to show intervals it means labels are in between ticks
-                bool labelBetweenTicks() const { return m_labelBetween; }
+                bool intervalAxis() const { return m_intervalAxis; }
                 virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
                 QString m_titleText;
                 int m_labelPadding;
                 QStringList m_labelsList;
-                bool m_labelBetween;
+                bool m_intervalAxis;
             friend class AxisAnimation;
             friend class AxisItem;

src/axis/horizontalaxis.cpp +4 -4

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            HorizontalAxis::HorizontalAxis(QAbstractAxis *axis, ChartPresenter *presenter):ChartAxis(axis,presenter)
+            HorizontalAxis::HorizontalAxis(QAbstractAxis *axis, ChartPresenter *presenter,bool intervalAxis):ChartAxis(axis,presenter,intervalAxis)
             {
             }
                         tickItem->setLine(layout[i],axisRect.top(),layout[i],axisRect.top() + labelPadding());
                     }
-                    if(labelBetweenTicks()&& i+1!=layout.size()) {
+                    if(intervalAxis()&& i+1!=layout.size()) {
                         const qreal delta = (layout[i+1] - layout[i])/2;
                         labelItem->setPos(layout[i] + delta - center.x(), labelItem->pos().y());
                     }
                     if (x < gridRect.left() || x > gridRect.right()) {
                           gridItem->setVisible(false);
                           tickItem->setVisible(false);
-                          if( labelBetweenTicks() && ( labelItem->pos().x() < gridRect.left() || labelItem->pos().x() + rect.width() > gridRect.right()))
+                          if( intervalAxis() && ( labelItem->pos().x() < gridRect.left() || labelItem->pos().x() + rect.width() > gridRect.right()))
                               labelItem->setVisible(false);
                     }
                 }
                 //begin/end grid line in case labels between
-                if(labelBetweenTicks()) {
+                if(intervalAxis()) {
                     QGraphicsLineItem *gridLine;
                     gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()));
                     gridLine->setLine(gridRect.right(), gridRect.top(), gridRect.right(), gridRect.bottom());

src/axis/horizontalaxis_p.h +1 -1

             class HorizontalAxis : public ChartAxis
             {
             public:
-                HorizontalAxis(QAbstractAxis *axis, ChartPresenter *presenter);
+                HorizontalAxis(QAbstractAxis *axis, ChartPresenter *presenter,bool intervalAxis = false);
                 ~HorizontalAxis();
             protected:
                 void updateGeometry();

src/axis/verticalaxis.cpp +4 -4

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            VerticalAxis::VerticalAxis(QAbstractAxis *axis, ChartPresenter *presenter):ChartAxis(axis,presenter)
+            VerticalAxis::VerticalAxis(QAbstractAxis *axis, ChartPresenter *presenter, bool intervalAxis):ChartAxis(axis,presenter,intervalAxis)
             {
             }
                         labelItem->setPos( axisRect.left() + labelPadding() , layout[i]-center.y());
                         tickItem->setLine( axisRect.left(),layout[i], axisRect.left()+ labelPadding(),layout[i]);
                     }
-                    if(labelBetweenTicks()&& i+1!=layout.size()) {
+                    if(intervalAxis()&& i+1!=layout.size()) {
                         const qreal delta = (layout[i+1] - layout[i])/2;
                         labelItem->setPos(labelItem->pos().x() , layout[i] + delta - center.y());
                     }
                     if (y < gridRect.top() || y > gridRect.bottom()) {
                         gridItem->setVisible(false);
                         tickItem->setVisible(false);
-                        if( labelBetweenTicks() && ( labelItem->pos().y() < gridRect.top() || labelItem->pos().y() + rect.height() > gridRect.bottom()))
+                        if( intervalAxis() && ( labelItem->pos().y() < gridRect.top() || labelItem->pos().y() + rect.height() > gridRect.bottom()))
                         labelItem->setVisible(false);
                     }
                 }
                 //begin/end grid line in case labels between
-                if(labelBetweenTicks()) {
+                if(intervalAxis()) {
                     QGraphicsLineItem *gridLine;
                     gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()));
                     gridLine->setLine(gridRect.left(), gridRect.top(), gridRect.right(), gridRect.top());

src/axis/verticalaxis_p.h +1 -1

             class VerticalAxis : public ChartAxis
             {
             public:
-                VerticalAxis(QAbstractAxis *axis, ChartPresenter *presenter);
+                VerticalAxis(QAbstractAxis *axis, ChartPresenter *presenter, bool intervalAxis = false);
                 ~VerticalAxis();
             protected:
                 void updateGeometry();

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages