comparison src/Analyser.h @ 165:ebcfb8dce020

Replace previous candidates when making a new analysis. Also revert to built-in spectrogram for now (CQ is still pending)
author Chris Cannam
date Fri, 31 Jan 2014 17:54:49 +0000
parents 62ceae757fe0
children 6b6906017536
comparison
equal deleted inserted replaced
164:62ceae757fe0 165:ebcfb8dce020
82 void setPan(Component c, float pan); 82 void setPan(Component c, float pan);
83 83
84 void getEnclosingSelectionScope(size_t f, size_t &f0, size_t &f1); 84 void getEnclosingSelectionScope(size_t f, size_t &f0, size_t &f1);
85 85
86 /** 86 /**
87 * Analyse the selection and add candidates layers for the region 87 * Analyse the selection and schedule asynchronous adds of
88 * it contains. Returns "" on success or a user-readable error 88 * candidate layers for the region it contains. Returns "" on
89 * string on failure. 89 * success or a user-readable error string on failure.
90 */ 90 */
91 QString reAnalyseSelection(Selection sel); 91 QString reAnalyseSelection(Selection sel);
92 92
93 signals: 93 signals:
94 void layersChanged(); 94 void layersChanged();
96 protected: 96 protected:
97 Document *m_document; 97 Document *m_document;
98 WaveFileModel *m_fileModel; 98 WaveFileModel *m_fileModel;
99 PaneStack *m_paneStack; 99 PaneStack *m_paneStack;
100 Pane *m_pane; 100 Pane *m_pane;
101
101 mutable std::map<Component, Layer *> m_layers; 102 mutable std::map<Component, Layer *> m_layers;
103
104 Selection m_reAnalysingSelection;
105 std::vector<Layer *> m_reAnalysisCandidates;
102 106
103 QString addVisualisations(); 107 QString addVisualisations();
104 QString addWaveform(); 108 QString addWaveform();
105 QString addAnalyses(); 109 QString addAnalyses();
106
107 QString addTestCandidates(Selection sel);
108 110
109 // Document::LayerCreationHandler method 111 // Document::LayerCreationHandler method
110 void layersCreated(std::vector<Layer *>, std::vector<Layer *>); 112 void layersCreated(std::vector<Layer *>, std::vector<Layer *>);
111 113
112 void saveState(Component c) const; 114 void saveState(Component c) const;