Skip to content

Commit

Permalink
Add functionality to allow feature mentioned in LMMS#2193.
Browse files Browse the repository at this point in the history
Fix declaration of return value.

Add mapping and new menu option for octave-marking of semitones.

Finish switch case for add/remove multiple octave semitones.

Fix segfault due to illogical access using iterators from one collection on another.
  • Loading branch information
waxspin committed Sep 24, 2015
1 parent dabfc63 commit aaa412c
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/PianoRoll.h
Expand Up @@ -125,6 +125,7 @@ class PianoRoll : public QWidget
virtual void focusOutEvent( QFocusEvent * );

int getKey( int y ) const;
QList<int> getAllOctavesForKey( int keyToMirror ) const;
static void drawNoteRect( QPainter & p, int x, int y,
int width, const Note * n, const QColor & noteCol );
void removeSelection();
Expand Down Expand Up @@ -198,6 +199,7 @@ protected slots:
{
stmaUnmarkAll,
stmaMarkCurrentSemiTone,
stmaMarkAllOctaveSemiTones,
stmaMarkCurrentScale,
stmaMarkCurrentChord,
stmaCopyAllNotesOnKey
Expand Down
40 changes: 40 additions & 0 deletions src/gui/editors/PianoRoll.cpp
Expand Up @@ -232,18 +232,21 @@ PianoRoll::PianoRoll() :
m_semiToneMarkerMenu = new QMenu( this );

QAction* markSemitoneAction = new QAction( tr("Mark/unmark current semitone"), this );
QAction* markAllOctaveSemitonesAction = new QAction( tr("Mark/unmark all corresponding octave semitones"), this );
QAction* markScaleAction = new QAction( tr("Mark current scale"), this );
QAction* markChordAction = new QAction( tr("Mark current chord"), this );
QAction* unmarkAllAction = new QAction( tr("Unmark all"), this );
QAction* copyAllNotesAction = new QAction( tr("Select all notes on this key"), this);

connect( markSemitoneAction, SIGNAL(triggered()), signalMapper, SLOT(map()) );
connect( markAllOctaveSemitonesAction, SIGNAL(triggered()), signalMapper, SLOT(map()) );
connect( markScaleAction, SIGNAL(triggered()), signalMapper, SLOT(map()) );
connect( markChordAction, SIGNAL(triggered()), signalMapper, SLOT(map()) );
connect( unmarkAllAction, SIGNAL(triggered()), signalMapper, SLOT(map()) );
connect( copyAllNotesAction, SIGNAL(triggered()), signalMapper, SLOT(map()) );

signalMapper->setMapping( markSemitoneAction, static_cast<int>( stmaMarkCurrentSemiTone ) );
signalMapper->setMapping( markAllOctaveSemitonesAction, static_cast<int>( stmaMarkAllOctaveSemiTones ) );
signalMapper->setMapping( markScaleAction, static_cast<int>( stmaMarkCurrentScale ) );
signalMapper->setMapping( markChordAction, static_cast<int>( stmaMarkCurrentChord ) );
signalMapper->setMapping( unmarkAllAction, static_cast<int>( stmaUnmarkAll ) );
Expand All @@ -258,6 +261,7 @@ PianoRoll::PianoRoll() :
connect( signalMapper, SIGNAL(mapped(int)), this, SLOT(markSemiTone(int)) );

m_semiToneMarkerMenu->addAction( markSemitoneAction );
m_semiToneMarkerMenu->addAction( markAllOctaveSemitonesAction );
m_semiToneMarkerMenu->addAction( markScaleAction );
m_semiToneMarkerMenu->addAction( markChordAction );
m_semiToneMarkerMenu->addAction( unmarkAllAction );
Expand Down Expand Up @@ -538,6 +542,28 @@ void PianoRoll::markSemiTone( int i )
}
break;
}
case stmaMarkAllOctaveSemiTones:
{
QList<int> aok = getAllOctavesForKey(key);

if ( m_markedSemiTones.contains(key) )
{
// lets erase all of the ones that match this by octave
QList<int>::iterator i;
for (int ix = 0; ix < aok.size(); ++ix)
{
i = qFind(m_markedSemiTones.begin(), m_markedSemiTones.end(), aok.at(ix));
m_markedSemiTones.erase(i);
}
}
else
{
// we should add all of the ones that match this by octave
m_markedSemiTones.append(aok);
}

break;
}
case stmaMarkCurrentScale:
chord = & InstrumentFunctionNoteStacking::ChordTable::getInstance()
.getScaleByName( m_scaleModel.currentText() );
Expand Down Expand Up @@ -3261,8 +3287,22 @@ int PianoRoll::getKey(int y ) const
return key_num;
}

QList<int> PianoRoll::getAllOctavesForKey( int keyToMirror ) const
{
QList<int> keys;

for (int i = 0; i < NumKeys; ++i)
{
if ((i < keyToMirror && (keyToMirror - i) % KeysPerOctave == 0) || (i > keyToMirror && (i - keyToMirror) % KeysPerOctave == 0))
{
keys.append(i);
}
}

keys.append(keyToMirror);

return keys;
}

Song::PlayModes PianoRoll::desiredPlayModeForAccompany() const
{
Expand Down

0 comments on commit aaa412c

Please sign in to comment.