Mercurial > hg > svcore
comparison data/model/EditableDenseThreeDimensionalModel.h @ 1126:39019ce29178 tony-2.0-integration
Merge through to branch for Tony 2.0
| author | Chris Cannam |
|---|---|
| date | Thu, 20 Aug 2015 14:54:21 +0100 |
| parents | 1517d4c60e88 |
| children | aa588c391d1a |
comparison
equal
deleted
inserted
replaced
| 1119:e22bfe8ca248 | 1126:39019ce29178 |
|---|---|
| 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 |