![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
131 lines
4.5 KiB
C++
131 lines
4.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 "TopBar.h"
|
|
#include "PieChartPainted.h"
|
|
|
|
#include <QskSkin.h>
|
|
#include <QskTextLabel.h>
|
|
|
|
#include <QTime>
|
|
|
|
QSK_SUBCONTROL( TimeTitleLabel, Text )
|
|
|
|
QSK_SUBCONTROL( TimeLabel, Text )
|
|
|
|
QSK_SUBCONTROL( TopBarItem, Item1 )
|
|
QSK_SUBCONTROL( TopBarItem, Item2 )
|
|
QSK_SUBCONTROL( TopBarItem, Item3 )
|
|
QSK_SUBCONTROL( TopBarItem, Item4 )
|
|
|
|
QSK_SUBCONTROL( TopBar, Panel )
|
|
|
|
namespace
|
|
{
|
|
QskAspect::Subcontrol subcontrolForIndex( int index )
|
|
{
|
|
switch( index )
|
|
{
|
|
case 0:
|
|
return TopBarItem::Item1;
|
|
|
|
case 1:
|
|
return TopBarItem::Item2;
|
|
|
|
case 2:
|
|
return TopBarItem::Item3;
|
|
|
|
default:
|
|
return TopBarItem::Item4;
|
|
}
|
|
}
|
|
}
|
|
|
|
TopBarItem::TopBarItem( int index, const QString& name, const QskGradient& gradient, int progress, int value, QQuickItem* parent )
|
|
: QskLinearBox( Qt::Vertical, parent )
|
|
, m_name( name )
|
|
{
|
|
setAutoLayoutChildren( true );
|
|
setAutoAddChildren( true );
|
|
setSpacing( 15 );
|
|
|
|
auto* textLabel = new QskTextLabel( name, this );
|
|
textLabel->setFontRole( QskSkin::SmallFont );
|
|
|
|
auto* pieChartAndDisplay = new QskLinearBox( Qt::Horizontal, this );
|
|
pieChartAndDisplay->setSpacing( 10 );
|
|
|
|
QskAspect::Subcontrol subcontrol = subcontrolForIndex( index );
|
|
QColor textColor = color( subcontrol | QskAspect::TextColor );
|
|
new PieChartPainted( textColor, gradient, progress, value, pieChartAndDisplay );
|
|
|
|
auto* display = new QskLinearBox( Qt::Vertical, pieChartAndDisplay );
|
|
display->setSpacing( 0 );
|
|
display->addSpacer( 0, 1 );
|
|
|
|
auto* displayValue = new QskTextLabel( QString::number( value ), display );
|
|
displayValue->setFontRole( QskSkin::MediumFont );
|
|
|
|
auto* displayUnit = new QskTextLabel( "kwH", display );
|
|
displayUnit->setFontRole( QskSkin::SmallFont );
|
|
display->addSpacer( 0, 1 );
|
|
|
|
}
|
|
|
|
TopBar::TopBar( QQuickItem* parent ) : QskLinearBox( Qt::Horizontal, parent )
|
|
{
|
|
setPanel( true );
|
|
setAutoLayoutChildren( true );
|
|
setAutoAddChildren( true );
|
|
setSizePolicy( QskSizePolicy::Preferred, QskSizePolicy::Fixed );
|
|
|
|
QStringList itemStrings = { "Living Room", "Bedroom", "Bathroom", "Kitchen" };
|
|
int progressValues[] = {25, 45, 15, 86};
|
|
int values[] = {175, 205, 115, 289};
|
|
|
|
for( int i = 0; i < itemStrings.count(); i++ )
|
|
{
|
|
QskAspect::Subcontrol subcontrol = subcontrolForIndex( i );
|
|
QskGradient gradient = gradientHint( subcontrol );
|
|
|
|
auto* item = new TopBarItem( i, itemStrings.at( i ), gradient, progressValues[i], values[i], this );
|
|
m_entries.append( item );
|
|
}
|
|
|
|
auto* timeControl = new QskLinearBox( Qt::Vertical, this );
|
|
new TimeTitleLabel( "Current time", timeControl );
|
|
|
|
auto now = QTime::currentTime();
|
|
auto timeString = now.toString();
|
|
new TimeLabel( timeString, timeControl );
|
|
}
|