HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r639:4f21953d9289

Changes background item...

Michal Klocek -

r639:4f21953d9289

parent child

Context file:

r639:4f21953d9289

Collapse all files

src/chartpresenter.cpp +2 -13

                 m_dataset(dataset),
                 m_chartTheme(0),
                 m_zoomIndex(0),
-                m_marginSize(0),
                 m_rect(QRectF(QPoint(0,0),m_chart->size())),
                 m_options(QChart::NoAnimation)
             {
             void ChartPresenter::handleGeometryChanged()
             {
                 QRectF rect(QPoint(0,0),m_chart->size());
-                rect.adjust(m_marginSize,m_marginSize, -m_marginSize, -m_marginSize);
+                rect.adjust(m_chart->padding(),m_chart->padding(), -m_chart->padding(), -m_chart->padding());
                 //rewrite zoom stack
                 for(int i=0;i<m_zoomStack.count();i++){
                 emit geometryChanged(m_rect);
             }
-            int ChartPresenter::margin() const
-                return m_marginSize;
-            void ChartPresenter::setMargin(int margin)
-                m_marginSize = margin;
             void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
             {
                 AxisItem* item = new AxisItem(axis,this,axis==m_dataset->axisX()?AxisItem::X_AXIS : AxisItem::Y_AXIS,m_chart);
             void ChartPresenter::zoomIn(const QRectF& rect)
             {
             	QRectF r = rect.normalized();
-            	r.translate(-m_marginSize, -m_marginSize);
+            	r.translate(-m_chart->padding(), -m_chart->padding());
             	if(m_animator) {
             		QPointF point(r.center().x()/geometry().width(),r.center().y()/geometry().height());

src/chartpresenter_p.h 0 -1

                 ChartDataSet* m_dataset;
                 ChartTheme *m_chartTheme;
                 int m_zoomIndex;
-                int m_marginSize;
                 QMap<QSeries*,ChartItem*> m_chartItems;
                 QMap<QChartAxis*,AxisItem*> m_axisItems;
                 QVector<QRectF> m_zoomStack;

src/qchart.cpp +39 -24

             #include "qlegend.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
+            #include "chartbackground_p.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
             #include <QDebug>
                 m_titleItem(0),
                 m_legend(new QLegend(this)),
                 m_dataset(new ChartDataSet(this)),
-                m_presenter(new ChartPresenter(this,m_dataset))
+                m_presenter(new ChartPresenter(this,m_dataset)),
+                m_padding(50),
+                m_backgroundPadding(10)
             {
                 connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),m_legend,SLOT(handleSeriesRemoved(QSeries*)));
             void QChart::createChartBackgroundItem()
             {
                 if(!m_backgroundItem) {
-                    m_backgroundItem = new QGraphicsRectItem(this);
+                    m_backgroundItem = new ChartBackground(this);
                     m_backgroundItem->setPen(Qt::NoPen);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             /*!
-                Returns the chart margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
-                \sa setMargin()
-            */
-            int QChart::margin() const
-                return m_presenter->margin();
-            /*!
-                Sets the chart \a margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
-                \sa margin()
-            */
-            void QChart::setMargin(int margin)
-                m_presenter->setMargin(margin);
-                updateLayout();
-            /*!
                 Sets the \a theme used by the chart for rendering the graphical representation of the data
                 \sa ChartTheme, chartTheme()
             */
             {
                 if(!m_rect.isValid()) return;
-                QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
+                QRectF rect = m_rect.adjusted(m_padding,m_padding, -m_padding, -m_padding);
                 // recalculate title position
                 if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
-                    m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
+                    m_titleItem->setPos(center.x(),m_rect.top()/2 + m_padding/2);
                 }
                 //recalculate background gradient
                 if (m_backgroundItem) {
-                    m_backgroundItem->setRect(rect);
+                    m_backgroundItem->setRect(m_rect.adjusted(m_backgroundPadding,m_backgroundPadding, -m_backgroundPadding, -m_backgroundPadding));
                 }
                 // recalculate legend position
                     m_legend->setPreferredLayout(QLegend::PreferredLayoutHorizontal);
                 }
             }
+            int QChart::padding() const
+            {
+                return m_padding;
+            }
+            void QChart::setPadding(int padding)
+            {
+                if(m_padding==padding){
+                m_padding = padding;
+                m_presenter->handleGeometryChanged();
+                updateLayout();
+                }
+            }
+            void QChart::setBackgroundPadding(int padding)
+            {
+                if(m_backgroundPadding!=padding){
+                m_backgroundPadding = padding;
+                updateLayout();
+                }
+            }
+            void QChart::setBackgroundDiameter(int diameter)
+            {
+                createChartBackgroundItem();
+                m_backgroundItem->setDimeter(diameter);
+                m_backgroundItem->update();
+            }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +11 -3

             class ChartDataSet;
             class ChartPresenter;
             class QLegend;
+            class ChartBackground;
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
             {
                 void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
-                void setMargin(int margin);
-                int margin() const;
                 void setChartTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme chartTheme() const;
                 // TODO: take (and give) legend instead of this.
                 QLegend* legend();
+                int padding() const;
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);
             private:
                 inline void createChartBackgroundItem();
                 inline void createChartTitleItem();
+                void setPadding(int padding);
+                void setBackgroundPadding(int padding);
+                void setBackgroundDiameter(int diameter);
                 void updateLayout();
             private:
                 Q_DISABLE_COPY(QChart)
-                QGraphicsRectItem* m_backgroundItem;
+                ChartBackground* m_backgroundItem;
                 QGraphicsSimpleTextItem* m_titleItem;
                 QRectF m_rect;
                 QLegend* m_legend;
                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
+                int m_padding;
+                int m_backgroundPadding;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.cpp +4 -13

                 setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setScene(m_scene);
-                m_chart->setMargin(50);
                 m_scene->addItem(m_chart);
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
             }
             }
             /*!
-                Returns the chart margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
-            */
-            int QChartView::margin() const
-                return m_chart->margin();
-            /*!
                 Sets the chart \a title. A description text that is drawn above the chart.
             */
             void QChartView::setChartTitle(const QString& title)
             {
                 if(m_rubberBand && m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {
-                    int margin = m_chart->margin();
+                    int padding = m_chart->padding();
-                    QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
+                    QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);
                     if (rect.contains(event->pos())) {
                         m_rubberBandOrigin = event->pos();
             void QChartView::mouseMoveEvent(QMouseEvent *event)
             {
                 if(m_rubberBand && m_rubberBand->isVisible()) {
-                    int margin = m_chart->margin();
+                    int padding = m_chart->padding();
-                    QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
+                    QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);
                     int width = event->pos().x() - m_rubberBandOrigin.x();
                     int height = event->pos().y() - m_rubberBandOrigin.y();
                     if(!m_verticalRubberBand) {

src/qchartview.h 0 -1

                 void addSeries(QSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
                 void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
-                int margin() const;
                 void setChartTitle(const QString& title);
                 QString chartTitle() const;

src/src.pro +5 -3

                 qchartview.cpp \
                 qseries.cpp \
                 qlegend.cpp \
-                legendmarker.cpp
+                legendmarker.cpp \
+                chartbackground.cpp
             PRIVATE_HEADERS += \
                 chartdataset_p.h \
                 chartitem_p.h \
                 chartpresenter_p.h \
                 charttheme_p.h \
                 domain_p.h \
-                legendmarker_p.h
+                legendmarker_p.h \
+                chartbackground_p.h
             PUBLIC_HEADERS += \
                 qchart.h \
                 qchartglobal.h \
                 qseries.h \
                 qchartview.h \
                 qlegend.h
             include(animations/animations.pri)
             include(axis/axis.pri)

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