haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small cleanup after !490

This commit is contained in:
Mikolaj Wielgus 2021-12-28 23:04:57 +01:00
parent b5960fef38
commit a0c4f05c17
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/widgets/tuner_slider.cpp
View File

@ -91,11 +91,11 @@ static inline int arraysize( const T (&v)[S] ) { return S; }
* *
* @tparam F is a floating point type. * @tparam F is a floating point type.
* @param aRatio is the input (travel) ratio or moving contact (wiper) position, from * @param aRatio is the input (travel) ratio or moving contact (wiper) position, from
* 0%/CCW/left (0) through 50%/mid-travel/center (½) to 100%/CW/right (1). * 0%/CCW/left (0) through 50%/mid-travel/center (1/2) to 100%/CW/right (1).
* @param aMid is the logarithmic laws' output ratio at 50%/mid-travel/center (½) * @param aMid is the logarithmic laws' output ratio at 50%/mid-travel/center (1/2)
* input ratio. * input ratio.
* @param aLaw is the (resistance) law, interpolating from *reverse logarithmic* (0) * @param aLaw is the (resistance) law, interpolating from *reverse logarithmic* (0)
* through *symmetric/linear* (½) to *logarithmic* (1). * through *symmetric/linear* (1/2) to *logarithmic* (1).
* @param aInverse swaps input and output ratios (inverse function, where possible), * @param aInverse swaps input and output ratios (inverse function, where possible),
* if @c true. * if @c true.
* @return the output (resistance or voltage) ratio in [0, 1]. * @return the output (resistance or voltage) ratio in [0, 1].
@ -103,6 +103,8 @@ static inline int arraysize( const T (&v)[S] ) { return S; }
template <typename F> template <typename F>
static F taper( F aRatio, F aMid = 0.5, F aLaw = 1.0, bool aInverse = false ) static F taper( F aRatio, F aMid = 0.5, F aLaw = 1.0, bool aInverse = false )
{ {
static_assert( std::is_floating_point<F>::value, "F must be floating point" );
// clamp to [0, 1] and short-cut // clamp to [0, 1] and short-cut
if( aRatio <= 0 ) if( aRatio <= 0 )
return 0; return 0;
@ -122,7 +124,7 @@ static F taper( F aRatio, F aMid = 0.5, F aLaw = 1.0, bool aInverse = false )
t = aInverse ? 0 : 1; t = aInverse ? 0 : 1;
else else
{ {
// clamp, and reflect and/or scale for reverse…symmetric…normal laws // clamp, and reflect and/or scale for reverse...symmetric...normal laws
if( aLaw >= 1 ) if( aLaw >= 1 )
t = t; t = t;
else if( aLaw <= 0 ) else if( aLaw <= 0 )
@ -137,13 +139,13 @@ static F taper( F aRatio, F aMid = 0.5, F aLaw = 1.0, bool aInverse = false )
F b = std::log( a ); F b = std::log( a );
F c = a - 1; F c = a - 1;
// scaling: a = (1 - 1/m)² // scaling: a = (1 - 1/m)^2
// log law: (aᵗ - 1) / (a - 1) // log law: (a' - 1) / (a - 1)
// inverse: logₐ(1 + t (a - 1)) // inverse: log[a](1 + t (a - 1))
t = aInverse ? std::log1p( t * c ) / b : std::expm1( t * b ) / c; t = aInverse ? ( std::log1p( t * c ) / b ) : ( std::expm1( t * b ) / c );
} }
// clamp, and scale and/or reflect for reverse…symmetric…normal laws // clamp, and scale and/or reflect for reverse...symmetric...normal laws
if( aLaw >= 1 ) if( aLaw >= 1 )
t = t; t = t;
else if( aLaw <= 0 ) else if( aLaw <= 0 )