Mercurial > hg > svcore

comparison data/model/FFTModel.cpp @ 334:aa8dbac62024

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Pass StorageAdviser::Criteria into FFTModel constructor etc
author Chris Cannam
date Sun, 11 Nov 2007 20:31:12 +0000
parents c022976d18e8
children ac300d385ab2 94fc0591ea43
comparison
equal deleted inserted replaced
333:1afaf98dbf11 334:aa8dbac62024
27 WindowType windowType, 27 WindowType windowType,
28 size_t windowSize, 28 size_t windowSize,
29 size_t windowIncrement, 29 size_t windowIncrement,
30 size_t fftSize, 30 size_t fftSize,
31 bool polar, 31 bool polar,
32 StorageAdviser::Criteria criteria,
32 size_t fillFromColumn) : 33 size_t fillFromColumn) :
33 //!!! ZoomConstraint! 34 //!!! ZoomConstraint!
34 m_server(0), 35 m_server(0),
35 m_xshift(0), 36 m_xshift(0),
36 m_yshift(0) 37 m_yshift(0)
42 windowType, 43 windowType,
43 windowSize, 44 windowSize,
44 windowIncrement, 45 windowIncrement,
45 fftSize, 46 fftSize,
46 polar, 47 polar,
48 criteria,
47 fillFromColumn); 49 fillFromColumn);
48 50
49 if (!m_server) return; // caller should check isOK() 51 if (!m_server) return; // caller should check isOK()
50 52
51 size_t xratio = windowIncrement / m_server->getWindowIncrement(); 53 size_t xratio = windowIncrement / m_server->getWindowIncrement();
86 WindowType windowType, 88 WindowType windowType,
87 size_t windowSize, 89 size_t windowSize,
88 size_t windowIncrement, 90 size_t windowIncrement,
89 size_t fftSize, 91 size_t fftSize,
90 bool polar, 92 bool polar,
93 StorageAdviser::Criteria criteria,
91 size_t fillFromColumn) 94 size_t fillFromColumn)
92 { 95 {
93 // Obviously, an FFT model of channel C (where C != -1) of an 96 // Obviously, an FFT model of channel C (where C != -1) of an
94 // aggregate model is the same as the FFT model of the appropriate 97 // aggregate model is the same as the FFT model of the appropriate
95 // channel of whichever model that aggregate channel is drawn 98 // channel of whichever model that aggregate channel is drawn
117 windowType, 120 windowType,
118 windowSize, 121 windowSize,
119 windowIncrement, 122 windowIncrement,
120 fftSize, 123 fftSize,
121 polar, 124 polar,
125 criteria,
122 fillFromColumn); 126 fillFromColumn);
123 } 127 }
124 } 128 }
125 129
126 // The normal case 130 // The normal case
130 windowType, 134 windowType,
131 windowSize, 135 windowSize,
132 windowIncrement, 136 windowIncrement,
133 fftSize, 137 fftSize,
134 polar, 138 polar,
139 criteria,
135 fillFromColumn); 140 fillFromColumn);
136 } 141 }
137 142
138 size_t 143 size_t
139 FFTModel::getSampleRate() const 144 FFTModel::getSampleRate() const