HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1548:f40a9cdaafd3

Old QAxisCategories removed

Marek Rosa -

r1548:f40a9cdaafd3

parent child

Context file:

r1548:f40a9cdaafd3

Collapse all files

plugins/declarative/plugin.cpp +1 -1

             #include <QtDeclarative/qdeclarative.h>
             #include "qchart.h"
             #include "qabstractaxis.h"
-            #include "qaxiscategories.h"
+            //#include "qaxiscategories.h"
             #include "declarativechart.h"
             #include "declarativexypoint.h"
             #include "declarativelineseries.h"

src/axis/axis.pri +4 -4

                 $$PWD/chartaxis.cpp \
                 $$PWD/chartaxisx.cpp \
                 $$PWD/chartaxisy.cpp \
-                $$PWD/qaxiscategories.cpp \
+            #    $$PWD/qaxiscategories.cpp \
                 $$PWD/qcategoriesaxis.cpp \
                 $$PWD/qvaluesaxis.cpp \
                 $$PWD/qabstractaxis.cpp
                 $$PWD/chartaxis_p.h \
                 $$PWD/chartaxisx_p.h \
                 $$PWD/chartaxisy_p.h \
-                $$PWD/qaxiscategories_p.h \
+            #    $$PWD/qaxiscategories_p.h \
                 $$PWD/qcategoriesaxis_p.h \
                 $$PWD/qvaluesaxis_p.h \
                 $$PWD/qabstractaxis_p.h
             PUBLIC_HEADERS += \
-                $$PWD/qaxiscategories.h \
+            #    $$PWD/qaxiscategories.h \
                 $$PWD/qcategoriesaxis.h \
                 $$PWD/qvaluesaxis.h \
-                $$PWD/qabstractaxis.h 
  No newline at end of file
+                $$PWD/qabstractaxis.h

src/axis/chartaxis.cpp +20 -18

                 Q_ASSERT(ticks>1);
                 //TODO:: QAxisCategories* categories = m_chartAxis->categories();
-                QAxisCategories* categories = new QAxisCategories();
+            //    QAxisCategories* categories = new QAxisCategories();
-                bool category = categories->count()>0;
+            //    bool category = categories->count()>0;
-                if (!category) {
+            //    if (!category) {
                     int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
                     n++;
                     for (int i=0; i< ticks; i++) {
                         Q_UNUSED(value);
                         labels << QString::number(value,'f',n);
                     }
-                } else {
+            //    } else {
-                    QList<qreal> values = categories->values();
+            //        QList<qreal> values = categories->values();
-                    for (int i=0; i< ticks; i++) {
+            //        for (int i=0; i< ticks; i++) {
-                        qreal value = (min + (i * (max - min)/ (ticks-1)));
+            //            qreal value = (min + (i * (max - min)/ (ticks-1)));
-                        int j=0;
+            //            int j=0;
-                        for (; j<values.count(); j++) {
+            //            for (; j<values.count(); j++) {
-                            if (values.at(j) > value) break;
+            //                if (values.at(j) > value) break;
+            //            }
-                        if (j!=0) value=values.at(j-1);
+            //            if (j!=0) value=values.at(j-1);
-                        QString label = categories->label(value);
+            //            QString label = categories->label(value);
-                        labels << label;
+            //            labels << label;
+            //        }
+            //    }
-                return category;
+            //    return category;
+                    return true;
             }
             void ChartAxis::setAxisOpacity(qreal opacity)
             {
                 m_labels->setOpacity(opacity);
             }
+            #include "qaxiscategories.h"
             qreal ChartAxis::labelsOpacity() const
             {

src/axis/qabstractaxis.cpp +14 0

@@ -55,6 +55,20 QTCOMMERCIALCHART_BEGIN_NAMESPACE
55	*/	55	*/
56		56
57	/*!	57	/*!
		58	\enum QAbstractAxis::AxisType
		59
		60	The type of the series object.
		61
		62	\value AxisTypeValues
		63	\value AxisTypeCategories
		64	*/
		65
		66	/*!
		67	\property QAbstractAxis::type
		68	The type of the axis.
		69	*/
		70
		71	/*!
58	\property QAbstractAxis::labelsVisible	72	\property QAbstractAxis::labelsVisible
59	Defines if axis labels are visible.	73	Defines if axis labels are visible.
60	*/	74	*/

src/axis/qaxiscategories.cpp removed 0 -131

NO CONTENT: file was removed

src/axis/qaxiscategories.h removed 0 -56

NO CONTENT: file was removed

src/axis/qaxiscategories_p.h removed 0 -57

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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