HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2864:47032ec192b3

Add support for showing tooltips when the legend text is truncated...

Andy Shaw -

r2864:47032ec192b3

parent child

Context file:

r2864:47032ec192b3

Collapse all files

src/charts/legend/legendmarkeritem.cpp +16 -2

                  qreal width = rect.width();
                  qreal x = m_margin + m_markerRect.width() + m_space + m_margin;
                  QRectF truncatedRect;
+                 const QString html = ChartPresenter::truncatedText(m_textItem->font(), m_label, qreal(0.0),
+                                                                    width - x, rect.height(), truncatedRect);
+                 m_textItem->setHtml(html);
+                 if (m_marker->m_legend->showToolTips() && html != m_label)
+                     m_textItem->setToolTip(m_label);
+                 else
+                     m_textItem->setToolTip(QString());
-                 m_textItem->setHtml(ChartPresenter::truncatedText(m_textItem->font(), m_label, qreal(0.0),
-                                                                   width - x, rect.height(), truncatedRect));
                  m_textItem->setTextWidth(truncatedRect.width());
                  qreal y = qMax(m_markerRect.height() + 2 * m_margin, truncatedRect.height() + 2 * m_margin);
                  emit m_marker->q_ptr->hovered(false);
              }
+             QString LegendMarkerItem::displayedLabel() const
+             {
+                 return m_textItem->toHtml();
+             }
+             void LegendMarkerItem::setToolTip(const QString &tip)
+             {
+                 m_textItem->setToolTip(tip);
+             }
              #include "moc_legendmarkeritem_p.cpp"

src/charts/legend/legendmarkeritem_p.h +2 0

                  void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
                  void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+                 QString displayedLabel() const;
+                 void setToolTip(const QString &tooltip);
              protected:
                  QLegendMarkerPrivate *m_marker; // Knows
                  QRectF m_markerRect;

src/charts/legend/qlegend.cpp +54 -2

              */
              /*!
+                 \property QLegend::showToolTips
+                 Whether tooltips are shown when the text is truncated. This is false by default.
+                 This will not have any effect when used in QML.
+             */
+             /*!
+                 \qmlproperty bool Legend::showToolTips
+                 Whether tooltips are shown when the text is truncated. This is false by default.
+                 This currently has no effect as there is no support for tooltips in QML.
+             */
+             /*!
                  \fn void QLegend::backgroundVisibleChanged(bool)
                  The visibility of the legend background changed to \a visible.
              */
                  The use of reverse order for the markers in legend is changed to \a reverseMarkers.
              */
+             /*!
+                 \fn void QLegend::showToolTipsChanged(bool showToolTips)
+                 This signal is emitted when the visibility of tooltips is changed to \a showToolTips.
+             */
              QLegend::QLegend(QChart *chart): QGraphicsWidget(chart),
                  d_ptr(new QLegendPrivate(chart->d_ptr->m_presenter, chart, this))
              {
              }
              /*!
+                 Returns whether the tooltips are shown or not for the legend labels
+                 when they are elided.
+             */
+             bool QLegend::showToolTips() const
+             {
+                 return d_ptr->m_showToolTips;
+             }
+             /*!
+                 When \a show is true, the legend labels will show a tooltip when
+                 the mouse hovers over them if the label itself is shown elided.
+                 This is false by default.
+             */
+             void QLegend::setShowToolTips(bool show)
+             {
+                 if (d_ptr->m_showToolTips != show) {
+                     d_ptr->m_showToolTips = show;
+                     d_ptr->updateToolTips();
+                     emit showToolTipsChanged(show);
+                 }
+             }
+             /*!
               \internal \a event see QGraphicsWidget for details
               */
              void QLegend::hideEvent(QHideEvent *event)
                    m_diameter(5),
                    m_attachedToChart(true),
                    m_backgroundVisible(false),
-                   m_reverseMarkers(false)
+                   m_reverseMarkers(false),
+                   m_showToolTips(false)
              {
                  m_items->setHandlesChildEvents(false);
              }
                  }
              }
+             void QLegendPrivate::updateToolTips()
+             {
+                 foreach (QLegendMarker *m, m_markers) {
+                     if (m->d_ptr->m_item->displayedLabel() != m->label())
+                         m->d_ptr->m_item->setToolTip(m->label());
+                     else
+                         m->d_ptr->m_item->setToolTip(QString());
+                 }
+             }
              #include "moc_qlegend.cpp"
              #include "moc_qlegend_p.cpp"

src/charts/legend/qlegend.h +4 0

                  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)
+                 Q_PROPERTY(bool showToolTips READ showToolTips WRITE setShowToolTips NOTIFY showToolTipsChanged)
              private:
                  explicit QLegend(QChart *chart);
                  bool reverseMarkers();
                  void setReverseMarkers(bool reverseMarkers = true);
+                 bool showToolTips() const;
+                 void setShowToolTips(bool show);
              protected:
                  void hideEvent(QHideEvent *event);
                  void showEvent(QShowEvent *event);
                  void fontChanged(QFont font);
                  void labelColorChanged(QColor color);
                  void reverseMarkersChanged(bool reverseMarkers);
+                 void showToolTipsChanged(bool showToolTips);
              private:
                  QScopedPointer<QLegendPrivate> d_ptr;

src/charts/legend/qlegend_p.h +2 0

                  void addMarkers(QList<QLegendMarker *> markers);
                  void removeMarkers(QList<QLegendMarker *> markers);
                  void decorateMarkers(QList<QLegendMarker *> markers);
+                 void updateToolTips();
              private:
                  QLegend *q_ptr;
                  bool m_attachedToChart;
                  bool m_backgroundVisible;
                  bool m_reverseMarkers;
+                 bool m_showToolTips;
                  QList<QLegendMarker *> m_markers;
                  QList<QAbstractSeries *> m_series;

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