comparison data/model/Dense3DModelPeakCache.h @ 929:59e7fe1b1003 warnfix_no_size_t

Unsigned removals and warning fixes in data/
author Chris Cannam
date Tue, 17 Jun 2014 14:33:42 +0100
parents 95391b480e17
children cc27f35aa75c
comparison
equal deleted inserted replaced
928:6a94bb528e9d 929:59e7fe1b1003
24 { 24 {
25 Q_OBJECT 25 Q_OBJECT
26 26
27 public: 27 public:
28 Dense3DModelPeakCache(DenseThreeDimensionalModel *source, 28 Dense3DModelPeakCache(DenseThreeDimensionalModel *source,
29 size_t columnsPerPeak); 29 int columnsPerPeak);
30 ~Dense3DModelPeakCache(); 30 ~Dense3DModelPeakCache();
31 31
32 virtual bool isOK() const { 32 virtual bool isOK() const {
33 return m_source && m_source->isOK(); 33 return m_source && m_source->isOK();
34 } 34 }
35 35
36 virtual size_t getSampleRate() const { 36 virtual int getSampleRate() const {
37 return m_source->getSampleRate(); 37 return m_source->getSampleRate();
38 } 38 }
39 39
40 virtual size_t getStartFrame() const { 40 virtual int getStartFrame() const {
41 return m_source->getStartFrame(); 41 return m_source->getStartFrame();
42 } 42 }
43 43
44 virtual size_t getEndFrame() const { 44 virtual int getEndFrame() const {
45 return m_source->getEndFrame(); 45 return m_source->getEndFrame();
46 } 46 }
47 47
48 virtual Model *clone() const { 48 virtual Model *clone() const {
49 return new Dense3DModelPeakCache(m_source, m_resolution); 49 return new Dense3DModelPeakCache(m_source, m_resolution);
50 } 50 }
51 51
52 virtual size_t getResolution() const { 52 virtual int getResolution() const {
53 return m_source->getResolution() * m_resolution; 53 return m_source->getResolution() * m_resolution;
54 } 54 }
55 55
56 virtual size_t getWidth() const { 56 virtual int getWidth() const {
57 return m_source->getWidth() / m_resolution + 1; 57 return m_source->getWidth() / m_resolution + 1;
58 } 58 }
59 59
60 virtual size_t getHeight() const { 60 virtual int getHeight() const {
61 return m_source->getHeight(); 61 return m_source->getHeight();
62 } 62 }
63 63
64 virtual float getMinimumLevel() const { 64 virtual float getMinimumLevel() const {
65 return m_source->getMinimumLevel(); 65 return m_source->getMinimumLevel();
67 67
68 virtual float getMaximumLevel() const { 68 virtual float getMaximumLevel() const {
69 return m_source->getMaximumLevel(); 69 return m_source->getMaximumLevel();
70 } 70 }
71 71
72 virtual bool isColumnAvailable(size_t column) const; 72 virtual bool isColumnAvailable(int column) const;
73 73
74 virtual Column getColumn(size_t column) const; 74 virtual Column getColumn(int column) const;
75 75
76 virtual float getValueAt(size_t column, size_t n) const; 76 virtual float getValueAt(int column, int n) const;
77 77
78 virtual QString getBinName(size_t n) const { 78 virtual QString getBinName(int n) const {
79 return m_source->getBinName(n); 79 return m_source->getBinName(n);
80 } 80 }
81 81
82 virtual bool shouldUseLogValueScale() const { 82 virtual bool shouldUseLogValueScale() const {
83 return m_source->shouldUseLogValueScale(); 83 return m_source->shouldUseLogValueScale();
95 95
96 private: 96 private:
97 DenseThreeDimensionalModel *m_source; 97 DenseThreeDimensionalModel *m_source;
98 mutable EditableDenseThreeDimensionalModel *m_cache; 98 mutable EditableDenseThreeDimensionalModel *m_cache;
99 mutable ResizeableBitset m_coverage; 99 mutable ResizeableBitset m_coverage;
100 size_t m_resolution; 100 int m_resolution;
101 101
102 bool haveColumn(size_t column) const; 102 bool haveColumn(int column) const;
103 void fillColumn(size_t column) const; 103 void fillColumn(int column) const;
104 }; 104 };
105 105
106 106
107 #endif 107 #endif