HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2614:c8086b11eeb5

Fix default axes creation...

Titta Heikkala -

r2614:c8086b11eeb5

parent child

Context file:

r2614:c8086b11eeb5

src/areachart/qareaseries.cpp +1 -1

             QAbstractAxis* QAreaSeriesPrivate::createDefaultAxis(Qt::Orientation orientation) const
             {
                 Q_UNUSED(orientation);
-                return 0;
+                return new QValueAxis;
             }
             void QAreaSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)

src/barchart/qabstractbarseries.cpp +4 -2

             QAbstractAxis* QAbstractBarSeriesPrivate::createDefaultAxis(Qt::Orientation orientation) const
             {
-                Q_UNUSED(orientation);
+                if (defaultAxisType(orientation) == QAbstractAxis::AxisTypeBarCategory)
-                return 0;
+                    return new QBarCategoryAxis;
+                else
+                    return new QValueAxis;
             }
             void QAbstractBarSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)

src/boxplotchart/qboxplotseries.cpp +4 -3

             QAbstractAxis* QBoxPlotSeriesPrivate::createDefaultAxis(Qt::Orientation orientation) const
             {
-                Q_UNUSED(orientation);
+                if (defaultAxisType(orientation) == QAbstractAxis::AxisTypeBarCategory)
+                    return new QBarCategoryAxis;
-                return 0;
+                else
+                    return new QValueAxis;
             }
             void QBoxPlotSeriesPrivate::populateCategories(QBarCategoryAxis *axis)

src/chartdataset.cpp +15 -3

                 }
                 // Create the axes of the types selected
-                createAxes(typeX, Qt::Horizontal);
+                // As long as AxisType enum balues are sequential a check to see if there are series of
-                createAxes(typeY, Qt::Vertical);
+                // different types is needed. In such cases AxisTypeNoAxis is used to create separate axes
+                // for the types.
+                if (typeX != QAbstractAxis::AxisTypeNoAxis) {
+                    if (typeX != m_seriesList.first()->d_ptr->defaultAxisType(Qt::Horizontal))
+                        typeX = QAbstractAxis::AxisTypeNoAxis;
+                    createAxes(typeX, Qt::Horizontal);
+                }
+                if (typeY != QAbstractAxis::AxisTypeNoAxis) {
+                    if (typeY != m_seriesList.first()->d_ptr->defaultAxisType(Qt::Vertical))
+                        typeY = QAbstractAxis::AxisTypeNoAxis;
+                    createAxes(typeY, Qt::Vertical);
+                }
             }
                     }
                     axis->setRange(min,max);
                 }
-                else if (!type.testFlag(QAbstractAxis::AxisTypeNoAxis)) {
+                else if (type.testFlag(QAbstractAxis::AxisTypeNoAxis)) {
                     //create separate axis
                     foreach(QAbstractSeries *s, m_seriesList) {
                         QAbstractAxis *axis = s->d_ptr->createDefaultAxis(orientation);

src/xychart/qxyseries.cpp +1 -1

             QAbstractAxis* QXYSeriesPrivate::createDefaultAxis(Qt::Orientation orientation) const
             {
                 Q_UNUSED(orientation);
-                return 0;
+                return new QValueAxis;
             }
             void QXYSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)

General Comments 0

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

No TODOs yet

	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