HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2429:d1e41c29fbb9

Fix for not overriding user settings for legend markers....

Mika Salmela -

r2429:d1e41c29fbb9

parent child

Context file:

r2429:d1e41c29fbb9

Collapse all files

src/legend/qarealegendmarker.cpp +2 -2

                 bool labelChanged = false;
                 bool brushChanged = false;
-                if (m_item->brush() != m_series->brush()) {
+                if (!m_customBrush && (m_item->brush() != m_series->brush())) {
                     m_item->setBrush(m_series->brush());
                     brushChanged = true;
                 }
-                if (m_item->label() != m_series->name()) {
+                if (!m_customLabel && (m_item->label() != m_series->name())) {
                     m_item->setLabel(m_series->name());
                     labelChanged = true;
                 }

src/legend/qbarlegendmarker.cpp +3 -3

                 bool brushChanged = false;
                 bool penChanged = false;
-                if (m_item->pen() != m_barset->pen()) {
+                if (!m_customPen && (m_item->pen() != m_barset->pen())) {
                     m_item->setPen(m_barset->pen());
                     penChanged = true;
                 }
-                if (m_item->brush() != m_barset->brush()) {
+                if (!m_customBrush && (m_item->brush() != m_barset->brush())) {
                     m_item->setBrush(m_barset->brush());
                     brushChanged = true;
                 }
-                if (m_item->label() != m_barset->label()) {
+                if (!m_customLabel && (m_item->label() != m_barset->label())) {
                     m_item->setLabel(m_barset->label());
                     labelChanged = true;
                 }

src/legend/qlegendmarker.cpp +21 -3

             */
             void QLegendMarker::setLabel(const QString &label)
             {
-                d_ptr->m_item->setLabel(label);
+                if (label.isEmpty()) {
+                    d_ptr->m_customLabel = false;
+                } else {
+                    d_ptr->m_customLabel = true;
+                    d_ptr->m_item->setLabel(label);
+                }
             }
             /*!
               Returns the brush which is used to draw label.
             */
             void QLegendMarker::setPen(const QPen &pen)
             {
-                d_ptr->m_item->setPen(pen);
+                if (pen == QPen(Qt::NoPen)) {
+                    d_ptr->m_customPen = false;
+                } else {
+                    d_ptr->m_customPen = true;
+                    d_ptr->m_item->setPen(pen);
+                }
             }
             /*!
             */
             void QLegendMarker::setBrush(const QBrush &brush)
             {
-                d_ptr->m_item->setBrush(brush);
+                if (brush == QBrush(Qt::NoBrush)) {
+                    d_ptr->m_customBrush = false;
+                } else {
+                    d_ptr->m_customBrush = true;
+                    d_ptr->m_item->setBrush(brush);
+                }
             }
             /*!
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QLegendMarkerPrivate::QLegendMarkerPrivate(QLegendMarker *q, QLegend *legend) :
                 m_legend(legend),
+                m_customLabel(false),
+                m_customBrush(false),
+                m_customPen(false),
                 q_ptr(q)
             {
                 m_item = new LegendMarkerItem(this);

src/legend/qlegendmarker_p.h +3 0

             protected:
                 LegendMarkerItem *m_item;
                 QLegend *m_legend;
+                bool m_customLabel;
+                bool m_customBrush;
+                bool m_customPen;
             private:
                 QLegendMarker *q_ptr;

src/legend/qpielegendmarker.cpp +3 -3

                 bool brushChanged = false;
                 bool penChanged = false;
-                if (m_item->pen() != m_slice->pen()) {
+                if (!m_customPen && (m_item->pen() != m_slice->pen())) {
                     m_item->setPen(m_slice->pen());
                     penChanged = true;
                 }
-                if (m_item->brush() != m_slice->brush()) {
+                if (!m_customBrush && (m_item->brush() != m_slice->brush())) {
                     m_item->setBrush(m_slice->brush());
                     brushChanged = true;
                 }
-                if (m_item->label() != m_slice->label()) {
+                if (!m_customLabel && (m_item->label() != m_slice->label())) {
                     m_item->setLabel(m_slice->label());
                     labelChanged = true;
                 }

src/legend/qxylegendmarker.cpp +3 -3

                 bool labelChanged = false;
                 bool brushChanged = false;
-                if (m_item->label() != m_series->name()) {
+                if (!m_customLabel && (m_item->label() != m_series->name())) {
                     m_item->setLabel(m_series->name());
                     labelChanged = true;
                 }
                 if (m_series->type()== QAbstractSeries::SeriesTypeScatter)  {
-                    if (m_item->brush() != m_series->brush()) {
+                    if (!m_customBrush && (m_item->brush() != m_series->brush())) {
                         m_item->setBrush(m_series->brush());
                         brushChanged = true;
                     }
                 } else {
-                    if (m_item->brush().color() != m_series->pen().color()) {
+                    if (!m_customBrush && (m_item->brush().color() != m_series->pen().color())) {
                         m_item->setBrush(QBrush(m_series->pen().color()));
                         brushChanged = true;
                     }

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