HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2676:23bf915495bc

plugins/quick2/plugins.qmltypes +5 0

                      Property { name: "borderColor"; type: "QColor" }
                      Property { name: "font"; type: "QFont" }
                      Property { name: "labelColor"; type: "QColor" }
+                     Property { name: "reverseMarkers"; type: "bool" }
                      Signal {
                          name: "backgroundVisibleChanged"
                          Parameter { name: "visible"; type: "bool" }
                          name: "labelColorChanged"
                          Parameter { name: "color"; type: "QColor" }
                      }
+                     Signal {
+                         name: "reverseMarkersChanged"
+                         Parameter { name: "reverseMarkers"; type: "bool" }
+                     }
                  }
                  Component { name: "QtCommercialChart::QLineSeries"; prototype: "QtCommercialChart::QXYSeries" }
                  Component {

src/legend/legendlayout.cpp +15 -2

                          }
                          QPointF point(0,0);
-                         foreach (QLegendMarker *marker, m_legend->d_ptr->markers()) {
+                         int markerCount = m_legend->d_ptr->markers().count();
+                         for (int i = 0; i < markerCount; i++) {
+                             QLegendMarker *marker;
+                             if (m_legend->d_ptr->m_reverseMarkers)
+                                 marker = m_legend->d_ptr->markers().at(markerCount - 1 - i);
+                             else
+                                 marker = m_legend->d_ptr->markers().at(i);
                              LegendMarkerItem *item = marker->d_ptr->item();
                              if (item->isVisible()) {
                                  QRectF itemRect = geometry;
                  case Qt::AlignLeft:
                  case Qt::AlignRight: {
                          QPointF point(0,0);
-                         foreach (QLegendMarker *marker, m_legend->d_ptr->markers()) {
+                         int markerCount = m_legend->d_ptr->markers().count();
+                         for (int i = 0; i < markerCount; i++) {
+                             QLegendMarker *marker;
+                             if (m_legend->d_ptr->m_reverseMarkers)
+                                 marker = m_legend->d_ptr->markers().at(markerCount - 1 - i);
+                             else
+                                 marker = m_legend->d_ptr->markers().at(i);
                              LegendMarkerItem *item = marker->d_ptr->item();
                              if (item->isVisible()) {
                                  item->setGeometry(geometry);

src/legend/qlegend.cpp +25 -1

              */
              /*!
+                 \property QLegend::reverseMarkers
+                 Whether reverse order is used for the markers in legend or not. False by default.
+             */
+             /*!
+                 \qmlproperty bool Legend::reverseMarkers
+                 Whether reverse order is used for the markers in legend or not. False by default.
+             */
+             /*!
                  \fn void QLegend::backgroundVisibleChanged(bool)
                  The visibility of the legend background changed to \a visible.
              */
                  return d_ptr->markers(series);
              }
+             bool QLegend::reverseMarkers()
+             {
+                 return d_ptr->m_reverseMarkers;
+             }
+             void QLegend::setReverseMarkers(bool reverseMarkers)
+             {
+                 if (d_ptr->m_reverseMarkers != reverseMarkers) {
+                     d_ptr->m_reverseMarkers = reverseMarkers;
+                     layout()->invalidate();
+                     emit reverseMarkersChanged(reverseMarkers);
+                 }
+             }
              /*!
               \internal \a event see QGraphicsWidget for details
               */
                    m_labelBrush(QBrush()),
                    m_diameter(5),
                    m_attachedToChart(true),
-                   m_backgroundVisible(false)
+                   m_backgroundVisible(false),
+                   m_reverseMarkers(false)
              {
                  m_items->setHandlesChildEvents(false);
              }

src/legend/qlegend.h +5 0

                  Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
                  Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
                  Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
+                 Q_PROPERTY(bool reverseMarkers READ reverseMarkers WRITE setReverseMarkers NOTIFY reverseMarkersChanged)
              private:
                  explicit QLegend(QChart *chart);
                  QList <QLegendMarker*> markers(QAbstractSeries *series = 0) const;
+                 bool reverseMarkers();
+                 void setReverseMarkers(bool reverseMarkers = true);
              protected:
                  void hideEvent(QHideEvent *event);
                  void showEvent(QShowEvent *event);
                  void borderColorChanged(QColor color);
                  void fontChanged(QFont font);
                  void labelColorChanged(QColor color);
+                 void reverseMarkersChanged(bool reverseMarkers);
              private:
                  QScopedPointer<QLegendPrivate> d_ptr;

src/legend/qlegend_p.h +1 0

                  qreal m_diameter;
                  bool m_attachedToChart;
                  bool m_backgroundVisible;
+                 bool m_reverseMarkers;
                  QList<QLegendMarker *> m_markers;
                  QList<QAbstractSeries *> m_series;

tests/auto/qchart/tst_qchart.cpp +8 0

              {
                  QLegend *legend = m_chart->legend();
                  QVERIFY(legend);
+                 QVERIFY(!m_chart->legend()->reverseMarkers());
                  // Colors related signals
                  QSignalSpy colorSpy(legend, SIGNAL(colorChanged(QColor)));
                  f.setBold(!f.bold());
                  legend->setFont(f);
                  QCOMPARE(fontSpy.count(), 1);
+                 // reverseMarkersChanged
+                 QSignalSpy reverseMarkersSpy(legend, SIGNAL(reverseMarkersChanged(bool)));
+                 QCOMPARE(reverseMarkersSpy.count(), 0);
+                 legend->setReverseMarkers();
+                 QCOMPARE(reverseMarkersSpy.count(), 1);
+                 QVERIFY(legend->reverseMarkers());
              }
              void tst_QChart::plotArea_data()

tests/auto/qml-qtquicktest/tst_chartview.qml +1 0

                          compare(chartView.legend.backgroundVisible, false, "ChartView.legend.backgroundVisible");
                          verify(chartView.legend.borderColor != undefined, "ChartView.legend.borderColor");
                          verify(chartView.legend.color != undefined, "ChartView.legend.color");
+                         compare(chartView.legend.reverseMarkers, false, "ChartView.legend.reverseMarkers");
                          // Legend font
                          compare(chartView.legend.font.bold, false, "ChartView.legend.font.bold");
                          compare(chartView.legend.font.capitalization, Font.MixedCase, "ChartView.legend.font.capitalization");

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +2 0

                  legend.onColorChanged:             console.log("legend.onColorChanged: " + color);
                  legend.onBorderColorChanged:       console.log("legend.onBorderColorChanged: " + color);
                  legend.onLabelColorChanged:        console.log("legend.onLabelColorChanged: " + color);
+                 legend.onReverseMarkersChanged:    console.log("legend.onReverseMarkersChanged: "
+                                                                + chart.legend.reverseMarkers)
                  margins.onTopChanged:       console.log("chart.margins.onTopChanged: " + top );
                  margins.onBottomChanged:    console.log("chart.margins.onBottomChanged: " + bottom);
                  margins.onLeftChanged:      console.log("chart.margins.onLeftChanged: " + left);

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml +4 0

                          text: "legend right"
                          onClicked: chartLegend.alignment = Qt.AlignRight;
                      }
+                     Button {
+                         text: "legend use reverse order"
+                         onClicked: chartLegend.reverseMarkers = !chartLegend.reverseMarkers;
+                     }
                  }
                  FontEditor {

tests/quick2chartproperties/qml/quick2chartproperties/Chart.qml +2 0

                  legend.onColorChanged:             console.log("legend.onColorChanged: " + color);
                  legend.onBorderColorChanged:       console.log("legend.onBorderColorChanged: " + color);
                  legend.onLabelColorChanged:        console.log("legend.onLabelColorChanged: " + color);
+                 legend.onReverseMarkersChanged:    console.log("legend.onReverseMarkersChanged: "
+                                                                + chart.legend.reverseMarkers)
                  margins.onTopChanged:       console.log("chart.margins.onTopChanged: " + top );
                  margins.onBottomChanged:    console.log("chart.margins.onBottomChanged: " + bottom);
                  margins.onLeftChanged:      console.log("chart.margins.onLeftChanged: " + left);

tests/quick2chartproperties/qml/quick2chartproperties/ChartEditorLegend.qml +4 0

                          text: "legend right"
                          onClicked: chartLegend.alignment = Qt.AlignRight;
                      }
+                     Button {
+                         text: "legend use reverse order"
+                         onClicked: chartLegend.reverseMarkers = !chartLegend.reverseMarkers;
+                     }
                  }
                  FontEditor {

	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