LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

improved export parameter list behavior. Allow multiple deliminators: ',', ';', ' '

Browse Source
This commit is contained in:
suter_a 2022-09-02 14:40:12 +02:00
parent 531d238fa3
commit e6ad904fee
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/musredit_qt5/musredit/PTextEdit.cpp
View File

@ -61,6 +61,7 @@
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
#include <QDesktopServices> #include <QDesktopServices>
#include <QUrl> #include <QUrl>
#include <QRegExp>
#include <QtDebug> #include <QtDebug>
@ -2287,7 +2288,11 @@ void PTextEdit::musrMsr2Data()
// parameter export list // parameter export list
if (!fMsr2DataParam->paramList.isEmpty()) { if (!fMsr2DataParam->paramList.isEmpty()) {
cmd.append("paramList"); cmd.append("paramList");
QStringList list = fMsr2DataParam->paramList.split(' '); #if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
QStringList list = fMsr2DataParam->paramList.split(QRegExp("[(\\s|,|;)]"), QString::SkipEmptyParts);
#else
QStringList list = fMsr2DataParam->paramList.split(QRegExp("[(\\s|,|;)]"), Qt::SkipEmptyParts);
#endif
for (int i=0; i<list.size(); i++) for (int i=0; i<list.size(); i++)
cmd.append(list[i]); cmd.append(list[i]);
} }

2
src/musredit_qt6/musredit/PTextEdit.cpp
View File

@ -2288,7 +2288,7 @@ void PTextEdit::musrMsr2Data()
// parameter export list // parameter export list
if (!fMsr2DataParam->paramList.isEmpty()) { if (!fMsr2DataParam->paramList.isEmpty()) {
cmd.append("paramList"); cmd.append("paramList");
QStringList list = fMsr2DataParam->paramList.split(' '); QStringList list = fMsr2DataParam->paramList.split(QRegExp("[(\\s|,|;)]"), Qt::SkipEmptyParts);
for (int i=0; i<list.size(); i++) for (int i=0; i<list.size(); i++)
cmd.append(list[i]); cmd.append(list[i]);
} }