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

Add save/load of PianoRoll marked semitones (#5146)

Browse Source
This commit is contained in:
Kevin Zander
2019-09-14 11:57:44 -05:00
committed by Shmuel H
parent 9eb6e3fa33
commit b07c007a27
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/PianoRoll.h
View File

@@ -95,6 +95,7 @@ public:
void setCurrentPattern( Pattern* newPattern );
void setGhostPattern( Pattern* newPattern );
void loadGhostNotes( const QDomElement & de );
void loadMarkedSemiTones(const QDomElement & de);
inline void stopRecording()
{

42
src/gui/editors/PianoRoll.cpp
View File

@@ -24,6 +24,8 @@
*
*/
#include "PianoRoll.h"
#include <QApplication>
#include <QClipboard>
#include <QKeyEvent>
@@ -46,7 +48,6 @@
#include "AutomationEditor.h"
#include "ActionGroup.h"
#include "ConfigManager.h"
#include "PianoRoll.h"
#include "BBTrackContainer.h"
#include "Clipboard.h"
#include "ComboBox.h"
@@ -655,6 +656,32 @@ void PianoRoll::clearGhostPattern()
}
void PianoRoll::loadMarkedSemiTones(const QDomElement & de)
{
// clear marked semitones to prevent leftover marks
m_markedSemiTones.clear();
if (de.isElement())
{
QDomNode node = de.firstChild();
while (!node.isNull())
{
bool ok;
int key = node.toElement().attribute(
QString("key"), QString("-1")).toInt(&ok, 10);
if (ok && key >= 0)
{
m_markedSemiTones.append(key);
}
node = node.nextSibling();
}
}
// from markSemiTone, required otherwise marks will not show
std::sort(m_markedSemiTones.begin(), m_markedSemiTones.end(), std::greater<int>());
QList<int>::iterator new_end = std::unique(m_markedSemiTones.begin(), m_markedSemiTones.end());
m_markedSemiTones.erase(new_end, m_markedSemiTones.end());
}
void PianoRoll::setCurrentPattern( Pattern* newPattern )
{
if( hasValidPattern() )
@@ -4697,6 +4724,18 @@ void PianoRollWindow::saveSettings( QDomDocument & doc, QDomElement & de )
de.appendChild( ghostNotesRoot );
}
if (m_editor->m_markedSemiTones.length() > 0)
{
QDomElement markedSemiTonesRoot = doc.createElement("markedSemiTones");
for (int ix = 0; ix < m_editor->m_markedSemiTones.size(); ++ix)
{
QDomElement semiToneNode = doc.createElement("semiTone");
semiToneNode.setAttribute("key", m_editor->m_markedSemiTones.at(ix));
markedSemiTonesRoot.appendChild(semiToneNode);
}
de.appendChild(markedSemiTonesRoot);
}
MainWindow::saveWidgetState( this, de );
}
@@ -4706,6 +4745,7 @@ void PianoRollWindow::saveSettings( QDomDocument & doc, QDomElement & de )
void PianoRollWindow::loadSettings( const QDomElement & de )
{
m_editor->loadGhostNotes( de.firstChildElement("ghostnotes") );
m_editor->loadMarkedSemiTones(de.firstChildElement("markedSemiTones"));
MainWindow::restoreWidgetState( this, de );
}