168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Iot dashboard: Fix light display input (#153) 

* IOT dashboard: Fix light display input

* move tolerance in mouse handlinge code

* Revert "move tolerance in mouse handlinge code"

This reverts commit 2214d2160fd4c37151f9f6451f06ce12f7b7dada.

We keep the tolerance handling inside the other function.
This commit is contained in:
Peter Hartmann 2021-12-17 15:45:28 +01:00 committed by GitHub
parent 393f9ae91a
commit 0ed89c111d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
examples/iotdashboard/LightDisplay.cpp
View File

@ -22,6 +22,20 @@ QSK_SUBCONTROL( LightDisplay, Knob )
QSK_STATE( LightDisplay, Pressed, ( QskAspect::FirstUserState << 1 ) ) QSK_STATE( LightDisplay, Pressed, ( QskAspect::FirstUserState << 1 ) )
namespace {
bool angleInRange( const QskArcMetrics& metrics, qreal angle )
{
return angle >= metrics.startAngle() && angle <= metrics.endAngle();
}
qreal angleDiff( qreal angle1, qreal angle2 )
{
// Qt wraps around at 180 degrees
qreal diff = qAbs( angle1 ) - qAbs( angle2 );
return qAbs( diff );
}
}
LightDisplay::LightDisplay( QQuickItem* parent ) LightDisplay::LightDisplay( QQuickItem* parent )
: QskBoundedValueInput( parent ) : QskBoundedValueInput( parent )
{ {
@ -104,8 +118,26 @@ void LightDisplay::mouseMoveEvent( QMouseEvent* event )
} }
const QskArcMetrics metrics = arcMetricsHint( ColdAndWarmArc ); const QskArcMetrics metrics = arcMetricsHint( ColdAndWarmArc );
const qreal angle = angleFromPoint( rect, mousePos ); qreal angle = angleFromPoint( rect, mousePos );
const qreal ratio = ( metrics.spanAngle() - angle ) / metrics.spanAngle();
const int tolerance = 20;
if( !angleInRange( metrics, angle ) )
{
// we're slightly outside the range, but don't want to give up
// the Pressed state
if( angleDiff( angle, metrics.startAngle() ) < tolerance )
{
angle = metrics.startAngle();
}
else if( angleDiff( angle, metrics.endAngle() ) < tolerance )
{
angle = metrics.endAngle();
}
}
qreal ratio = ( metrics.spanAngle() - angle ) / metrics.spanAngle();
setValueAsRatio( ratio ); setValueAsRatio( ratio );
} }
@ -137,8 +169,10 @@ bool LightDisplay::arcContainsPoint( const QRectF& rect, const QPointF& point )
rect.center().y() - point.y() ); rect.center().y() - point.y() );
const qreal angle = angleFromPoint( rect, point ); const qreal angle = angleFromPoint( rect, point );
const bool angleWithinRange = ( angle + tolerance ) > metrics.startAngle()
&& angle < ( metrics.startAngle() + metrics.spanAngle() - tolerance ); const bool angleWithinRange = angleInRange( metrics, angle )
|| angleDiff( angle, metrics.startAngle() ) <= tolerance
|| angleDiff( angle, metrics.endAngle() ) <= tolerance;
// 2. check whether point is on arc // 2. check whether point is on arc
const qreal radiusMax = rect.width() / 2; const qreal radiusMax = rect.width() / 2;