HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1452:aa62563de463

Adding legend properties

Tero Ahola -

r1452:aa62563de463

parent child

Context file:

r1452:aa62563de463

Collapse all files

doc/src/qml.qdoc +1 0

                      <li><a href="qml-chartview.html">ChartView</a></li>
                      <li><a href="qml-pieseries.html">PieSeries</a></li>
                      <li><a href="qml-axis.html">Axis</a></li>
+                     <li><a href="qml-legend.html">Legend</a></li>
                      </ul>
                  \endraw
              */

src/legend/qlegend.cpp +107 -19

                  \sa QChart
              */
+             /*!
+                 \qmlclass Legend QLegend
+                 \brief Legend is part of QtCommercial Chart QML API.
+                 Legend is a graphical object, whics displays legend of the chart. Legend state is updated by ChartView, when
+                 series have been changed. Legend is referenced via ChartView class. For example:
+                 \code
+                     ChartView {
+                         legend.visible: true
+                         legend.alignment: Qt.AlignBottom
+                         // Add a few series...
+                     }
+                 \endcode
+                 \image examples_percentbarchart_legend.png
+             */
+             /*!
+                 \property QLegend::alignment
+                 \brief The alignment of the legend.
+                 Legend paints on the defined position in the chart. The following alignments are supported:
+                 Qt::AlignTop, Qt::AlignBottom, Qt::AlignLeft, Qt::AlignRight. If you set more than one flag the result is undefined.
+             */
+             /*!
+                 \qmlproperty Qt.Alignment Legend::alignment
+                 \brief The alignment of the legend.
+                 Legend paints on the defined position in the chart. The following alignments are supported:
+                 Qt.AlignTop, Qt.AlignBottom, Qt.AlignLeft, Qt.AlignRight. If you set more than one flag the result is undefined.
+             */
+             /*!
+                 \property QLegend::backgroundVisible
+                 Whether the legend background is visible or not.
+             */
+             /*!
+                 \qmlproperty bool Legend::backgroundVisible
+                 Whether the legend background is visible or not.
+             */
+             /*!
+                 \property QLegend::color
+                 The color of the legend, i.e. the background color.
+             */
+             /*!
+                 \qmlproperty color Legend::color
+                 The color of the legend, i.e. the background color.
+             */
+             /*!
+                 \property QLegend::borderColor
+                 The border color of the legend, i.e. the line color.
+             */
+             /*!
+                 \qmlproperty color Legend::borderColor
+                 The border color of the legend, i.e. the line color.
+             */
              /*!
-                 \fn void QLegend::alignmentChanged()
-                 Emitted when the alignment of the legend changes.
+                 \fn void QLegend::alignmentChanged(Qt::Alignment)
+                 Emitted when the \a alignment of the legend changes.
+             */
+             /*!
+                 \fn void QLegend::backgroundVisibleChanged(bool)
+                 The visibility of the legend background changed to \a visible.
+             */
+             /*!
+                 \fn void QLegend::colorChanged(QColor)
+                 The color of the legend background changed to \a color.
+             */
+             /*!
+                 \fn void QLegend::borderColorChanged(QColor)
+                 The border color of the legend background changed to \a color.
              */
              /*!
                  return d_ptr->m_brush;
              }
+             void QLegend::setColor(QColor color)
+             {
+                 QBrush b = d_ptr->m_brush;
+                 if (b.color() != color) {
+                     b.setColor(color);
+                     setBrush(b);
+                     emit colorChanged(color);
+                 }
+             }
+             QColor QLegend::color()
+             {
+                 return d_ptr->m_brush.color();
+             }
              /*!
               Sets the \a pen of legend. Pen affects the legend borders.
               */
                  return d_ptr->m_pen;
              }
