HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1001:81238c98c2aa

Added drop shadow effect for light themes

Tero Ahola -

r1001:81238c98c2aa

parent child

Context file:

r1001:81238c98c2aa

src/chartbackground.cpp +20 -2

             #include <QPen>
             #include <QBrush>
             #include <QPainter>
+            #include <QGraphicsDropShadowEffect>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartBackground::ChartBackground(QGraphicsItem* parent):QGraphicsRectItem(parent),
+            ChartBackground::ChartBackground(QGraphicsItem* parent) :
-            m_diameter(15)
+                QGraphicsRectItem(parent),
+                m_diameter(15),
+                m_dropShadow(0)
             {
             }
             }
+            void ChartBackground::setDropShadowEnabled(bool enabled)
+            {
+                if (enabled) {
+                    if (!m_dropShadow) {
+                        m_dropShadow = new QGraphicsDropShadowEffect();
+                        m_dropShadow->setBlurRadius(10);
+                        m_dropShadow->setOffset(5, 5);
+                        setGraphicsEffect(m_dropShadow);
+                    }
+                } else {
+                    delete m_dropShadow;
+                    m_dropShadow = 0;
+                }
+            }
             void ChartBackground::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                Q_UNUSED(option);

src/chartbackground_p.h +5 -3

             #include "qchartglobal.h"
             #include <QGraphicsRectItem>
+            class QGraphicsDropShadowEffect;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartBackground: public QGraphicsRectItem
                 void setDimeter(int dimater);
                 int diameter() const;
+                void setDropShadowEnabled(bool enabled);
+                bool isDropShadowEnabled() {return m_dropShadow != 0;}
             protected:
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 int roundness(qreal size) const;
             private:
-                 int m_diameter;
+                int m_diameter;
+                QGraphicsDropShadowEffect *m_dropShadow;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/charttheme.cpp +3 -1

             #include "charttheme_p.h"
             #include "qchart.h"
+            #include "qchart_p.h"
             #include "qchartview.h"
             #include "qlegend.h"
             #include "qchartaxis.h"
                 m_backgroundShadesPen(Qt::NoPen),
                 m_backgroundShadesBrush(Qt::NoBrush),
                 m_backgroundShades(BackgroundShadesNone),
+                m_backgroundDropShadowEnabled(false),
                 m_gridLinePen(QPen(QRgb(0x000000))),
                 m_force(false)
             {
                     chart->setBackgroundBrush(m_chartBackgroundGradient);
                 chart->setTitleFont(m_masterFont);
                 chart->setTitleBrush(m_titleBrush);
+                chart->setBackgroundDropShadowEnabled(m_backgroundDropShadowEnabled);
             }
             void ChartTheme::decorate(QLegend *legend)
                     legend->setPen(Qt::NoPen);
                 }
                 if (brush == legend->brush() ||  m_force) {
                     legend->setBrush(m_chartBackgroundGradient);
                 }

src/charttheme_p.h +1 0

                 QPen m_backgroundShadesPen;
                 QBrush m_backgroundShadesBrush;
                 BackgroundShadesMode m_backgroundShades;
+                bool m_backgroundDropShadowEnabled;
                 QPen m_gridLinePen;
                 bool m_force;
             };

src/qchart.cpp +17 -1

@@ -379,10 +379,26 void QChart::setBackgroundVisible(bool visible)
379	bool QChart::isBackgroundVisible() const	379	bool QChart::isBackgroundVisible() const
380	{	380	{
381	//TODO: refactor me	381	//TODO: refactor me
382	if (!d_ptr->m_presenter->m_backgroundItem) ~~return~~ ~~false~~;	382	if (!d_ptr->m_presenter->m_backgroundItem)
		383	return false;
		384
383	return d_ptr->m_presenter->m_backgroundItem->isVisible();	385	return d_ptr->m_presenter->m_backgroundItem->isVisible();
384	}	386	}
385		387
		388	void QChart::setBackgroundDropShadowEnabled(bool enabled)
		389	{
		390	d_ptr->m_presenter->createChartBackgroundItem();
		391	d_ptr->m_presenter->m_backgroundItem->setDropShadowEnabled(enabled);
		392	}
		393
		394	bool QChart::isBackgroundDropShadowEnabled() const
		395	{
		396	if (!d_ptr->m_presenter->m_backgroundItem)
		397	return false;
		398
		399	return d_ptr->m_presenter->m_backgroundItem->isDropShadowEnabled();
		400	}
		401
386	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	402	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
387		403
388	QChartPrivate::QChartPrivate():	404	QChartPrivate::QChartPrivate():

src/qchart.h +2 -1

                 QBrush backgroundBrush() const;
                 void setBackgroundPen(const QPen &pen);
                 QPen backgroundPen() const;
                 void setBackgroundVisible(bool visible = true);
                 bool isBackgroundVisible() const;
+                void setBackgroundDropShadowEnabled(bool enabled = true);
+                bool isBackgroundDropShadowEnabled() const;
                 void setAnimationOptions(AnimationOptions options);
                 AnimationOptions animationOptions() const;

src/themes/chartthemeblueicy_p.h +1 0

                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
+                    m_backgroundDropShadowEnabled = true;
                     // Axes and other
                     m_titleBrush = QBrush(QRgb(0x404044));

src/themes/chartthemehighcontrast_p.h +1 0

                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
+                    m_backgroundDropShadowEnabled = true;
                     // Axes and other
                     m_titleBrush = QBrush(QRgb(0x181818));

src/themes/chartthemelight_p.h +1 0

                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
+                    m_backgroundDropShadowEnabled = true;
                     // Axes and other
                     m_axisLinePen = QPen(0xd6d6d6);

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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