HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r652:4ab0d58be448

Legend disabled by defaut. User can turn in on, by calling setVisible

sauimone -

r652:4ab0d58be448

parent child

Context file:

r652:4ab0d58be448

examples/stackedbarchartdrilldown/main.cpp 0 -1

             #include <qstackedbarseries.h>
             #include <qbarset.h>
             #include <qchartaxis.h>
-            #include <qlegend.h>
             #include <QStringList>
             #include <QDebug>

src/qchart.cpp +6 -5

             }
             /*!
-                Returns the legend object of the chart
+                Returns the legend object of the chart. Ownership stays in chart.
             */
-            QLegend* QChart::legend()
+            QLegend* QChart::legend() const
             {
                 return m_legend;
             }
                 // recalculate legend position
                 if (m_legend) {
-                    m_legend->setMaximumSize(rect.size());
+                    if (m_legend->parentObject() == this) {
-                    m_legend->setPos(rect.topLeft());
+                        m_legend->setMaximumSize(rect.size());
-                    m_legend->setPreferredLayout(QLegend::PreferredLayoutHorizontal);
+                        m_legend->setPos(rect.topLeft());
+                    }
                 }
             }

src/qchart.h +1 -3

                 QChartAxis* axisX() const;
                 QChartAxis* axisY() const;
-                // TODO: take (and give) legend instead of this.
+                QLegend* legend() const;
-                QLegend* legend();
                 int padding() const;

src/qlegend.cpp +3 -4

                 ,m_brush(Qt::darkGray)     // TODO: from theme?
                 ,mPreferredLayout(QLegend::PreferredLayoutVertical)
             {
-            //    setVisible(false);
+                setVisible(false);
                 setZValue(ChartPresenter::LegendZValue);
             }
             void QLegend::setMaximumSize(const QSizeF size)
             {
                 mMaximumSize = size;
+                layoutChanged();
             }
             void QLegend::setSize(const QSizeF size)
             void QLegend::setPos(const QPointF &pos)
             {
                 mPos = pos;
+                layoutChanged();
             }
             void QLegend::handleSeriesAdded(QSeries* series, Domain* domain)
             {
                 Q_UNUSED(domain)
-            //    mSeriesList.append(series);
                 createMarkers(series);
                 connectSeries(series);
                 layoutChanged();
                     deleteMarkers(series);
                 }
-            //    mSeriesList.removeOne(series);
                 layoutChanged();
             }
             void QLegend::layoutChanged()
             {
                 // Calculate layout for markers and text
-                qDebug() << "Marker count:" << mMarkers.count();
                 if (mMarkers.count() <= 0) {
                     // Nothing to do
                     return;

src/qlegend.h 0 -1

                 QSizeF mMinimumSize;
                 QSizeF mMaximumSize;
-            //    QList<QSeries*> mSeriesList;
                 QList<LegendMarker*> mMarkers;
                 QBrush m_brush;

src/qseries.cpp 0 -5

             */
             /*!
-                \fn QList<QSeries::Legend> QSeries::legend()
-                \brief Returns the legend of the series. If series is empty, empty list is returned.
-            */
-            /*!
                 \fn void QSeries::setTitle(QString title)
                 \brief Sets a \a title for the series.

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