Mercurial > hg > svgui
comparison layer/Colour3DPlotLayer.h @ 1459:42c87368287c
Merge from branch single-point
author | Chris Cannam |
---|---|
date | Fri, 17 May 2019 10:02:52 +0100 |
parents | 39f1154c0e97 |
children | 11a150e65ee1 |
comparison
equal
deleted
inserted
replaced
1441:8d5bf4ab98ef | 1459:42c87368287c |
---|---|
127 bool getOpaque() const; | 127 bool getOpaque() const; |
128 | 128 |
129 void setSmooth(bool i); | 129 void setSmooth(bool i); |
130 bool getSmooth() const; | 130 bool getSmooth() const; |
131 | 131 |
132 bool hasLightBackground() const override; | |
133 | |
132 bool getValueExtents(double &min, double &max, | 134 bool getValueExtents(double &min, double &max, |
133 bool &logarithmic, QString &unit) const override; | 135 bool &logarithmic, QString &unit) const override; |
134 | 136 |
135 bool getDisplayExtents(double &min, double &max) const override; | 137 bool getDisplayExtents(double &min, double &max) const override; |
136 bool setDisplayExtents(double min, double max) override; | 138 bool setDisplayExtents(double min, double max) override; |
147 | 149 |
148 void toXml(QTextStream &stream, QString indent = "", | 150 void toXml(QTextStream &stream, QString indent = "", |
149 QString extraAttributes = "") const override; | 151 QString extraAttributes = "") const override; |
150 | 152 |
151 protected slots: | 153 protected slots: |
152 void cacheInvalid(); | 154 void handleModelChanged(); |
153 void cacheInvalid(sv_frame_t startFrame, sv_frame_t endFrame); | 155 void handleModelChangedWithin(sv_frame_t, sv_frame_t); |
154 void modelChanged(); | |
155 void modelChangedWithin(sv_frame_t, sv_frame_t); | |
156 | 156 |
157 protected: | 157 protected: |
158 const DenseThreeDimensionalModel *m_model; // I do not own this | 158 const DenseThreeDimensionalModel *m_model; // I do not own this |
159 | 159 |
160 ColourScaleType m_colourScale; | 160 ColourScaleType m_colourScale; |
183 static int convertFromColumnNorm(ColumnNormalization norm, bool visible); | 183 static int convertFromColumnNorm(ColumnNormalization norm, bool visible); |
184 | 184 |
185 mutable Dense3DModelPeakCache *m_peakCache; | 185 mutable Dense3DModelPeakCache *m_peakCache; |
186 const int m_peakCacheDivisor; | 186 const int m_peakCacheDivisor; |
187 Dense3DModelPeakCache *getPeakCache() const; | 187 Dense3DModelPeakCache *getPeakCache() const; |
188 void invalidatePeakCache(); | |
188 | 189 |
189 typedef std::map<int, MagnitudeRange> ViewMagMap; // key is view id | 190 typedef std::map<int, MagnitudeRange> ViewMagMap; // key is view id |
190 mutable ViewMagMap m_viewMags; | 191 mutable ViewMagMap m_viewMags; |
191 mutable ViewMagMap m_lastRenderedMags; // when in normalizeVisibleArea mode | 192 mutable ViewMagMap m_lastRenderedMags; // when in normalizeVisibleArea mode |
192 void invalidateMagnitudes(); | 193 void invalidateMagnitudes(); |