Add quality of life features. Duplication (ctrl-d), zooming with ctrl - and ctrl =, vertical flipping of notes in piano roll. #8143
+165
−17
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -151,7 +151,7 @@ const std::vector<float> PianoRoll::m_zoomYLevels = | |
| PianoRoll::PianoRoll() : | ||
| m_noteEditMenu( nullptr ), | ||
| m_semiToneMarkerMenu( nullptr ), | ||
| m_zoomingXModel(), | ||
| m_zoomingYModel(), | ||
| m_quantizeModel(), | ||
| m_noteLenModel(), | ||
|
|
@@ -316,10 +316,10 @@ PianoRoll::PianoRoll() : | |
| // setup zooming-stuff | ||
| for( float const & zoomLevel : m_zoomLevels ) | ||
| { | ||
| m_zoomingXModel.addItem(QString("%1%").arg(zoomLevel * 100)); | ||
| } | ||
| m_zoomingXModel.setValue( m_zoomingXModel.findText( "100%" ) ); | ||
| connect( &m_zoomingXModel, SIGNAL(dataChanged()), | ||
| this, SLOT(zoomingChanged())); | ||
|
|
||
| // zoom y | ||
|
|
@@ -778,6 +778,20 @@ void PianoRoll::constrainNoteLengths(bool constrainMax) | |
| Engine::getSong()->setModified(); | ||
| } | ||
|
|
||
| void PianoRoll::flipNotes() | ||
| { | ||
| if (!hasValidMidiClip()) { return; } | ||
|
|
||
| const NoteVector selectedNotes = getSelectedNotes(); | ||
| const auto& notes = selectedNotes.empty() ? m_midiClip->notes() : selectedNotes; | ||
|
|
||
| m_midiClip->flipNotes(notes); | ||
|
Contributor
There was a problem hiding this comment. I understand that having |
||
|
|
||
| update(); | ||
| getGUI()->songEditor()->update(); | ||
|
Contributor
There was a problem hiding this comment. Are these update calls needed? Try without. At least the first one should not be needed since the editor connects to |
||
| Engine::getSong()->setModified(); | ||
| } | ||
|
|
||
| void PianoRoll::reverseNotes() | ||
| { | ||
| if (!hasValidMidiClip()) { return; } | ||
|
|
@@ -792,7 +806,6 @@ void PianoRoll::reverseNotes() | |
| Engine::getSong()->setModified(); | ||
| } | ||
|
|
||
| void PianoRoll::loadMarkedSemiTones(const QDomElement & de) | ||
| { | ||
| // clear marked semitones to prevent leftover marks | ||
|
|
@@ -1414,6 +1427,36 @@ void PianoRoll::keyPressEvent(QKeyEvent* ke) | |
| break; | ||
| } | ||
|
|
||
| case Qt::Key_Minus: | ||
| if (ke->modifiers() & Qt::ControlModifier) | ||
| { | ||
| // ctrl - will zoom out | ||
| int value = m_zoomingXModel.value(); | ||
| m_zoomingXModel.setValue(value - 1); | ||
| } | ||
| if (ke->modifiers() & Qt::AltModifier) | ||
| { | ||
| // alt = will zoom y out | ||
| int value = m_zoomingYModel.value(); | ||
| m_zoomingYModel.setValue(value - 1); | ||
| } | ||
| break; | ||
|
|
||
| case Qt::Key_Equal: | ||
| if (ke->modifiers() & Qt::ControlModifier) | ||
| { | ||
| // ctrl = will zoom x in | ||
| int value = m_zoomingXModel.value(); | ||
| m_zoomingXModel.setValue(value + 1); | ||
| } | ||
| if (ke->modifiers() & Qt::AltModifier) | ||
| { | ||
| // alt = will zoom y in | ||
| int value = m_zoomingYModel.value(); | ||
| m_zoomingYModel.setValue(value + 1); | ||
| } | ||
| break; | ||
|
|
||
| case Qt::Key_A: | ||
| if (ke->modifiers() & Qt::ControlModifier && m_editMode != EditMode::Strum && m_editMode != EditMode::Knife) | ||
| { | ||
|
|
@@ -1461,7 +1504,6 @@ void PianoRoll::keyPressEvent(QKeyEvent* ke) | |
| ke->accept(); | ||
| break; | ||
|
|
||
| case Qt::Key_1: | ||
| case Qt::Key_2: | ||
| case Qt::Key_3: | ||
|
|
@@ -3221,7 +3263,7 @@ void PianoRoll::paintEvent(QPaintEvent * pe ) | |
|
|
||
| // draw vertical quantization lines | ||
| // If we're over 100% zoom, we allow all quantization level grids | ||
| if (m_zoomingXModel.value() <= 3) | ||
| { | ||
| // we're under 100% zoom | ||
| // allow quantization grid up to 1/24 for triplets | ||
|
|
@@ -3408,7 +3450,7 @@ void PianoRoll::paintEvent(QPaintEvent * pe ) | |
| float timeSignature = | ||
| static_cast<float>(Engine::getSong()->getTimeSigModel().getNumerator()) / | ||
| static_cast<float>(Engine::getSong()->getTimeSigModel().getDenominator()); | ||
| float zoomFactor = m_zoomLevels[m_zoomingXModel.value()]; | ||
| //the bars which disappears at the left side by scrolling | ||
| int leftBars = m_currentPosition * zoomFactor / TimePos::ticksPerBar(); | ||
| //iterates the visible bars and draw the shading on uneven bars | ||
|
|
@@ -3873,7 +3915,7 @@ void PianoRoll::resizeEvent(QResizeEvent* re) | |
| void PianoRoll::adjustLeftRightScoll(int value) | ||
| { | ||
| m_leftRightScroll->setValue(m_leftRightScroll->value() - | ||
| value * 0.3f / m_zoomLevels[m_zoomingXModel.value()]); | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -3984,7 +4026,7 @@ void PianoRoll::wheelEvent(QWheelEvent * we ) | |
| } | ||
| else if( we->modifiers() & Qt::ControlModifier ) | ||
| { | ||
| int z = m_zoomingXModel.value(); | ||
| if(we->angleDelta().y() > 0) | ||
| { | ||
| z++; | ||
|
|
@@ -3993,7 +4035,7 @@ void PianoRoll::wheelEvent(QWheelEvent * we ) | |
| { | ||
| z--; | ||
| } | ||
| z = qBound( 0, z, m_zoomingXModel.size() - 1 ); | ||
|
|
||
| int x = (pos.x() - m_whiteKeyWidth) * TimePos::ticksPerBar(); | ||
| // ticks based on the mouse x-position where the scroll wheel was used | ||
|
|
@@ -4003,7 +4045,7 @@ void PianoRoll::wheelEvent(QWheelEvent * we ) | |
| // scroll so the tick "selected" by the mouse x doesn't move on the screen | ||
| m_leftRightScroll->setValue(m_leftRightScroll->value() + ticks - newTicks); | ||
| // update combobox with zooming-factor | ||
| m_zoomingXModel.setValue( z ); | ||
| } | ||
|
|
||
| // FIXME: Reconsider if determining orientation is necessary in Qt6. | ||
|
|
@@ -4588,8 +4630,23 @@ void PianoRoll::pasteNotes() | |
| } | ||
| } | ||
|
|
||
| void PianoRoll::duplicateNotes() | ||
|
Contributor
There was a problem hiding this comment. Like regulus said, there's no need for duplicate since #7873 does that better |
||
| { | ||
| NoteVector selected_notes = getSelectedNotes(); | ||
| clearSelectedNotes(); | ||
|
|
||
| if( ! selected_notes.empty() ) | ||
| { | ||
| for( const Note *note : selected_notes) | ||
| { | ||
| Note new_note( *note ); | ||
| new_note.setPos( note->pos() ); | ||
| new_note.setSelected( true ); | ||
|
|
||
| m_midiClip->addNote( new_note, false ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| //Return false if no notes are deleted | ||
| bool PianoRoll::deleteSelectedNotes() | ||
|
|
@@ -4704,13 +4761,13 @@ void PianoRoll::updatePositionStepRecording( const TimePos & t ) | |
|
|
||
| void PianoRoll::zoomingChanged() | ||
| { | ||
| m_ppb = m_zoomLevels[m_zoomingXModel.value()] * DEFAULT_PR_PPB; | ||
|
|
||
| assert( m_ppb > 0 ); | ||
|
|
||
| m_timeLine->setPixelsPerBar( m_ppb ); | ||
| m_stepRecorderWidget.setPixelsPerBar( m_ppb ); | ||
| m_positionLine->zoomChange(m_zoomLevels[m_zoomingXModel.value()]); | ||
|
|
||
| update(); | ||
| } | ||
|
|
@@ -4974,18 +5031,22 @@ PianoRollWindow::PianoRollWindow() : | |
|
|
||
| auto pasteAction = new QAction(embed::getIconPixmap("edit_paste"), tr("Paste (%1+V)").arg(UI_CTRL_KEY), this); | ||
|
|
||
| auto duplicateAction = new QAction(embed::getIconPixmap("square_square"), tr("Duplicate (%1+D)").arg(UI_CTRL_KEY), this); | ||
|
|
||
| cutAction->setShortcut(keySequence(Qt::CTRL, Qt::Key_X)); | ||
| copyAction->setShortcut(keySequence(Qt::CTRL, Qt::Key_C)); | ||
| pasteAction->setShortcut(keySequence(Qt::CTRL, Qt::Key_V)); | ||
| duplicateAction->setShortcut(keySequence(Qt::CTRL, Qt::Key_D)); | ||
|
|
||
| connect( cutAction, SIGNAL(triggered()), m_editor, SLOT(cutSelectedNotes())); | ||
| connect( copyAction, SIGNAL(triggered()), m_editor, SLOT(copySelectedNotes())); | ||
| connect( pasteAction, SIGNAL(triggered()), m_editor, SLOT(pasteNotes())); | ||
| connect( duplicateAction, SIGNAL(triggered()), m_editor, SLOT(duplicateNotes())); | ||
|
|
||
| copyPasteActionsToolBar->addAction( cutAction ); | ||
| copyPasteActionsToolBar->addAction( copyAction ); | ||
| copyPasteActionsToolBar->addAction( pasteAction ); | ||
| copyPasteActionsToolBar->addAction( duplicateAction); | ||
|
|
||
| DropToolBar *timeLineToolBar = addDropToolBarToTop( tr( "Timeline controls" ) ); | ||
| m_editor->m_timeLine->addToolButtons( timeLineToolBar ); | ||
|
|
@@ -5025,6 +5086,10 @@ PianoRollWindow::PianoRollWindow() : | |
| connect(reverseAction, &QAction::triggered, [this](){ m_editor->reverseNotes(); }); | ||
| reverseAction->setShortcut(keySequence(Qt::SHIFT, Qt::Key_R)); | ||
|
|
||
| auto flipAction = new QAction(embed::getIconPixmap("flip_y"), tr("Flip Notes"), noteToolsButton); | ||
| connect(flipAction, &QAction::triggered, [this](){ m_editor->flipNotes(); }); | ||
| flipAction->setShortcut(keySequence(Qt::SHIFT, Qt::Key_V)); | ||
|
|
||
| noteToolsButton->addAction(glueAction); | ||
| noteToolsButton->addAction(knifeAction); | ||
| noteToolsButton->addAction(strumAction); | ||
|
|
@@ -5033,6 +5098,7 @@ PianoRollWindow::PianoRollWindow() : | |
| noteToolsButton->addAction(minLengthAction); | ||
| noteToolsButton->addAction(maxLengthAction); | ||
| noteToolsButton->addAction(reverseAction); | ||
| noteToolsButton->addAction(flipAction); | ||
|
|
||
| notesActionsToolBar->addWidget(noteToolsButton); | ||
|
|
||
|
|
@@ -5045,7 +5111,7 @@ PianoRollWindow::PianoRollWindow() : | |
| zoom_lbl->setPixmap( embed::getIconPixmap( "zoom_x" ) ); | ||
|
|
||
| m_zoomingComboBox = new ComboBox( m_toolBar ); | ||
| m_zoomingComboBox->setModel( &m_editor->m_zoomingXModel ); | ||
| m_zoomingComboBox->setFixedSize( 64, ComboBox::DEFAULT_HEIGHT ); | ||
| m_zoomingComboBox->setToolTip( tr( "Horizontal zooming") ); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not do these as a
QActiontoo?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can do that, this just seemed like a more straight forward approach.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use
QKeySequence::ZoomInandZoomOut. That solves the issue with different keyboard layouts and platforms. For example, on my keyboard0=}is the same key, and?+\is another key