From 22f15c3955b3ef8fac9fc241ec0d071b1f066667 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Sun, 29 Jun 2008 13:53:13 +0000 Subject: [PATCH] Start adding LFO artwork git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1211 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 5 +++ .../themes/default/lfo_controller_artwork.png | Bin 0 -> 10509 bytes include/lfo_controller.h | 2 +- src/gui/automation_editor.cpp | 24 ++++++------ src/gui/lfo_controller_dialog.cpp | 35 ++++++++---------- 5 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 data/themes/default/lfo_controller_artwork.png diff --git a/ChangeLog b/ChangeLog index c22b63e41..c327db7b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,11 @@ - Don't miss points when scribbling quickly - Shift-Click to draw a line + * include/lfo_controller.h: + * src/gui/lfo_controller_dialog.cpp: + * data/themes/default/lfo_controller_artwork.png: + Add LFO artwork (almost) + 2008-06-28 Tobias Doerffel * plugins/Makefile.am: diff --git a/data/themes/default/lfo_controller_artwork.png b/data/themes/default/lfo_controller_artwork.png new file mode 100644 index 0000000000000000000000000000000000000000..812ee37ad1f845af0c5b993c057a5391a6a699c0 GIT binary patch literal 10509 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 P00000NkvXXu0mjf%HmL5 literal 0 HcmV?d00001 diff --git a/include/lfo_controller.h b/include/lfo_controller.h index 5b8743f72..9b5f9b96c 100644 --- a/include/lfo_controller.h +++ b/include/lfo_controller.h @@ -113,7 +113,7 @@ signals: protected: virtual void contextMenuEvent( QContextMenuEvent * _me ); - virtual void paintEvent( QPaintEvent * _pe ); + //virtual void paintEvent( QPaintEvent * _pe ); virtual void modelChanged( void ); lfoController * m_lfo; diff --git a/src/gui/automation_editor.cpp b/src/gui/automation_editor.cpp index 8e0c56905..66da59d49 100644 --- a/src/gui/automation_editor.cpp +++ b/src/gui/automation_editor.cpp @@ -637,23 +637,25 @@ void automationEditor::leaveEvent( QEvent * _e ) } -void automationEditor::drawLine( int x0, float y0, int x1, float y1 ) +void automationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 ) { - int deltax = tAbs(x1 - x0); - float deltay = tAbs(y1 - y0); - int x = x0; - float y = y0; + int deltax = tAbs( _x1 - _x0 ); + float deltay = tAbs( _y1 - _y0 ); + int x = _x0; + float y = _y0; int xstep; int ystep; - if( deltax == 0 ) + if( deltax < quantization() ) { return; } - float yscale = deltay / deltax; + deltax /= quantization(); - if( x0 < x1) + float yscale = deltay / ( deltax ); + + if( _x0 < _x1) { xstep = quantization(); } @@ -662,7 +664,7 @@ void automationEditor::drawLine( int x0, float y0, int x1, float y1 ) xstep = -( quantization() ); } - if( y0 < y1 ) + if( _y0 < _y1 ) { ystep = 1; } @@ -674,10 +676,10 @@ void automationEditor::drawLine( int x0, float y0, int x1, float y1 ) int i = 0; while( i < deltax ) { - y = y0 + ( ystep * yscale * i ); + y = _y0 + ( ystep * yscale * i ); x += xstep; - i += quantization(); + i += 1; m_pattern->removeValue( midiTime( x ) ); m_pattern->putValue( midiTime( x ), y ); } diff --git a/src/gui/lfo_controller_dialog.cpp b/src/gui/lfo_controller_dialog.cpp index 293be0d60..df741f38b 100644 --- a/src/gui/lfo_controller_dialog.cpp +++ b/src/gui/lfo_controller_dialog.cpp @@ -72,7 +72,7 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent title.append( ")" ); setWindowTitle( tr( "LFO (name)" ) ); setWindowIcon( embed::getIconPixmap( "controller" ) ); - setFixedSize( 256, 64 ); + setFixedSize( 240, 80 ); toolTip::add( this, tr( "LFO Controller" ) ); @@ -211,36 +211,26 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent pixmapButton * x1 = new pixmapButton( this, NULL ); - x1->move( LFO_MULTIPLIER_X, LFO_SHAPES_Y + 15 ); + x1->move( LFO_MULTIPLIER_X, LFO_SHAPES_Y ); x1->setActiveGraphic( embed::getIconPixmap( "lfo_x1_active" ) ); x1->setInactiveGraphic( embed::getIconPixmap( "lfo_x1_inactive" ) ); pixmapButton * x100 = new pixmapButton( this, NULL ); - x100->move( LFO_MULTIPLIER_X, LFO_SHAPES_Y ); + x100->move( LFO_MULTIPLIER_X, LFO_SHAPES_Y - 15 ); x100->setActiveGraphic( embed::getIconPixmap( "lfo_x100_active" ) ); x100->setInactiveGraphic( embed::getIconPixmap( "lfo_x100_inactive" ) ); pixmapButton * d100 = new pixmapButton( this, NULL ); - d100->move( LFO_MULTIPLIER_X, LFO_SHAPES_Y + 30 ); + d100->move( LFO_MULTIPLIER_X, LFO_SHAPES_Y + 15 ); d100->setActiveGraphic( embed::getIconPixmap( "lfo_d100_active" ) ); d100->setInactiveGraphic( embed::getIconPixmap( "lfo_d100_inactive" ) ); - /* - m_x100Cb = new ledCheckBox( tr( "FREQ x 100" ), this ); - m_x100Cb->setFont( pointSize<6>( m_x100Cb->font() ) ); - m_x100Cb->move( LFO_BASE_KNOB_X, LFO_KNOB_Y + 36 ); - m_x100Cb->setWhatsThis( - tr( "Click here if the frequency of this LFO should be " - "multiplied with 100." ) ); - toolTip::add( m_x100Cb, tr( "multiply LFO-frequency with 100" ) ); - */ - m_multiplierBtnGrp = new automatableButtonGroup( this ); m_multiplierBtnGrp->addButton( x1 ); m_multiplierBtnGrp->addButton( x100 ); @@ -248,8 +238,14 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent setModel( _model ); -} + setAutoFillBackground( TRUE ); + QPalette pal; + pal.setBrush( backgroundRole(), + QColor( 255 ,0 ,0, 255 ) ); + setPalette( pal ); + +} @@ -303,13 +299,12 @@ void lfoControllerDialog::contextMenuEvent( QContextMenuEvent * ) } - - -void lfoControllerDialog::paintEvent( QPaintEvent * ) +/* +void lfoControllerDialog::paintEvent( QPaintEvent * _pe ) { - QPainter p( this ); + QWidget::paintEvent( _pe ); } - +*/ void lfoControllerDialog::modelChanged( void )