HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1561:8267a30e4282

src/axis/axis.pri +4 -4

             SOURCES += \
                 $$PWD/chartaxis.cpp \
-                $$PWD/chartaxisx.cpp \
+            #    $$PWD/chartaxisx.cpp \
-                $$PWD/chartaxisy.cpp \
+            #    $$PWD/chartaxisy.cpp \
                 $$PWD/chartvaluesaxisx.cpp \
                 $$PWD/chartvaluesaxisy.cpp \
                 $$PWD/chartcategoriesaxisx.cpp \
             PRIVATE_HEADERS += \
                 $$PWD/chartaxis_p.h \
-                $$PWD/chartaxisx_p.h \
+            #    $$PWD/chartaxisx_p.h \
-                $$PWD/chartaxisy_p.h \
+            #    $$PWD/chartaxisy_p.h \
                 $$PWD/chartvaluesaxisx_p.h \
                 $$PWD/chartvaluesaxisy_p.h \
                 $$PWD/chartcategoriesaxisx_p.h \

src/axis/chartcategoriesaxisy.cpp +4 -3

                 QVector<qreal> points;
                 points.resize(m_ticksCount);
-                const qreal deltaX = m_rect.width()/(m_ticksCount-1);
+                const qreal deltaY = m_rect.height()/(m_ticksCount-1);
                 for (int i = 0; i < m_ticksCount; ++i) {
-                    int x = i * deltaX + m_rect.left();
+                    int y = i * -deltaY + m_rect.bottom();
-                    points[i] = x;
+                    points[i] = y;
                 }
                 return points;
             }

src/axis/chartvaluesaxisx.cpp +20 -10

             #include <QGraphicsLayout>
             #include <QDebug>
             #include <QFontMetrics>
+            #include <cmath>
             static int label_padding = 5;
                 QStringList ticksList;
-                bool categories = createLabels(ticksList,m_min,m_max,layout.size());
+                int ticks = layout.size();
+                int n = qMax(int(-floor(log10((m_max-m_min)/(ticks-1)))),0);
+                n++;
+                for (int i=0; i< ticks; i++) {
+                    qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
+                    Q_UNUSED(value);
+                    ticksList << QString::number(value,'f',n);
+                }
+                bool categories = false; //createLabels(ticksList,m_min,m_max,layout.size());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                         m_minWidth+=rect.width();
                         m_minHeight=qMax(rect.height(),m_minHeight);
                     }
-                    else {
+            //        else {
-                        labelItem->setText(ticksList.at(i));
+            //            labelItem->setText(ticksList.at(i));
-                        const QRectF& rect = labelItem->boundingRect();
+            //            const QRectF& rect = labelItem->boundingRect();
-                        QPointF center = rect.center();
+            //            QPointF center = rect.center();
-                        labelItem->setTransformOriginPoint(center.x(), center.y());
+            //            labelItem->setTransformOriginPoint(center.x(), center.y());
-                        labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
+            //            labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
-                        m_minWidth+=rect.width();
+            //            m_minWidth+=rect.width();
-                        m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
+            //            m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
+            //        }
                     if ((i+1)%2 && i>1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));

src/axis/chartvaluesaxisy.cpp +37 -20

             #include <QGraphicsLayout>
             #include <QDebug>
             #include <QFontMetrics>
+            #include <cmath>
             static int label_padding = 5;
                 QVector<qreal> points;
                 points.resize(m_ticksCount);
-                const qreal deltaX = m_rect.width()/(m_ticksCount-1);
+                const qreal deltaY = m_rect.height()/(m_ticksCount-1);
                 for (int i = 0; i < m_ticksCount; ++i) {
-                    int x = i * deltaX + m_rect.left();
+                    int y = i * -deltaY + m_rect.bottom();
-                    points[i] = x;
+                    points[i] = y;
                 }
                 return points;
             }
             void ChartValuesAxisY::updateGeometry()
             {
-                const QVector<qreal>& layout = ChartAxis::layout();
+                const QVector<qreal> &layout = ChartAxis::layout();
                 m_minWidth = 0;
                 m_minHeight = 0;
                 QStringList ticksList;
-                bool categories = createLabels(ticksList,m_min,m_max,layout.size());
+                int ticks = layout.size();
+                int n = qMax(int(-floor(log10((m_max-m_min)/(ticks-1)))),0);
+                n++;
+                for (int i=0; i< ticks; i++) {
+                    qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
+                    Q_UNUSED(value);
+                    ticksList << QString::number(value,'f',n);
+                }
+                bool categories = false;
+            //    bool categories = createLabels(ticksList,m_min,m_max,layout.size());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 Q_ASSERT(labels.size() == ticksList.size());
                 Q_ASSERT(layout.size() == ticksList.size());
+                qreal height =  2*m_rect.bottom();
                 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));
