Mercurial > hg > svcore
comparison data/model/EditableDenseThreeDimensionalModel.h @ 1111:457a1a619c5f simple-fft-model
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 07 Jan 2015 17:42:21 +0000 |
parents | 1517d4c60e88 |
children | aa588c391d1a |
comparison
equal
deleted
inserted
replaced
1108:16574eea3229 | 1111:457a1a619c5f |
---|---|
220 CompressionType m_compression; | 220 CompressionType m_compression; |
221 float m_minimum; | 221 float m_minimum; |
222 float m_maximum; | 222 float m_maximum; |
223 bool m_haveExtents; | 223 bool m_haveExtents; |
224 bool m_notifyOnAdd; | 224 bool m_notifyOnAdd; |
225 long m_sinceLastNotifyMin; | 225 sv_frame_t m_sinceLastNotifyMin; |
226 long m_sinceLastNotifyMax; | 226 sv_frame_t m_sinceLastNotifyMax; |
227 int m_completion; | 227 int m_completion; |
228 | 228 |
229 mutable QReadWriteLock m_lock; | 229 mutable QReadWriteLock m_lock; |
230 }; | 230 }; |
231 | 231 |