HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1837:21f33dedea6d

src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +2 0

                  const qreal delta = m_rect.width()/(count);
                  qreal offset =-m_min-0.5;
+                 if(delta<1) return points;
                  if(offset<=0) {
                      offset = int(offset * m_rect.width()/(m_max - m_min))%int(delta) + delta;
                  }

src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +5 -2

              #include "chartpresenter_p.h"
              #include "qbarcategoryaxis_p.h"
              #include <qmath.h>
+             #include <QDebug>
              static int label_padding = 5;
                  const qreal delta = m_rect.height()/(count);
                  qreal offset = - m_min - 0.5;
+                 if(delta<1) return points;
                  if(offset<=0) {
                      offset = int(offset * m_rect.height()/(m_max - m_min))%int(delta) + delta;
                  }
                          height=labelItem->pos().y();
                      }
-                     m_minWidth+=rect.width();
-                     m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
+                     m_minWidth=qMax(rect.width()+label_padding,m_minWidth);
+                     m_minHeight+=rect.height();
                      if ((i+1)%2 && i>1) {
                          QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));

src/axis/categoryaxis/chartcategoryaxisx.cpp +1 -1

                      }
                      m_minWidth += rect.width();
-                     m_minHeight = qMax(rect.height(), m_minHeight);
+                     m_minHeight = qMax(rect.height()+ label_padding, m_minHeight);
                      if ((i + 1) % 2 && i > 1) {
                          QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i / 2 - 1));

src/axis/categoryaxis/chartcategoryaxisy.cpp +3 -2

              #include <QFontMetrics>
              #include <qmath.h>
              static int label_padding = 5;
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  m_minWidth = 0;
                  m_minHeight = 0;
-                 if(layout.isEmpty()) return;
+                 if(layout.isEmpty()) {
+                     return;
+                 }
                  QCategoryAxis *intervalAxis = qobject_cast<QCategoryAxis *>(m_chartAxis);

src/axis/chartaxis.cpp +1 0

                  QGraphicsSimpleTextItem item;
                  m_font = item.font();
              }
              ChartAxis::~ChartAxis()

src/chartlayout.cpp +15 -7

              #include "chartlayout_p.h"
              #include "chartpresenter_p.h"
+             #include "qlegend_p.h"
              #include "chartaxis_p.h"
-             #include <QDebug>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              m_marginBig(60),
              m_marginSmall(20),
              m_marginTiny(10),
-             m_chartMargins(QPointF(m_marginBig,m_marginBig),QPointF(m_marginBig,m_marginBig))
+             m_chartMargins(QPointF(m_marginBig,m_marginBig),QPointF(m_marginBig,m_marginBig)),
+             m_intialized(false)
              {
              }
                  QGraphicsLayout::setGeometry(rect);
+                 if(!m_intialized){
+                     m_presenter->setGeometry(rect);
+                     m_intialized=true;
+                 }
                  // check title size
                  QSize titleSize = QSize(0,0);
                  QLegend* legend = m_presenter->legend();
+                 Q_ASSERT(legend);
                  qreal titlePadding = m_chartMargins.top()/2;
                  QRectF chartMargins = m_chartMargins;
                  // recalculate legend position
-                 if (legend != 0 && legend->isVisible() && legend->isAttachedToChart()) {
+                 if ((legend->isAttachedToChart() && legend->isVisible())) {
                      // Reserve some space for legend
                      switch (legend->alignment()) {
                      }
                      case Qt::AlignBottom: {
                      	QSizeF legendSize = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(rect.width(),-1));
-                         int bottomMargin = m_marginTiny + m_marginSmall +  legendSize.height() + m_marginTiny + axisHeight;
+                         int bottomMargin = m_marginTiny + legendSize.height() + m_marginTiny + axisHeight;
                          chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(m_chartMargins.right(),bottomMargin));
                          m_legendMargins = QRect(QPoint(chartMargins.left(),rect.height()-bottomMargin + m_marginTiny + axisHeight),QPoint(chartMargins.right(),m_marginTiny + m_marginSmall));
                          titlePadding = chartMargins.top()/2;
                      }
                      case Qt::AlignLeft: {
                      	QSizeF legendSize = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(-1,rect.height()));
-                         int leftPadding = m_marginTiny + m_marginSmall + legendSize.width() + m_marginTiny + axisWidth;
+                         int leftPadding = m_marginTiny + legendSize.width() + m_marginTiny + axisWidth;
                          chartMargins = QRect(QPoint(leftPadding,m_chartMargins.top()),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
                          m_legendMargins = QRect(QPoint(m_marginTiny + m_marginSmall,chartMargins.top()),QPoint(rect.width()-leftPadding + m_marginTiny + axisWidth,chartMargins.bottom()));
                          titlePadding = chartMargins.top()/2;
                      }
                      case Qt::AlignRight: {
                      	QSizeF legendSize = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(-1,rect.height()));
-                         int rightPadding = m_marginTiny + m_marginSmall + legendSize.width() + m_marginTiny;
+                         int rightPadding = m_marginTiny + legendSize.width() + m_marginTiny;
                          chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(rightPadding,m_chartMargins.bottom()));
                          m_legendMargins = QRect(QPoint(rect.width()- rightPadding+ m_marginTiny ,chartMargins.top()),QPoint(m_marginTiny + m_marginSmall,chartMargins.bottom()));
                          titlePadding = chartMargins.top()/2;
                  }else if(chartRect.size().isEmpty()){
                      m_presenter->setGeometry(QRect(rect.width()/2,rect.height()/2,1,1));
                  }
              }

src/chartlayout_p.h +1 -2

                  int m_marginBig;
                  int m_marginSmall;
                  int m_marginTiny;
                  QRectF m_chartMargins;
                  QRectF m_legendMargins;
+                 bool m_intialized;
              };

src/legend/legendlayout.cpp +4 -3

              #include "chartpresenter_p.h"
              #include "legendmarker_p.h"
              #include "qlegend_p.h"
-             #include <QDebug>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              void LegendLayout::setGeometry(const QRectF& rect)
              {
-                 QGraphicsLayout::setGeometry(rect);
+                 m_legend->d_ptr->items()->setVisible(m_legend->isVisible());
                  if(m_legend->isAttachedToChart()) {
                      setAttachedGeometry(rect);
                  }
                  else {
                      setDettachedGeometry(rect);
                  }
+                 QGraphicsLayout::setGeometry(rect);
              }
              void LegendLayout::setAttachedGeometry(const QRectF& rect)

src/legend/qlegend.cpp +4 -4

               */
              void QLegend::hideEvent(QHideEvent *event)
              {
-                 QGraphicsWidget::hideEvent(event);
-                 d_ptr->m_presenter->layout()->invalidate();
+                d_ptr->m_presenter->layout()->invalidate();
+                QGraphicsWidget::hideEvent(event);
              }
              /*!
               */
              void QLegend::showEvent(QShowEvent *event)
              {
-                 QGraphicsWidget::showEvent(event);
-                 d_ptr->m_presenter->layout()->invalidate();
+                d_ptr->m_presenter->layout()->invalidate();
+                QGraphicsWidget::showEvent(event);
              }
              ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/legend/qlegend.h 0 -1

                  void setBackgroundVisible(bool visible = true);
                  bool isBackgroundVisible() const;
              protected:
                  void hideEvent(QHideEvent *event);
                  void showEvent(QShowEvent *event);

	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