HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r813:95eb00cb8ef8

src/barchart/barchartitem.cpp +4 -5

             {
                 connect(series, SIGNAL(showToolTip(QPoint,QString)), this, SLOT(showToolTip(QPoint,QString)));
                 connect(series, SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
-            //TODO:  connect(series,SIGNAL("position or size has changed"), this, SLOT(handleLayoutChanged()));
                 connect(series, SIGNAL(restructuredBar(int)), this, SLOT(handleModelChanged(int)));
                 setZValue(ChartPresenter::BarSeriesZValue);
                 dataChanged();
                     delete item;
                 m_bars.clear();
-                m_floatingValues.clear();
+                m_values.clear();
                 m_layout.clear();
                 // Create new graphic items for bars
                         QBarSet *set = m_series->barsetAt(s);
                         BarValue *value = new BarValue(*set, this);
                         childItems().append(value);
-                        m_floatingValues.append(value);
+                        m_values.append(value);
-                        connect(set, SIGNAL(toggleFloatingValues()), value, SLOT(toggleVisible()));
+                        connect(set,SIGNAL(valuesVisibleChanged(bool)),value,SLOT(valuesVisibleChanged(bool)));
                     }
                 }
             }
                     qreal yPos = height;
                     for (int set=0; set < m_series->barsetCount(); set++) {
                         qreal barHeight = m_series->valueAt(set, category) * scale;
-                        BarValue* value = m_floatingValues.at(itemIndex);
+                        BarValue* value = m_values.at(itemIndex);
                         QBarSet* barSet = m_series->barsetAt(set);

src/barchart/barchartitem_p.h +1 -1

                 // Not owned.
                 QBarSeries *m_series;
                 QList<Bar *> m_bars;
-                QList<BarValue *> m_floatingValues;
+                QList<BarValue *> m_values;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barvalue.cpp +3 -3

                 m_barSet(set),
                 m_textItem(new QGraphicsSimpleTextItem(this))
             {
+            //    connect(&set,SIGNAL(valuesVisibleChanged(bool)),value,SLOT(valuesVisibleChanged(bool)));
                 setVisible(false);
             }
                 return m_textItem->boundingRect();
             }
-            void BarValue::toggleVisible()
+            void BarValue::valuesVisibleChanged(bool visible)
             {
-                qDebug() << "toggle visible";
+                setVisible(visible);
-                setVisible(!isVisible());
             }
             #include "moc_barvalue_p.cpp"

src/barchart/barvalue_p.h +1 -1

                 QRectF boundingRect() const;
             public Q_SLOTS:
-                void toggleVisible();
+                void valuesVisibleChanged(bool visible);
             private:

src/barchart/percentbarchartitem.cpp +1 -1

                     qreal scale = (height / colSum);
                     for (int set=0; set < m_series->barsetCount(); set++) {
                         qreal barHeight = m_series->valueAt(set,category) * scale;
-                        BarValue* value = m_floatingValues.at(itemIndex);
+                        BarValue* value = m_values.at(itemIndex);
                         QBarSet* barSet = m_series->barsetAt(set);

src/barchart/qbarseries.cpp +8 0

                 return categories;
             }
+            void QBarSeries::setValuesVisible(bool visible)
+            {
+                foreach (QBarSet* s, barSets()) {
+                    s->setValuesVisible(visible);
+                }
+            }
             #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h +2 0

                 QList<QBarSet*> barSets() const;
                 QBarCategories categories() const;
+                void setValuesVisible(bool visible = true);
                 bool setModel(QAbstractItemModel *model);
                 QAbstractItemModel *modelExt() { return m_model; }
                 void setModelMapping(int categories, int bottomBoundry, int topBoundry, Qt::Orientation orientation = Qt::Vertical);

src/barchart/qbarset.cpp +8 0

             }
             /*!
+                Sets the visibility of barset values to \a visible
+            */
+            void QBarSet::setValuesVisible(bool visible)
+            {
+                emit valuesVisibleChanged(visible);
+            }
+            /*!
                 \internal \a pos
             */
             void QBarSet::barHoverEnterEvent(QPoint pos)

src/barchart/qbarset.h +3 -2

                 void setFloatingValuePen(const QPen &pen);
                 QPen floatingValuePen() const;
+                void setValuesVisible(bool visible = true);
             Q_SIGNALS:
                 void clicked(QString category, Qt::MouseButtons button);                         // Clicked and hover signals exposed to user
-                void toggleFloatingValues();
-                // TODO: Expose this to user or not?
                 // TODO: TO PIMPL --->
                 void structureChanged();
                 void valueChanged();
                 void hoverEnter(QPoint pos);
                 void hoverLeave();
                 void showToolTip(QPoint pos, QString tip);  // Private signal
+                void valuesVisibleChanged(bool visible);
                 // <--- TO PIMPL
             public Q_SLOTS:

src/barchart/stackedbarchartitem.cpp +1 -1

                     qreal yPos = height;
                     for (int set=0; set < m_series->barsetCount(); set++) {
                         qreal barHeight = m_series->valueAt(set, category) * scale;
-                        BarValue* value = m_floatingValues.at(itemIndex);
+                        BarValue* value = m_values.at(itemIndex);
                         QBarSet* barSet = m_series->barsetAt(set);

	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