![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
183 lines
4.9 KiB
C++
183 lines
4.9 KiB
C++
/******************************************************************************
|
|
* QSkinny - Copyright (C) 2021 Uwe Rathmann
|
|
* This file may be used under the terms of the QSkinny License, Version 1.0
|
|
*****************************************************************************/
|
|
|
|
#include "DiagramSkinlet.h"
|
|
#include "Diagram.h"
|
|
#include "nodes/DiagramDataNode.h"
|
|
#include "nodes/DiagramSegmentsNode.h"
|
|
|
|
namespace
|
|
{
|
|
QskAspect::Subcontrol areaForIndex( int i )
|
|
{
|
|
switch( i )
|
|
{
|
|
case 1:
|
|
return Diagram::ChartArea2;
|
|
|
|
case 2:
|
|
return Diagram::ChartArea3;
|
|
|
|
default:
|
|
return Diagram::ChartArea1;
|
|
}
|
|
}
|
|
|
|
QskAspect::Subcontrol lineForIndex( int i )
|
|
{
|
|
switch( i )
|
|
{
|
|
case 1:
|
|
return Diagram::ChartLine2;
|
|
|
|
case 2:
|
|
return Diagram::ChartLine3;
|
|
|
|
default:
|
|
return Diagram::ChartLine1;
|
|
}
|
|
}
|
|
}
|
|
|
|
DiagramSkinlet::DiagramSkinlet( QskSkin* skin )
|
|
: QskSkinlet( skin )
|
|
{
|
|
setNodeRoles( { ChartRole, SeparatorRole } );
|
|
}
|
|
|
|
DiagramSkinlet::~DiagramSkinlet()
|
|
{
|
|
}
|
|
|
|
QRectF DiagramSkinlet::subControlRect(
|
|
const QskSkinnable* skinnable, const QRectF& contentsRect,
|
|
QskAspect::Subcontrol subControl ) const
|
|
{
|
|
if( subControl == Diagram::Chart )
|
|
{
|
|
return contentsRect;
|
|
}
|
|
|
|
return Inherited::subControlRect( skinnable, contentsRect, subControl );
|
|
}
|
|
|
|
QSGNode* DiagramSkinlet::updateSubNode(
|
|
const QskSkinnable* skinnable, quint8 nodeRole, QSGNode* node ) const
|
|
{
|
|
const auto discharge = static_cast< const Diagram* >( skinnable );
|
|
|
|
switch( nodeRole )
|
|
{
|
|
case ChartRole:
|
|
{
|
|
return updateChartNode( discharge, node );
|
|
}
|
|
|
|
case SeparatorRole:
|
|
{
|
|
return updateSeparatorNode( discharge, node );
|
|
}
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
QSGNode* DiagramSkinlet::updateChartNode( const Diagram* diagram, QSGNode* node ) const
|
|
{
|
|
if( node == nullptr )
|
|
{
|
|
node = new DiagramDataNode;
|
|
}
|
|
|
|
using Q = Diagram;
|
|
const QRectF rect = diagram->subControlRect( Q::Chart );
|
|
const qreal yMax = diagram->yMax();
|
|
const Qsk::Position position = diagram->chartPosition();
|
|
QVector<Diagram::Type> types = {Diagram::Line, Diagram::Area};
|
|
|
|
for( int i = 0; i < diagram->dataPoints().size(); ++i )
|
|
{
|
|
QSGNode* chartNode;
|
|
|
|
if( node->childCount() > i )
|
|
{
|
|
chartNode = node->childAtIndex( i );
|
|
}
|
|
else
|
|
{
|
|
chartNode = new QSGNode;
|
|
node->appendChildNode( chartNode );
|
|
}
|
|
|
|
const QVector<QPointF> dataPoints = diagram->dataPoints().at( i );
|
|
int nodeIndex = 0;
|
|
QskAspect::Subcontrol lineSubcontrol = lineForIndex( i );
|
|
QskAspect::Subcontrol areaSubcontrol = areaForIndex( i );
|
|
int lineWidth = diagram->metric( lineSubcontrol | QskAspect::Size );
|
|
|
|
for( int j = 0; j < types.size(); ++j )
|
|
{
|
|
if( diagram->typesAt( i ) & types.at( j ) )
|
|
{
|
|
DiagramDataNode* dataPointNode;
|
|
|
|
if( chartNode->childCount() > nodeIndex )
|
|
{
|
|
dataPointNode = static_cast<DiagramDataNode*>( chartNode->childAtIndex( nodeIndex ) );
|
|
}
|
|
else
|
|
{
|
|
dataPointNode = new DiagramDataNode;
|
|
chartNode->appendChildNode( dataPointNode );
|
|
}
|
|
|
|
const DiagramDataNode::Type nodeType = ( types.at( j ) == Diagram::Line ) ? DiagramDataNode::Line : DiagramDataNode::Area;
|
|
const QColor color = ( types.at( j ) == Diagram::Line ) ? diagram->color( lineSubcontrol )
|
|
: diagram->color( areaSubcontrol );
|
|
|
|
dataPointNode->update( rect, nodeType, color, dataPoints, yMax, position, lineWidth );
|
|
nodeIndex++;
|
|
}
|
|
}
|
|
|
|
while( nodeIndex < chartNode->childCount() )
|
|
{
|
|
chartNode->removeChildNode( chartNode->childAtIndex( nodeIndex++ ) );
|
|
}
|
|
}
|
|
|
|
// ### also check for superfluous nodes here
|
|
|
|
return node;
|
|
}
|
|
|
|
QSGNode* DiagramSkinlet::updateSeparatorNode( const Diagram* diagram, QSGNode* node ) const
|
|
{
|
|
const int xGridLines = diagram->xGridLines();
|
|
|
|
if( xGridLines <= 0 )
|
|
{
|
|
return nullptr;
|
|
}
|
|
|
|
auto* separatorNode = static_cast<DiagramSegmentsNode*>( node );
|
|
|
|
if( separatorNode == nullptr )
|
|
{
|
|
separatorNode = new DiagramSegmentsNode;
|
|
}
|
|
|
|
using Q = Diagram;
|
|
const QRectF rect = diagram->subControlRect( Q::Chart );
|
|
const QColor color = diagram->color( Q::Segments );
|
|
const QVector< QVector<QPointF> > dataPoints = diagram->dataPoints();
|
|
|
|
separatorNode->update( rect, color, dataPoints, xGridLines );
|
|
|
|
return separatorNode;
|
|
}
|
|
|
|
#include "moc_DiagramSkinlet.cpp"
|