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

contains/fuzzyContains for intervals added

Browse Source
This commit is contained in:
Uwe Rathmann 2020-08-26 13:30:41 +02:00
parent 18dd693892
commit 664b141ee4
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/QskIntervalF.cpp
View File

@ -159,6 +159,26 @@ bool QskIntervalF::fuzzyContains( qreal value ) const
return true;
}
bool QskIntervalF::fuzzyContains( const QskIntervalF& interval ) const
{
if ( !isValid() || !interval.isValid() )
return false;
if ( ( interval.m_lowerBound < m_lowerBound )
&& !qskFuzzyCompare( interval.m_lowerBound, m_lowerBound ) )
{
return false;
}
if ( ( interval.m_upperBound > m_upperBound )
&& !qskFuzzyCompare( interval.m_upperBound, m_upperBound ) )
{
return false;
}
return true;
}
#ifndef QT_NO_DEBUG_STREAM
#include <qdebug.h>

9
src/common/QskIntervalF.h
View File

@ -39,7 +39,10 @@ class QSK_EXPORT QskIntervalF
void setWidth( qreal ) noexcept;
constexpr bool contains( qreal value ) const noexcept;
constexpr bool contains( const QskIntervalF& ) const noexcept;
bool fuzzyContains( qreal value ) const;
bool fuzzyContains( const QskIntervalF& ) const;
static constexpr QskIntervalF normalized( qreal value1, qreal value2 ) noexcept;
@ -150,6 +153,12 @@ inline constexpr bool QskIntervalF::contains( qreal value ) const noexcept
return ( value >= m_lowerBound ) && ( value <= m_upperBound );
}
inline constexpr bool QskIntervalF::contains( const QskIntervalF& interval ) const noexcept
{
return interval.isValid() && contains( interval.m_lowerBound )
&& contains( interval.m_upperBound );
}
inline void QskIntervalF::translate( qreal offset ) noexcept
{
m_lowerBound += offset;