HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r616:4f2467dfeb41

legend layouting change

sauimone -

r616:4f2467dfeb41

parent child

Context file:

r616:4f2467dfeb41

Collapse all files

src/barchart/barpresenterbase.cpp +1 -1

              BarPresenterBase::~BarPresenterBase()
              {
                  disconnect(this,SLOT(showToolTip(QPoint,QString)));
-                 disconnect(this,SLOT(enableSeparators(bool)));
+             //    disconnect(this,SLOT(enableSeparators(bool)));
              }
              void BarPresenterBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)

src/legendmarker.cpp +5 -1

              #include "legendmarker_p.h"
              #include <qpieslice.h>
              #include <qbarset.h>
+             #include <qxyseries.h>
              #include <QPainter>
              #include <QGraphicsSceneEvent>
                  mMarkerBoundingRect = QRectF(x,y,markerSize.width(),markerSize.height());
                  mTextItem.setPos(mBoundingRect.x() + markerSize.width() + 10, y );
+                 qDebug() << "text item bound:" << mTextItem.boundingRect();
              }
              void LegendMarker::setBrush(const QBrush brush)
                  switch (mType)
                  {
                  case LegendMarkerTypeSeries: {
-                     // TODO:
+                     QXYSeries* s = static_cast<QXYSeries*> (mSeries);
+                     setBrush(s->brush());
+                     setName(s->name());
                      break;
                  }
                  case LegendMarkerTypeBarset: {

src/qchart.cpp +4 -1

                                                          rect.height() + margin() + margin()/2,
                                                          -margin(),
                                                          -margin()/2 + m_legend->minimumSize().height()));
-                     m_legend->handleGeometryChanged(boundingRect);
+             //        m_legend->handleGeometryChanged(boundingRect);
+                     QRectF br(0,0,margin(),m_rect.height());
+                     m_legend->handleGeometryChanged(br);
+                     m_legend->setPreferredLayout(QLegend::PreferredLayoutVertical);
                  }
              }
              #include "moc_qchart.cpp"

src/qchart.h +1 0

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

src/qlegend.cpp +46 -7

                  ,mBoundingRect(0,0,1,1)
                  ,mBackgroundBrush(Qt::darkGray)     // TODO: from theme?
                  ,mMinimumSize(50,20)                // TODO: magic numbers
+                 ,mMaximumSize(150,100)
+                 ,mPreferredLayout(QLegend::PreferredLayoutVertical)
              {
                  setVisible(false);
              }
                  return mBackgroundBrush;
              }
+             void QLegend::setPreferredLayout(QLegend::PreferredLayout preferred)
+             {
+                 mPreferredLayout = preferred;
+                 layoutChanged();
+             }
              QSizeF QLegend::minimumSize() const
              {
                  return mMinimumSize;
                      return;
                  }
-                 qreal steps = mMarkers.count();
-                 qreal xStep = mBoundingRect.width() / steps;
-                 qreal x=mBoundingRect.x();
-                 qreal y = mBoundingRect.y() + (mBoundingRect.height()/4);
-                 foreach (LegendMarker* m, mMarkers) {
-                     m->setBoundingRect(QRectF(x,y,xStep,mBoundingRect.height()/2));
-                     x += xStep;
+                 // Limit legend size to maximum.
+                 QSizeF size = mBoundingRect.size();
+                 // TODO: grid layout
+                 switch (mPreferredLayout)
+                 {
+                 case QLegend::PreferredLayoutHorizontal: {
+                     qreal steps = mMarkers.count();
+                     qreal xStep = size.width() / (steps+1);
+                     qreal x = mBoundingRect.x() + xStep/2;
+                     qreal y = mBoundingRect.y();   // Half of legend marker min size
+                     foreach (LegendMarker* m, mMarkers) {
+                         m->setBoundingRect(QRectF(x,y,xStep,size.height()/2));
+                         x += xStep;
+                     }
+                     break;
                  }
+                 case QLegend::PreferredLayoutVertical: {
+                     // Limit markers to bounding rect size.
+                     if (size.width() > mBoundingRect.width()) {
+                         size.setWidth(mBoundingRect.width());
+                     }
+                     qreal steps = mMarkers.count();
+                     qreal yStep = size.height() / (steps+1);
+                     qreal x = mBoundingRect.x();
+                     qreal y = mBoundingRect.y() + yStep/2;
+                     foreach (LegendMarker* m, mMarkers) {
+                         m->setBoundingRect(QRectF(x,y,size.width(),yStep));
+                         y += yStep;
+                     }
+                     break;
+                 }
+                 default: {
+                     break;
+                 }
+                 }
              }
              #include "moc_qlegend.cpp"

src/qlegend.h +12 -1

                  Q_OBJECT
              public:
+                 enum PreferredLayout {
+                     PreferredLayoutHorizontal,
+                     PreferredLayoutVertical
+                 };
                  explicit QLegend(QGraphicsItem *parent = 0);
                  void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                  void setBackgroundBrush(const QBrush& brush);
                  QBrush backgroundBrush() const;
+                 void setPreferredLayout(QLegend::PreferredLayout preferred);
                  QSizeF minimumSize() const;
                  void setMinimumSize(const QSizeF size);
+                 QSizeF maximumSize() const;
+                 void setMaximumSize(const QSizeF size);
              signals:
                  // for interactions.
                  void appendMarkers(QBarSeries* series);
                  void appendMarkers(QPieSeries* series);
                  void deleteMarkers(QSeries* series);
-                 void layoutChanged();
+                 void layoutChanged();    // TODO: rename this to layoutChanged and remove original layoutChanged, when ready
                  // <--- PIMPL
                  QBrush mBackgroundBrush;
                  QSizeF mMinimumSize;
+                 QSizeF mMaximumSize;
+                 QLegend::PreferredLayout mPreferredLayout;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/qseries.h 0 -8

                      SeriesTypeSpline
                  };
-                 // Helper class to contain legend and color for it
-                 // TODO: This is actually quite close to current LegendMarker.. combine them?
-             /*    class LegendEntry {
-                     public:
-                     QString mName;
-                     /QBrush mBrush;
-                 };*/
              protected:
                  QSeries(QObject *parent = 0) : QObject(parent) {m_model = NULL;}

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