Mercurial > hg > sonic-visualiser
changeset 1781:89cf48de5969
Merge from branch streaming-csv-writer
| author | Chris Cannam |
|---|---|
| date | Tue, 17 Apr 2018 11:27:31 +0100 |
| parents | 316c4fd7e7bc (current diff) dc5923962505 (diff) |
| children | 95248f6b9b1d |
| files | |
| diffstat | 3 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.cpp Wed Mar 21 11:18:32 2018 +0000 +++ b/main/MainWindow.cpp Tue Apr 17 11:27:31 2018 +0100 @@ -58,6 +58,7 @@ #include "widgets/LabelCounterInputDialog.h" #include "widgets/ActivityLog.h" #include "widgets/UnitConverter.h" +#include "widgets/ProgressDialog.h" #include "audio/AudioCallbackPlaySource.h" #include "audio/AudioCallbackRecordTarget.h" #include "audio/PlaySpeedRangeMapper.h" @@ -2726,11 +2727,19 @@ if (!multiple) { if (asData) { - CSVFileWriter writer(path, model, + stop(); + ProgressDialog dialog { + QObject::tr("Exporting audio data..."), + true, + 0, + this, + Qt::ApplicationModal + }; + CSVFileWriter writer(path, model, &dialog, ((QFileInfo(path).suffix() == "csv") ? "," : "\t")); if (selectionToWrite) { - writer.writeSelection(selectionToWrite); + writer.writeSelection(*selectionToWrite); } else { writer.write(); }
--- a/vext-lock.json Wed Mar 21 11:18:32 2018 +0000 +++ b/vext-lock.json Tue Apr 17 11:27:31 2018 +0100 @@ -4,10 +4,10 @@ "pin": "8742125177ae" }, "svcore": { - "pin": "48e9f538e6e9" + "pin": "743c38b209d0" }, "svgui": { - "pin": "a34a2a25907c" + "pin": "05d12869043e" }, "svapp": { "pin": "b23bebfdfaba"
--- a/vext-project.json Wed Mar 21 11:18:32 2018 +0000 +++ b/vext-project.json Tue Apr 17 11:27:31 2018 +0100 @@ -16,11 +16,11 @@ }, "svcore": { "vcs": "hg", - "service": "soundsoftware" + "service": "soundsoftware" }, "svgui": { "vcs": "hg", - "service": "soundsoftware" + "service": "soundsoftware" }, "svapp": { "vcs": "hg",