Mercurial > hg > tony
comparison src/Analyser.cpp @ 200:13fc8473002c
Fix #882 (double-clicking "non-note" location calculates pitch candidates for whole rest of the piece)
author | Chris Cannam |
---|---|
date | Wed, 05 Mar 2014 13:37:17 +0000 |
parents | 0ba33d6c0a71 |
children | 43cc5f7cc554 |
comparison
equal
deleted
inserted
replaced
199:0ba33d6c0a71 | 200:13fc8473002c |
---|---|
252 } | 252 } |
253 | 253 |
254 QString | 254 QString |
255 Analyser::reAnalyseSelection(Selection sel, FrequencyRange range) | 255 Analyser::reAnalyseSelection(Selection sel, FrequencyRange range) |
256 { | 256 { |
257 if (sel == m_reAnalysingSelection) return ""; | 257 if (sel == m_reAnalysingSelection || sel.isEmpty()) return ""; |
258 | 258 |
259 discardPitchCandidates(); | 259 discardPitchCandidates(); |
260 | 260 |
261 m_reAnalysingSelection = sel; | 261 m_reAnalysingSelection = sel; |
262 | 262 |
304 | 304 |
305 if (sel.getEndFrame() > sel.getStartFrame()) { | 305 if (sel.getEndFrame() > sel.getStartFrame()) { |
306 duration = end - start; | 306 duration = end - start; |
307 } | 307 } |
308 | 308 |
309 cerr << "Analyser::reAnalyseSelection: start " << start << " end " << end << " original selection start " << sel.getStartFrame() << " end " << sel.getEndFrame() << " duration " << duration << endl; | |
310 | |
311 if (duration <= RealTime::zeroTime) { | |
312 cerr << "Analyser::reAnalyseSelection: duration <= 0, not analysing" << endl; | |
313 return ""; | |
314 } | |
315 | |
309 t.setStartTime(start); | 316 t.setStartTime(start); |
310 t.setDuration(duration); | 317 t.setDuration(duration); |
311 | 318 |
312 transforms.push_back(t); | 319 transforms.push_back(t); |
313 | 320 |