comparison layer/SpectrumLayer.h @ 1486:ac0a8addabcf

Merge from branch by-id
author Chris Cannam
date Wed, 17 Jul 2019 14:25:16 +0100
parents 696e569ff21b
children
comparison
equal deleted inserted replaced
1468:de41a11cabc2 1486:ac0a8addabcf
35 35
36 public: 36 public:
37 SpectrumLayer(); 37 SpectrumLayer();
38 ~SpectrumLayer(); 38 ~SpectrumLayer();
39 39
40 void setModel(DenseTimeValueModel *model); 40 void setModel(ModelId model); // a DenseTimeValueModel
41 virtual const Model *getModel() const override { return m_originModel; } 41 virtual ModelId getModel() const override { return m_originModel; }
42 42
43 virtual bool getCrosshairExtents(LayerGeometryProvider *, QPainter &, QPoint cursorPos, 43 virtual bool getCrosshairExtents(LayerGeometryProvider *, QPainter &, QPoint cursorPos,
44 std::vector<QRect> &extents) const override; 44 std::vector<QRect> &extents) const override;
45 virtual void paintCrosshairs(LayerGeometryProvider *, QPainter &, QPoint) const override; 45 virtual void paintCrosshairs(LayerGeometryProvider *, QPainter &, QPoint) const override;
46 46
113 113
114 protected slots: 114 protected slots:
115 void preferenceChanged(PropertyContainer::PropertyName name); 115 void preferenceChanged(PropertyContainer::PropertyName name);
116 116
117 protected: 117 protected:
118 DenseTimeValueModel *m_originModel; 118 ModelId m_originModel; // a DenseTimeValueModel
119 int m_channel; 119 int m_channel;
120 bool m_channelSet; 120 bool m_channelSet;
121 int m_windowSize; 121 int m_windowSize;
122 WindowType m_windowType; 122 WindowType m_windowType;
123 int m_windowHopLevel; 123 int m_windowHopLevel;