HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2369:4efd2aae0a6f

Restored minimumMargins property to QChart

Tero Ahola -

r2369:4efd2aae0a6f

parent child

Context file:

r2369:4efd2aae0a6f

Collapse all files

plugins/declarative/declarativechart.cpp +15 -13

             /*!
               \qmlproperty real ChartView::topMargin
-              Deprecated. Use minimumMargins and plotArea instead.
             */
             /*!
               \qmlproperty real ChartView::bottomMargin
-              Deprecated. Use minimumMargins and plotArea instead.
             */
             /*!
               \qmlproperty real ChartView::leftMargin
-              Deprecated. Use minimumMargins and plotArea instead.
             */
             /*!
               \qmlproperty real ChartView::rightMargin
-              Deprecated. Use minimumMargins and plotArea instead.
             */
             /*!
               \qmlproperty Margins ChartView::minimumMargins
+              Deprecated; use margins instead.
               The minimum margins allowed between the outer bounds and the plotArea of the ChartView. Margins
               area of ChartView is used for drawing title, axes and legend. Please note that setting the
               properties of minimumMargins may be bigger than the defined value, depending on other ChartView
             */
             /*!
+              \qmlproperty Margins ChartView::margins
+              The minimum margins allowed between the outer bounds and the plotArea of the ChartView. Margins
+              area of ChartView is used for drawing title, axes and legend.
+            */
+            /*!
               \qmlmethod AbstractSeries ChartView::series(int index)
               Returns the series with \a index on the chart. This allows you to loop through the series of a chart together with
               the count property of the chart.
             qreal DeclarativeChart::topMargin()
             {
-                qWarning() << "ChartView.topMargin is deprecated. Use minimumMargins and plotArea instead.";
+                qWarning() << "ChartView.topMargin is deprecated. Use margins instead.";
-                return m_chart->plotArea().top();
+                return m_chart->margins().top();
             }
             qreal DeclarativeChart::bottomMargin()
             {
+                qWarning() << "ChartView.bottomMargin is deprecated. Use margins instead.";
-                qWarning() << "ChartView.bottomMargin is deprecated. Use minimumMargins and plotArea instead.";
+                return m_chart->margins().bottom();
-                return m_chart->plotArea().bottom();
             }
             qreal DeclarativeChart::leftMargin()
             {
-                qWarning() << "ChartView.leftMargin is deprecated. Use minimumMargins and plotArea instead.";
+                qWarning() << "ChartView.leftMargin is deprecated. Use margins instead.";
-                return m_chart->plotArea().left();
+                return m_chart->margins().left();
             }
             qreal DeclarativeChart::rightMargin()
             {
-                qWarning() << "ChartView.rightMargin is deprecated. Use minimumMargins and plotArea instead.";
+                qWarning() << "ChartView.rightMargin is deprecated. Use margins instead.";
-                return m_chart->plotArea().right();
+                return m_chart->margins().right();
             }
             void DeclarativeChart::zoom(qreal factor)

src/qchart.h +1 0

                 Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
                 Q_PROPERTY(bool dropShadowEnabled READ isDropShadowEnabled WRITE setDropShadowEnabled)
                 Q_PROPERTY(QChart::AnimationOptions animationOptions READ animationOptions WRITE setAnimationOptions)
+                Q_PROPERTY(QMargins minimumMargins READ minimumMargins WRITE setMinimumMargins)
                 Q_PROPERTY(QMargins margins READ margins WRITE setMargins)
                 Q_ENUMS(ChartTheme)
                 Q_ENUMS(AnimationOption)

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