HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r512:db1a02a52a65

better use of gradients in barcharts

sauimone -

r512:db1a02a52a65

parent child

Context file:

r512:db1a02a52a65

Collapse all files

examples/percentbarchart/main.cpp +1 0

                 QObject::connect(set1,SIGNAL(clicked(QString)),set1,SIGNAL(toggleFloatingValues()));
                 QObject::connect(set2,SIGNAL(clicked(QString)),set2,SIGNAL(toggleFloatingValues()));
                 QObject::connect(set3,SIGNAL(clicked(QString)),set3,SIGNAL(toggleFloatingValues()));
+                QObject::connect(set4,SIGNAL(clicked(QString)),set4,SIGNAL(toggleFloatingValues()));
                 //! [4]
                 //! [5]

src/barchart/barpresenter.cpp +4 -3

                     Separator* sep = mSeparators.at(s);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
+                    sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme
                     xPos += categoryWidth;
                 }
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
-                        // TODO: remove hard coding, apply layout
+                        QBarSet* barSet = mSeries->barsetAt(set);
-                        value->resize(100,50);
+                        value->resize(100,50);  // TODO: proper layout for this.
                         value->setPos(xPos, yPos-barHeight/2);
-                        value->setPen(QPen(QColor(255,255,255,255)));
+                        value->setPen(barSet->floatingValuePen());
                         if (mSeries->valueAt(set,category) != 0) {
                             value->setValueString(QString::number(mSeries->valueAt(set,category)));

src/barchart/barpresenterbase.cpp 0 -1

                 int count = mSeries->categoryCount() - 1;   // There is one less separator than columns
                 for (int i=0; i<count; i++) {
                     Separator* sep = new Separator(this);
-                    sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme
                     sep->setVisible(mSeries->separatorsVisible());
                     childItems().append(sep);
                     mSeparators.append(sep);

src/barchart/percentbarpresenter.cpp +3 -3

                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
-                        // TODO: remove hard coding, apply layout
+                        QBarSet* barSet = mSeries->barsetAt(set);
-                        value->resize(100,50);
+                        value->resize(100,50);  // TODO: proper layout for this.
                         value->setPos(xPos, yPos-barHeight/2);
-                        value->setPen(QPen(QColor(255,255,255,255)));
+                        value->setPen(barSet->floatingValuePen());
                         if (mSeries->valueAt(set,category) != 0) {
                             int p = mSeries->percentageAt(set,category) * 100;

src/barchart/qbarset.cpp +16 0

@@ -154,6 +154,22 QBrush QBarSet::brush() const
154	}	154	}
155		155
156	/*!	156	/*!
		157	Sets the pen for floating values that are drawn on top of this set
		158	*/
		159	void QBarSet::setFloatingValuePen(const QPen pen)
		160	{
		161	mFloatingValuePen = pen;
		162	}
		163
		164	/*!
		165	Returns the pen for floating values that are drawn on top of this set
		166	*/
		167	QPen QBarSet::floatingValuePen() const
		168	{
		169	return mFloatingValuePen;
		170	}
		171
		172	/*!
157	\internal \a pos	173	\internal \a pos
158	*/	174	*/
159	void QBarSet::barHoverEnterEvent(QPoint pos)	175	void QBarSet::barHoverEnterEvent(QPoint pos)

src/barchart/qbarset.h +4 -1

                 void setBrush(const QBrush brush);
                 QBrush brush() const;
+                void setFloatingValuePen(const QPen pen);
+                QPen floatingValuePen() const;
             Q_SIGNALS:
                 void clicked(QString category);                         // Clicked and hover signals exposed to user
                 void rightClicked(QString category);
                 QMap<QString,qreal> mMappedValues;
                 QPen mPen;
                 QBrush mBrush;
+                QPen mFloatingValuePen;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarpresenter.cpp +3 -3

                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
-                        // TODO: remove hard coding, apply layout
+                        QBarSet* barSet = mSeries->barsetAt(set);
-                        value->resize(100,50);
+                        value->resize(100,50);  // TODO: proper layout for this.
                         value->setPos(xPos, yPos-barHeight/2);
-                        value->setPen(QPen(QColor(255,255,255,255)));
+                        value->setPen(barSet->floatingValuePen());
                         if (mSeries->valueAt(set,category) != 0) {
                             value->setValueString(QString::number(mSeries->valueAt(set,category)));

src/charttheme.cpp +24 0

                     qreal pos = (qreal) i / (qreal) sets.count();
                     QColor c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
+                    // Pick label color as far as possible from bar color (within gradient).
+                    // 0.3 is magic number that was picked as value that gave enough contrast with icy theme gradient :)
+                    // TODO: better picking of label color?
+                    if (pos < 0.3) {
+                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 1);
+                    } else {
+                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 0);
+                    }
+                    sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }
                     qreal pos = (qreal) i / (qreal) sets.count();
                     QColor c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
+                    if (pos < 0.3) {
+                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 1);
+                    } else {
+                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 0);
+                    }
+                    sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }
                     qreal pos = (qreal) i / (qreal) sets.count();
                     QColor c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
+                    if (pos < 0.3) {
+                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 1);
+                    } else {
+                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 0);
+                    }
+                    sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }

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