mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-01-31 01:33:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Knob: draw arc around knob

Browse Source 
Initial work on improved knob usability by drawing an arc around knob
indicating current state as well.
This commit is contained in:
Tobias Doerffel
2014-01-23 23:35:44 +01:00
parent 5540a356f7
commit f2bfa3b4d2
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/knob.h
View File

@@ -132,6 +132,11 @@ private:
void setPosition( const QPoint & _p );
bool updateAngle();
int angleFromValue( float value, float minValue, float maxValue, float totalAngle ) const
{
return static_cast<int>( ( value - 0.5 * ( minValue + maxValue ) ) / ( maxValue - minValue ) * m_totalAngle ) % 360;
}
inline float pageSize() const
{
return( qMax<float>( ( model()->maxValue() -

12
src/gui/widgets/knob.cpp
View File

@@ -255,11 +255,7 @@ bool knob::updateAngle()
int angle = 0;
if( model() && model()->maxValue() != model()->minValue() )
{
float a = ( model()->value() - 0.5 * ( model()->minValue() +
model()->maxValue() ) ) /
( model()->maxValue() - model()->minValue() ) *
m_totalAngle;
angle = static_cast<int>( a ) % 360;
angle = angleFromValue( model()->value(), model()->minValue(), model()->maxValue(), m_totalAngle );
}
if( qAbs( angle - m_angle ) > 3 )
{
@@ -328,6 +324,8 @@ void knob::drawKnob( QPainter * _p )
// p.setPen( QPen( QColor( 200, 0, 0 ), 2 ) );
p.setRenderHint( QPainter::Antialiasing );
const int centerAngle = angleFromValue( model()->centerValue(), model()->minValue(), model()->maxValue(), m_totalAngle );
switch( m_knobNum )
{
case knobSmall_17:
@@ -339,9 +337,9 @@ void knob::drawKnob( QPainter * _p )
}
case knobBright_26:
{
p.setPen( QPen( QApplication::palette().color( QPalette::Active,
QPalette::WindowText ), 2 ) );
p.setPen( QPen( QApplication::palette().color( QPalette::Active, QPalette::WindowText ), 2 ) );
p.drawLine( calculateLine( mid, radius-5 ) );
p.drawArc( 1, 1, width()-1-2*1, width()-1-2*1, (90-centerAngle)*16, -16*(m_angle-centerAngle) );//45*16-16*m_angle, 45*16 );
break;
}
case knobDark_28: