![Peter Hartmann](/assets/img/avatar_default.png)
* Add IOT dashboard example * Add images * more content * add pie chart * Add skin factories etc. * more work on the pie chart * Try to use quick shapes * Revert "Try to use quick shapes" This reverts commit df6b5b22a339173d2a70ed85744b598811c26b30. Doesn't work that easily unfortunately. * implement design * Add fonts; for now as a resource We should use fontconfig of course later * improve menu bar * implement top bar * use QNanoPainter for circular graphs * Revert "use QNanoPainter for circular graphs" This reverts commit ba0263cb1c19462cc41063ec7087c95e176c8293. Try with QQuickPaintedItem instead for now. * use painted items for circular bar graphs (for now) * use different colors * use some gradients all of this is very hackish still * add to top bar * fix fonts and time display * implement usage * implement indoor temperature * implement Humidity * implement My Devices * fix opacity issue with devices * make icons quadratic with some quick fixes as usual * Add diagram * try to smooth out curves * Add diagram caption * use tiny font * make caption smaller * add wekdays * add grid lines * fix my devices * add light intensity * add box around each section * rename Card to Box * Put indoor temperature inside a box * put Humidity in a box * put the rest in a box * some small stuff * add kirigami code * something works somehow * maybe we don't need our own class still some work to do, but the main thing works * add shadow from outside ... because the class is not a QskControl * fine-tune the layout * cross compilation: Make sure examples find libraries at link time * fix compilation for embedded target * add night time skin * add new button class to better style it * more hints for the night time skin * change hints for dimmer * change hints for progress bars * Use animator for light dimmer * use animator for progress bars * Add Kirigami code It was on oversight that this was forgotten earlier. We could of course strip this down a lot to the part that we are actually using (i.e. the shadowed rectangle). * fix build with new QSkinny version * fix paddings, something in the API changed * fix stretch factors * fix build with new version * clang tidy fixes * fix unused parameter warnings should clean this up properly * beautify example * use astyle * style menu bar properly * fix warning * more size hints * refactor skins * more skin hints * graphic label skin hints * menu item states instead of own API * main grid box styling * top bar styling * fix build * style round progress bars * style time * style indoor temperature and humidity * simplify temperature and humidity * style some more * style My Devices section * style My Devices some more * fix styles when switching between them * style diagram * style more elements inside diagram * more diagram style * fix skin changes * style light intensity * Fix Humidity * fix light intensity layout and other stuff * style light intensity * style button value label * style round button * style button boxes some more * style menu bar top label * style menu bar icons * remove ShadowBox, it is not used * style shadow boxes * remove QskShadowedRectangle We are not using it * style usage spacer * fine tune * Refactor diagram before replacing it * Add Diagram drawn with OpenGL * use new Diagram class * Support more than one data point in a diagram * change data points and colors a bit * position caption box * adapt the spline to show nice curves * remove boost::math dependency We just hardcode the values here so we can get rid of the dependency. * Remove kirigami code that we don't need We only need the shadow * move kirigami code * rename header guards * add license headers * rename some classes
160 lines
5.5 KiB
C++
160 lines
5.5 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright 2021 Edelhirsch Software GmbH. All rights reserved.
|
|
**
|
|
** Redistribution and use in source and binary forms, with or without
|
|
** modification, are permitted provided that the following conditions are
|
|
** met:
|
|
**
|
|
** * Redistributions of source code must retain the above copyright
|
|
** notice, this list of conditions and the following disclaimer.
|
|
** * Redistributions in binary form must reproduce the above copyright
|
|
** notice, this list of conditions and the following disclaimer in
|
|
** the documentation and/or other materials provided with the
|
|
** distribution.
|
|
** * Neither the name of the copyright holder nor the names of its
|
|
** contributors may be used to endorse or promote products derived
|
|
** from this software without specific prior written permission.
|
|
**
|
|
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "PieChartPainted.h"
|
|
|
|
#include <QskAnimator.h>
|
|
#include <QskBox.h>
|
|
#include <QskRgbValue.h>
|
|
#include <QskSetup.h>
|
|
#include <QskSkin.h>
|
|
#include <QskTextLabel.h>
|
|
|
|
#include <QFontMetricsF>
|
|
#include <QGuiApplication>
|
|
#include <QQuickPaintedItem>
|
|
#include <QQuickWindow>
|
|
|
|
QSK_SUBCONTROL( PieChartPainted, Panel )
|
|
|
|
namespace
|
|
{
|
|
QColor invertedColor( const QColor& c )
|
|
{
|
|
QColor ret = { 255 - c.red(), 255 - c.green(), 255 - c.blue()};
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
// ### There must be an easier way to do this
|
|
class ProgressBarAnimator : public QskAnimator
|
|
{
|
|
public:
|
|
ProgressBarAnimator( PieChartPainted* pieChart, CircularProgressBar* progressBar )
|
|
: m_pieChart( pieChart )
|
|
, m_progressBar( progressBar )
|
|
{
|
|
QQuickWindow* w = static_cast<QQuickWindow*>( qGuiApp->allWindows().at( 0 ) );
|
|
setWindow( w );
|
|
setDuration( 500 );
|
|
setEasingCurve( QEasingCurve::Linear );
|
|
setAutoRepeat( false );
|
|
}
|
|
|
|
void setup() override
|
|
{
|
|
m_backgroundColor = m_pieChart->color( PieChartPainted::Panel );
|
|
m_ringGradient = m_progressBar->ringGradient();
|
|
}
|
|
|
|
void advance( qreal value ) override
|
|
{
|
|
const QColor c = m_backgroundColor;
|
|
const QColor c2 = invertedColor( c );
|
|
const QColor newColor = QskRgb::interpolated( c2, c, value );
|
|
m_progressBar->setBackgroundColor( newColor );
|
|
|
|
QRadialGradient gradient = m_ringGradient;
|
|
QRadialGradient newGradient = gradient;
|
|
|
|
for( const QGradientStop& stop : gradient.stops() )
|
|
{
|
|
QColor c = stop.second;
|
|
QColor c2 = invertedColor( c );
|
|
const QColor newColor = QskRgb::interpolated( c, c2, value );
|
|
newGradient.setColorAt( stop.first, newColor );
|
|
}
|
|
|
|
m_progressBar->setRingGradient( newGradient );
|
|
m_progressBar->update();
|
|
}
|
|
|
|
private:
|
|
QColor m_backgroundColor;
|
|
QRadialGradient m_ringGradient;
|
|
PieChartPainted* m_pieChart;
|
|
CircularProgressBar* m_progressBar;
|
|
};
|
|
|
|
PieChartPainted::PieChartPainted( const QColor& color, const QskGradient& gradient, int progress, int /*value*/, QQuickItem* parent )
|
|
: QskControl( parent )
|
|
, m_color( color )
|
|
, m_gradient( gradient )
|
|
, m_progressBar( new CircularProgressBar( gradient, progress, this ) )
|
|
, m_progressLabel( new QskTextLabel( this ) )
|
|
, m_animator( new ProgressBarAnimator( this, m_progressBar ) )
|
|
{
|
|
setAutoLayoutChildren( true );
|
|
|
|
auto progressText = QString::number( progress ) + " %";
|
|
m_progressLabel->setText( progressText );
|
|
m_progressLabel->setFontRole( QskSkin::SmallFont );
|
|
m_progressLabel->setTextColor( color );
|
|
|
|
const QColor c = this->color( Panel );
|
|
m_progressBar->setBackgroundColor( c );
|
|
|
|
connect( qskSetup, &QskSetup::skinChanged, [this]()
|
|
{
|
|
m_animator->start();
|
|
} );
|
|
}
|
|
|
|
QskAspect::Subcontrol PieChartPainted::effectiveSubcontrol( QskAspect::Subcontrol subControl ) const
|
|
{
|
|
if( subControl == QskBox::Panel )
|
|
{
|
|
return PieChartPainted::Panel;
|
|
}
|
|
|
|
return subControl;
|
|
}
|
|
|
|
QSizeF PieChartPainted::contentsSizeHint( Qt::SizeHint /*sizeHint*/, const QSizeF& /*size*/ ) const
|
|
{
|
|
return {57, 57};
|
|
}
|
|
|
|
void PieChartPainted::updateLayout()
|
|
{
|
|
m_progressBar->setContentsSize( size().toSize() );
|
|
m_progressBar->update();
|
|
|
|
auto rect = contentsRect();
|
|
QFontMetricsF progressMetrics( m_progressLabel->effectiveFont( QskTextLabel::Text ) );
|
|
auto textWidth = progressMetrics.width( m_progressLabel->text() );
|
|
auto posX = rect.width() / 2 - textWidth / 2;
|
|
auto posY = rect.height() / 2 - progressMetrics.height() / 2;
|
|
m_progressLabel->setPosition( {posX, posY} );
|
|
m_progressLabel->setFixedWidth( textWidth );
|
|
}
|