Mercurial > hg > sonic-visualiser
changeset 2342:175ece418988
Merge from branch time-frequency-boxes
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Oct 2019 09:36:11 +0100 |
| parents | f670b7653f8e (diff) 1e77e4ee27f5 (current diff) |
| children | b35d9a313f38 |
| files | repoint-lock.json |
| diffstat | 5 files changed, 22 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Fri Oct 04 16:05:08 2019 +0100 +++ b/CHANGELOG Mon Oct 07 09:36:11 2019 +0100 @@ -1,12 +1,13 @@ -Changes in Sonic Visualiser v4.0 since the previous release 3.3: +Changes in Sonic Visualiser v4.0 (Oct 2019) since the previous release 3.3: - - Add Time-Frequency Box annotation layer type. Because this - introduces a new layer type into the session file format, the major - version number has been bumped to v4.0. (Sessions saved from v4.0 - can be opened in earlier versions of Sonic Visualiser, but any - Time-Frequency Box layers will not be loaded.) - + - Add Box annotation layer type, typically used for time-frequency + boxes to be annotated over a spectrogram. Because this introduces a + new layer type into the session file format, the major version + number has been bumped to v4.0. Sessions saved from v4.0 can be + opened in earlier versions of Sonic Visualiser, but any Box layers + will not be loaded. + Changes in Sonic Visualiser v3.3 (May 2019) since the previous release 3.2.1: @@ -349,7 +350,7 @@ - Update code to build against Qt5 -Changes in Sonic Visualiser 2.0.1 since the previous release 2.0: +Changes in Sonic Visualiser 2.0.1 (Mar 2013) since the previous release 2.0: - Fix incorrect samplerate in reading m4a files on OS/X
--- a/main/MainWindow.cpp Fri Oct 04 16:05:08 2019 +0100 +++ b/main/MainWindow.cpp Mon Oct 07 09:36:11 2019 +0100 @@ -5075,13 +5075,24 @@ layout->addWidget(bb, row++, 0, 1, 3); connect(bb, SIGNAL(accepted()), d, SLOT(accept())); + // Remove spurious linefeeds from DOS line endings text.replace('\r', ""); + + // Un-wrap indented paragraphs (assume they are always preceded by + // an empty line, so don't get merged into prior para) text.replace(QRegExp("(.)\n +(.)"), "\\1 \\2"); + + // Rest of para following a " - " at start becomes bulleted entry text.replace(QRegExp("\n - ([^\n]+)"), "\n<li>\\1</li>"); + + // Line-ending ":" introduces the bulleted list text.replace(QRegExp(": *\n"), ":\n<ul>\n"); + + // Blank line (after unwrapping) ends the bulleted list text.replace(QRegExp("</li>\n\\s*\n"), "</li>\n</ul>\n\n"); + + // Text leading up to that line-ending ":" becomes bold heading text.replace(QRegExp("\n(\\w[^:\n]+:)"), "\n<p><b>\\1</b></p>"); -// text.replace(QRegExp("<li>([^,.\n]+)([,.] +\\w)"), "<li><b>\\1</b>\\2"); textEdit->setHtml(text); textEdit->setReadOnly(true);