![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
102 lines
3.1 KiB
C++
102 lines
3.1 KiB
C++
/******************************************************************************
|
|
* QSkinny - Copyright (C) 2021 Uwe Rathmann
|
|
* This file may be used under the terms of the QSkinny License, Version 1.0
|
|
*****************************************************************************/
|
|
|
|
#include "DiagramDataNode.h"
|
|
#include <QTransform>
|
|
#include <QskFunctions.h>
|
|
|
|
DiagramDataNode::DiagramDataNode()
|
|
: m_geometry( QSGGeometry::defaultAttributes_Point2D(), 0 )
|
|
{
|
|
setGeometry( &m_geometry );
|
|
setMaterial( &m_material );
|
|
}
|
|
|
|
void DiagramDataNode::update( const QRectF& rect, Type type, const QColor& color, const QVector<QPointF>& dataPoints,
|
|
const qreal yMax, Qsk::Position position, int lineWidth )
|
|
{
|
|
Q_UNUSED( rect );
|
|
|
|
if( color != m_color )
|
|
{
|
|
m_material.setColor( color );
|
|
m_color = color;
|
|
markDirty( QSGNode::DirtyMaterial );
|
|
}
|
|
|
|
if( m_rect == rect && m_dataPoints == dataPoints && m_yMax == yMax && m_position == position
|
|
&& m_type == type && m_lineWidth == lineWidth )
|
|
{
|
|
return;
|
|
}
|
|
|
|
if( lineWidth != m_lineWidth )
|
|
{
|
|
m_lineWidth = lineWidth;
|
|
m_geometry.setLineWidth( lineWidth );
|
|
|
|
markDirty( QSGNode::DirtyGeometry );
|
|
}
|
|
|
|
m_rect = rect;
|
|
m_dataPoints = dataPoints;
|
|
m_yMax = yMax;
|
|
m_position = position;
|
|
m_type = type;
|
|
|
|
GLenum drawingMode = ( m_type == Line ) ? GL_LINES : GL_TRIANGLE_STRIP;
|
|
m_geometry.setDrawingMode( drawingMode );
|
|
|
|
const int vertexCount = ( m_type == Line ) ? m_dataPoints.size() * 2 - 1 : m_dataPoints.size() * 2;
|
|
|
|
m_geometry.allocate( vertexCount );
|
|
auto vertexData = m_geometry.vertexDataAsPoint2D();
|
|
|
|
qreal xMin;
|
|
qreal xMax;
|
|
|
|
if( m_dataPoints.count() > 0 )
|
|
{
|
|
xMin = m_dataPoints.at( 0 ).x();
|
|
xMax = m_dataPoints.at( m_dataPoints.count() - 1 ).x();
|
|
}
|
|
else
|
|
{
|
|
xMin = 0;
|
|
xMax = 0;
|
|
}
|
|
|
|
// ### we should have a different function for each chart type
|
|
for( int i = 0; i < m_dataPoints.size(); ++i )
|
|
{
|
|
const qreal x = ( ( m_dataPoints.at( i ).x() - xMin ) / ( xMax - xMin ) ) * rect.width();
|
|
const qreal fraction = ( m_dataPoints.at( i ).y() / yMax ) * rect.height();
|
|
const qreal y = ( position == Qsk::Top ) ? fraction : rect.height() - fraction;
|
|
|
|
if( m_type == Line && i < m_dataPoints.size() - 1 )
|
|
{
|
|
const qreal x2 = ( ( m_dataPoints.at( i + 1 ).x() - xMin ) / ( xMax - xMin ) ) * rect.width();
|
|
const qreal fraction2 = ( m_dataPoints.at( i + 1 ).y() / yMax ) * rect.height();
|
|
const qreal y2 = ( position == Qsk::Top ) ? fraction2 : rect.height() - fraction2;
|
|
vertexData[2 * i].x = x;
|
|
vertexData[2 * i].y = y;
|
|
|
|
vertexData[2 * i + 1].x = x2;
|
|
vertexData[2 * i + 1].y = y2;
|
|
}
|
|
else if( m_type == Area )
|
|
{
|
|
const qreal y0 = ( position == Qsk::Top ) ? 0 : rect.height();
|
|
vertexData[2 * i].x = x;
|
|
vertexData[2 * i].y = y;
|
|
|
|
vertexData[2 * i + 1].x = x;
|
|
vertexData[2 * i + 1].y = y0;
|
|
}
|
|
}
|
|
|
|
markDirty( QSGNode::DirtyGeometry );
|
|
}
|