hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fixed and improved painting of volume-lines and note-detuning-dots, fixed KEY_PRESSURE-events when changing volume of a note, pass keyboard-events to piano-class if appropriate

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@765 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-03-04 00:58:25 +00:00
parent 6f8b8c3a75
commit 974c312a7a
2 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,5 +1,19 @@
2008-03-03 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/core/piano_roll.cpp:
- fixed and improved painting of volume-lines
- fixed painting of note-detuning-dots
- fixed KEY_PRESSURE-events when changing volume of a note
- pass keyboard-events to piano-class if appropriate
* include/piano.h:
* src/core/piano.cpp:
moved MIDI-event-code to piano-class
* src/core/piano_roll.cpp:
* src/core/automation_editor.cpp:
set focus-policy in order to receive key-events
* plugins/sf2_player/sf2_player.cpp:
- fixed open-file-dialog
- fixed order of member-variable-initialization

57
src/core/piano_roll.cpp
View File

@@ -425,6 +425,8 @@ pianoRoll::pianoRoll( void ) :
tb_layout->addStretch();
// setup our actual window
setFocusPolicy( Qt::StrongFocus );
setFocus();
setWindowIcon( embed::getIconPixmap( "piano" ) );
setCurrentPattern( NULL );
@@ -641,11 +643,17 @@ void pianoRoll::closeEvent( QCloseEvent * _ce )
void pianoRoll::keyPressEvent( QKeyEvent * _ke )
{
if( validPattern() )
if( validPattern() && _ke->modifiers() == Qt::NoModifier )
{
// TODO: move this to instrumentTrack-class
/* m_pattern->getInstrumentTrack()->getPianoWidget()
->keyPressEvent( _ke );*/
int key_num = pianoView::getKeyFromScancode(
_ke->nativeScanCode() ) +
( DEFAULT_OCTAVE - 1 ) * NOTES_PER_OCTAVE;
if( _ke->isAutoRepeat() == FALSE && key_num > -1 )
{
m_pattern->getInstrumentTrack()->
getPiano()->handleKeyPress( key_num );
}
}
switch( _ke->key() )
{
@@ -807,10 +815,17 @@ void pianoRoll::keyPressEvent( QKeyEvent * _ke )
void pianoRoll::keyReleaseEvent( QKeyEvent * _ke )
{
if( validPattern() )
if( validPattern() && _ke->modifiers() == Qt::NoModifier )
{
/* m_pattern->getInstrumentTrack()->getPianoWidget()
->keyReleaseEvent( _ke );*/
int key_num = pianoView::getKeyFromScancode(
_ke->nativeScanCode() ) +
( DEFAULT_OCTAVE - 1 ) * NOTES_PER_OCTAVE;
if( _ke->isAutoRepeat() == FALSE && key_num > -1 )
{
m_pattern->getInstrumentTrack()->
getPiano()->handleKeyRelease( key_num );
}
}
switch( _ke->key() )
{
@@ -847,7 +862,7 @@ void pianoRoll::mousePressEvent( QMouseEvent * _me )
return;
}
if( m_editMode == OPEN )
if( m_editMode == OPEN && noteUnderMouse() )
{
noteUnderMouse()->editDetuningPattern();
return;
@@ -872,7 +887,7 @@ void pianoRoll::mousePressEvent( QMouseEvent * _me )
x -= WHITE_KEY_WIDTH;
// get tact-64th in which the user clicked
int pos_tact_64th = (x-1) * 64 / m_ppt +
int pos_tact_64th = x * 64 / m_ppt +
m_currentPosition;
@@ -1180,7 +1195,7 @@ void pianoRoll::mouseMoveEvent( QMouseEvent * _me )
m_currentNote->setVolume( vol );
m_pattern->dataChanged();
m_pattern->getInstrumentTrack()->processInEvent(
midiEvent( KEY_PRESSURE, 0, key_num,
midiEvent( KEY_PRESSURE, 0, m_lastKey,
vol * 127 / 100 ),
midiTime() );
}
@@ -1803,11 +1818,9 @@ void pianoRoll::paintEvent( QPaintEvent * _pe )
int y_base = height() - PR_BOTTOM_MARGIN - m_notesEditHeight - 1;
if( validPattern() == TRUE )
{
QPainter p_detuning( this );
p_detuning.setClipRect( WHITE_KEY_WIDTH, PR_TOP_MARGIN,
p.setClipRect( WHITE_KEY_WIDTH, PR_TOP_MARGIN,
width() - WHITE_KEY_WIDTH,
height() - PR_TOP_MARGIN - PR_BOTTOM_MARGIN
- m_notesEditHeight );
height() - PR_TOP_MARGIN );
const noteVector & notes = m_pattern->notes();
@@ -1879,16 +1892,22 @@ void pianoRoll::paintEvent( QPaintEvent * _pe )
( *it )->length() < 0 );
}
// draw volume-line of note
p.setPen( QPen( QColor( 0, 255, 0 ), NE_LINE_WIDTH ) );
p.drawLine( x + WHITE_KEY_WIDTH + 1,
p.setPen( QPen( QColor( 32, 255, 32, 160 ),
NE_LINE_WIDTH ) );
p.drawLine( x + WHITE_KEY_WIDTH,
height() - PR_BOTTOM_MARGIN -
( *it )->getVolume() / 2,
x + WHITE_KEY_WIDTH + 1,
x + WHITE_KEY_WIDTH,
height() - PR_BOTTOM_MARGIN );
p.drawLine( x + WHITE_KEY_WIDTH-1,
height() - PR_BOTTOM_MARGIN -
( *it )->getVolume() / 2+1,
x + WHITE_KEY_WIDTH + 1,
height()-PR_BOTTOM_MARGIN -
(*it)->getVolume() / 2 + 1 );
if( ( *it )->hasDetuningInfo() )
{
drawDetuningInfo( p_detuning, *it,
drawDetuningInfo( p, *it,
x + WHITE_KEY_WIDTH,
y_base - key * KEY_LINE_HEIGHT );
}