-                lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
+                lineItem->setLine(m_rect.left() , m_rect.top(), m_rect.left(), 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());
+                    lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
                     QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
                     if (!categories || i<1) {
                         labelItem->setText(ticksList.at(i));
                         const QRectF& rect = labelItem->boundingRect();
                         QPointF center = rect.center();
                         labelItem->setTransformOriginPoint(center.x(), center.y());
-                        labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);
+                        labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i]-center.y());
-                        if(labelItem->pos().x()<=width){
+                        if(labelItem->pos().y()+rect.height()>height) {
                             labelItem->setVisible(false);
                             lineItem->setVisible(false);
-                        }else{
+                        else {
                             labelItem->setVisible(true);
                             lineItem->setVisible(true);
-                            width=rect.width()+labelItem->pos().x();
+                            height=labelItem->pos().y();
                         }
-                        m_minWidth+=rect.width();
-                        m_minHeight=qMax(rect.height(),m_minHeight);
+                        m_minWidth=qMax(rect.width()+label_padding,m_minWidth);
+                        m_minHeight+=rect.height();
                     }
                     else {
                         labelItem->setText(ticksList.at(i));
                         const QRectF& rect = labelItem->boundingRect();
+                        m_minWidth=qMax(rect.width(),m_minWidth);
+                        m_minHeight+=rect.height();
                         QPointF center = rect.center();
                         labelItem->setTransformOriginPoint(center.x(), center.y());
-                        labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
+                        labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y());
-                        m_minWidth+=rect.width();
-                        m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
                     }
                     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());
+                        rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);
                     }
                     lineItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
-                    lineItem->setLine(layout[i],m_rect.bottom(),layout[i],m_rect.bottom()+5);
+                    lineItem->setLine(m_rect.left()-5,layout[i],m_rect.left(),layout[i]);
                 }
             }

src/axis/qcategoriesaxis.cpp +4 -4

             #include "qcategoriesaxis.h"
             #include "qcategoriesaxis_p.h"
-            #include "chartaxisx_p.h"
+            #include "chartcategoriesaxisx_p.h"
-            #include "chartaxisy_p.h"
+            #include "chartcategoriesaxisy_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 Q_Q( QCategoriesAxis);
                 if(m_orientation == Qt::Vertical){
-                    return new ChartAxisY(q,presenter);
+                    return new ChartCategoriesAxisY(q,presenter);
                 }else{
-                    return new ChartAxisX(q,presenter);
+                    return new ChartCategoriesAxisX(q,presenter);
                 }
             }

src/axis/qvaluesaxis.cpp +4 -4

             #include "qvaluesaxis.h"
             #include "qvaluesaxis_p.h"
-            #include "chartaxisx_p.h"
+            #include "chartvaluesaxisx_p.h"
-            #include "chartaxisy_p.h"
+            #include "chartvaluesaxisy_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 Q_Q(QValuesAxis);
                 if(m_orientation == Qt::Vertical){
-                    return new ChartAxisY(q,presenter);
+                    return new ChartValuesAxisY(q,presenter);
                 }else{
-                    return new ChartAxisX(q,presenter);
+                    return new ChartValuesAxisX(q,presenter);
                 }
             }

src/chartpresenter.cpp +2 -2

             #include "qabstractseries_p.h"
             #include "qareaseries.h"
             #include "chartaxis_p.h"
-            #include "chartaxisx_p.h"
+            //#include "chartaxisx_p.h"
-            #include "chartaxisy_p.h"
+            //#include "chartaxisy_p.h"
             #include "areachartitem_p.h"
             #include "chartbackground_p.h"
             #include "chartlayout_p.h"

src/axis/chartaxisx.cpp removed 0 -122

NO CONTENT: file was removed

src/axis/chartaxisx_p.h removed 0 -55

NO CONTENT: file was removed

src/axis/chartaxisy.cpp removed 0 -128

NO CONTENT: file was removed

src/axis/chartaxisy_p.h removed 0 -56

NO CONTENT: file was removed

	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