comparison layer/SliceLayer.h @ 197:6b023411087b

* Work on harmonising colour and scale ranges between types of layer
* Add normalize options to colour 3d plot layer

 
     enum EnergyScale { LinearScale, MeterScale, dBScale };
 
     enum SamplingMode { NearestSample, SampleMean, SamplePeak };
 
-    enum PlotStyle { PlotLines, PlotSteps, PlotBlocks };
+    enum PlotStyle { PlotLines, PlotSteps, PlotBlocks, PlotFilledBlocks };
 
     enum BinScale { LinearBins, LogBins, InvertedLogBins };
 
     void setBaseColour(QColor);
     QColor getBaseColour() const { return m_colour; }
+
+    void setFillColourMap(int);
+    int getFillColourMap() const { return m_colourMap; }
 
     void setEnergyScale(EnergyScale);
     EnergyScale getEnergyScale() const { return m_energyScale; }
 
     void setSamplingMode(SamplingMode);

     void modelAboutToBeDeleted(Model *);
 
 protected:
     const DenseThreeDimensionalModel *m_sliceableModel;
     QColor                            m_colour;
+    int                               m_colourMap;
     EnergyScale                       m_energyScale;
     SamplingMode                      m_samplingMode;
     PlotStyle                         m_plotStyle;
     BinScale                          m_binScale;
     bool                              m_normalize;