comparison layer/WaveformLayer.h @ 287:cd2492c5fe45

* Add SingleColourLayer to manage colours for layers that have a single
  predominant colour (i.e. most of them).

 
 #ifndef _WAVEFORM_LAYER_H_
 #define _WAVEFORM_LAYER_H_
 
 #include <QRect>
-#include <QColor>
-
-#include "Layer.h"
+
+#include "SingleColourLayer.h"
 
 #include "data/model/RangeSummarisableTimeValueModel.h"
 
 class View;
 class QPainter;
 class QPixmap;
 
-class WaveformLayer : public Layer
+class WaveformLayer : public SingleColourLayer
 {
     Q_OBJECT
 
 public:
     WaveformLayer();

     virtual const Model *getModel() const { return m_model; }
     virtual void paint(View *v, QPainter &paint, QRect rect) const;
 
     virtual QString getFeatureDescription(View *v, QPoint &) const;
 
+    virtual ColourSignificance getLayerColourSignificance() const {
+        return ColourAndBackgroundSignificant;
+    }
+
     virtual int getVerticalScaleWidth(View *v, QPainter &) const;
     virtual void paintVerticalScale(View *v, QPainter &paint, QRect rect) const;
-
-    virtual bool hasLightBackground() const;
 
     void setModel(const RangeSummarisableTimeValueModel *model);
 
     virtual PropertyList getProperties() const;
     virtual QString getPropertyLabel(const PropertyName &) const;

      */
     void setAutoNormalize(bool);
     bool getAutoNormalize() const { return m_autoNormalize; }
 
     /**
-     * Set the basic display colour for waveforms.  The parameter is
-     * a ColourDatabase index.
-     *
-     * The default is the first colour in the database.
-     *!!! NB should default to white if the associated View !hasLightBackground()
-     */
-    void setBaseColour(int);
-    int getBaseColour() const;
-
-    /**
      * Set whether to display mean values as a lighter-coloured area
      * beneath the peaks.  Rendering will be slightly faster without
      * but arguably prettier with.
      *
      * The default is to display means.

                                      float &diff, QString &unit) const;
 
     virtual QString toXmlString(QString indent = "",
 				QString extraAttributes = "") const;
 
-    void setProperties(const QXmlAttributes &attributes);
+    virtual void setProperties(const QXmlAttributes &attributes);
 
     virtual int getVerticalZoomSteps(int &defaultStep) const;
     virtual int getCurrentVerticalZoomStep() const;
     virtual void setVerticalZoomStep(int);
 

 
     int getYForValue(const View *v, float value, size_t channel) const;
 
     float getValueForY(const View *v, int y, size_t &channel) const;
 
+    virtual void flagBaseColourChanged() { m_cacheValid = false; }
+
     float        m_gain;
     bool         m_autoNormalize;
-    int          m_colour;
     bool         m_showMeans;
     bool         m_greyscale;
     ChannelMode  m_channelMode;
     int          m_channel;
     Scale        m_scale;