comparison layer/Colour3DPlotLayer.h @ 1459:42c87368287c

Merge from branch single-point

     bool getOpaque() const;
 
     void setSmooth(bool i);
     bool getSmooth() const;
 
+    bool hasLightBackground() const override;
+
     bool getValueExtents(double &min, double &max,
                                  bool &logarithmic, QString &unit) const override;
 
     bool getDisplayExtents(double &min, double &max) const override;
     bool setDisplayExtents(double min, double max) override;

 
     void toXml(QTextStream &stream, QString indent = "",
                        QString extraAttributes = "") const override;
 
 protected slots:
-    void cacheInvalid();
-    void cacheInvalid(sv_frame_t startFrame, sv_frame_t endFrame);
-    void modelChanged();
-    void modelChangedWithin(sv_frame_t, sv_frame_t);
+    void handleModelChanged();
+    void handleModelChangedWithin(sv_frame_t, sv_frame_t);
 
 protected:
     const DenseThreeDimensionalModel *m_model; // I do not own this
     
     ColourScaleType m_colourScale;

     static int convertFromColumnNorm(ColumnNormalization norm, bool visible);
 
     mutable Dense3DModelPeakCache *m_peakCache;
     const int m_peakCacheDivisor;
     Dense3DModelPeakCache *getPeakCache() const;
+    void invalidatePeakCache();
 
     typedef std::map<int, MagnitudeRange> ViewMagMap; // key is view id
     mutable ViewMagMap m_viewMags;
     mutable ViewMagMap m_lastRenderedMags; // when in normalizeVisibleArea mode
     void invalidateMagnitudes();