c199a3bb59
* 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
100 lines
2.0 KiB
C++
100 lines
2.0 KiB
C++
/******************************************************************************
|
|
* QSkinny - Copyright (C) 2021 Uwe Rathmann
|
|
* This file may be used under the terms of the QSkinny License, Version 1.0
|
|
*****************************************************************************/
|
|
|
|
#include "Diagram.h"
|
|
|
|
#include <QVectorIterator>
|
|
|
|
class Diagram::PrivateData
|
|
{
|
|
public:
|
|
PrivateData()
|
|
{
|
|
}
|
|
|
|
QVector<QVector<QPointF> > dataPoints;
|
|
int xGridLines = -1;
|
|
qreal yMax = -1;
|
|
Qsk::Position position = Qsk::Bottom;
|
|
QVector<Types> types;
|
|
};
|
|
|
|
QSK_SUBCONTROL( Diagram, Chart )
|
|
QSK_SUBCONTROL( Diagram, Segments )
|
|
QSK_SUBCONTROL( Diagram, ChartLine1 )
|
|
QSK_SUBCONTROL( Diagram, ChartArea1 )
|
|
QSK_SUBCONTROL( Diagram, ChartLine2 )
|
|
QSK_SUBCONTROL( Diagram, ChartArea2 )
|
|
QSK_SUBCONTROL( Diagram, ChartLine3 )
|
|
QSK_SUBCONTROL( Diagram, ChartArea3 )
|
|
|
|
Diagram::Diagram( QQuickItem* parent )
|
|
: Inherited( parent )
|
|
, m_data( new PrivateData() )
|
|
{
|
|
}
|
|
|
|
Diagram::~Diagram()
|
|
{
|
|
}
|
|
|
|
QVector< QVector<QPointF> > Diagram::dataPoints() const
|
|
{
|
|
return m_data->dataPoints;
|
|
}
|
|
|
|
void Diagram::addDataPoints( const QVector<QPointF>& dataPoints, const Types& types )
|
|
{
|
|
m_data->dataPoints.append( dataPoints );
|
|
m_data->types.append( types );
|
|
}
|
|
|
|
Diagram::Types Diagram::typesAt( uint pos ) const
|
|
{
|
|
return m_data->types.at( pos );
|
|
}
|
|
|
|
qreal Diagram::yMax() const
|
|
{
|
|
return m_data->yMax;
|
|
}
|
|
|
|
void Diagram::setYMax( qreal yMax )
|
|
{
|
|
m_data->yMax = yMax;
|
|
}
|
|
|
|
int Diagram::xGridLines() const
|
|
{
|
|
return m_data->xGridLines;
|
|
}
|
|
|
|
void Diagram::setXGridLines( int lines )
|
|
{
|
|
m_data->xGridLines = lines;
|
|
}
|
|
|
|
Qsk::Position Diagram::chartPosition() const
|
|
{
|
|
return m_data->position;
|
|
}
|
|
|
|
void Diagram::setChartPosition( Qsk::Position position )
|
|
{
|
|
m_data->position = position;
|
|
}
|
|
|
|
QSizeF Diagram::contentsSizeHint( Qt::SizeHint which, const QSizeF& ) const
|
|
{
|
|
if( which != Qt::PreferredSize )
|
|
{
|
|
return QSizeF();
|
|
}
|
|
|
|
return {};
|
|
}
|
|
|
|
#include "moc_Diagram.cpp"
|