-             /*!
-                 \property QLegend::alignment
-                 \brief The alignment of the legend.
-             */
+             void QLegend::setBorderColor(QColor color)
+             {
+                 QPen p = d_ptr->m_pen;
+                 if (p.color() != color) {
+                     p.setColor(color);
+                     setPen(p);
+                     emit borderColorChanged(color);
+                 }
+             }
-             /*!
-                 Sets the \a alignment for legend. Legend paints on the defined position in chart. The following alignments are
-                 supported: Qt::AlignTop, Qt::AlignBottom, Qt::AlignLeft, Qt::AlignRight. If you set more than one flag the result
-                 is undefined.
+             QColor QLegend::borderColor()
+             {
+                 return d_ptr->m_pen.color();
+             }
-                 \sa QLegend::Alignment
-              */
              void QLegend::setAlignment(Qt::Alignment alignment)
              {
                  if(d_ptr->m_alignment!=alignment) {
                      d_ptr->m_alignment = alignment;
                      d_ptr->updateLayout();
-                     alignmentChanged();
+                     alignmentChanged(alignment);
                  }
              }
-             /*!
-              Returns the preferred layout for legend
-              */
              Qt::Alignment QLegend::alignment() const
              {
                  return d_ptr->m_alignment;
               */
              void QLegend::setBackgroundVisible(bool visible)
              {
-                 if(d_ptr->m_backgroundVisible!=visible)
+                 {
-                     d_ptr->m_backgroundVisible=visible;
+                 if(d_ptr->m_backgroundVisible != visible) {
+                     d_ptr->m_backgroundVisible = visible;
                      update();
+                     emit backgroundVisibleChanged(visible);
                  }
              }

src/legend/qlegend.h +12 -2

              {
                  Q_OBJECT
                  Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+                 Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible NOTIFY backgroundVisibleChanged)
+                 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+                 Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
              private:
                  explicit QLegend(QChart *chart);
                  void setBrush(const QBrush &brush);
                  QBrush brush() const;
+                 void setColor(QColor color);
+                 QColor color();
                  void setPen(const QPen &pen);
                  QPen pen() const;
+                 void setBorderColor(QColor color);
+                 QColor borderColor();
                  void setAlignment(Qt::Alignment alignment);
                  Qt::Alignment alignment() const;
                  void showEvent(QShowEvent *event);
              Q_SIGNALS:
-                 void alignmentChanged();
+                 void alignmentChanged(Qt::Alignment alignment);
+                 void backgroundVisibleChanged(bool visible);
+                 void colorChanged(QColor color);
+                 void borderColorChanged(QColor color);
              private:
                  QScopedPointer<QLegendPrivate> d_ptr;
-                 Q_DISABLE_COPY(QLegend);
+                 Q_DISABLE_COPY(QLegend)
                  friend class LegendScroller;
              };

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml +20 -5

                  Connections {
                      id: legendConnections
                      ignoreUnknownSignals: true
-                     onAlignmentChanged:         console.log("legend.onAlignmentChanged: " + series.legend.alignment);
+                     onAlignmentChanged:         console.log("legend.onAlignmentChanged: " + alignment);
                      onVisibleChanged:           console.log("legend.onVisibleChanged: " + series.legend.visible);
+                     onBackgroundVisibleChanged: console.log("legend.onBackgroundVisibleChanged: " + visible);
+                     onColorChanged:             console.log("legend.onColorChanged: " + color);
+                     onBorderColorChanged:       console.log("legend.onBorderColorChanged: " + color);
                  }
                  Connections {
                      onClicked: series.backgroundColor = main.nextColor();
                  }
                  Button {
+                     text: "legend visible"
+                     onClicked: series.legend.visible = !series.legend.visible;
+                 }
+                 Button {
+                     text: "legend bckgrd visible"
+                     onClicked: series.legend.backgroundVisible = !series.legend.backgroundVisible;
+                 }
+                 Button {
+                     text: "legend color"
+                     onClicked: series.legend.color = main.nextColor();
+                 }
+                 Button {
+                     text: "legend border color"
+                     onClicked: series.legend.borderColor = main.nextColor();
+                 }
+                 Button {
                      text: "legend top"
                      onClicked: series.legend.alignment ^= Qt.AlignTop;
                  }
                      onClicked: series.legend.alignment ^= Qt.AlignRight;
                  }
                  Button {
-                     text: "legend visible"
-                     onClicked: series.legend.visible = !series.legend.visible;
+                 }
-                 Button {
                      text: "axis X nice nmb"
                      onClicked: series.axisX.niceNumbersEnabled = !series.axisX.niceNumbersEnabled;
                  }

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