comparison layer/NoteLayer.h @ 1424:2ee77c9974d7 single-point

Toward getting NoteLayer to work with single-point APIs
author Chris Cannam
date Wed, 13 Mar 2019 16:00:55 +0000
parents 6f51297a0250
children f792a5001d80
comparison
equal deleted inserted replaced
1423:62e908518c71 1424:2ee77c9974d7
140 void getScaleExtents(LayerGeometryProvider *, double &min, double &max, bool &log) const; 140 void getScaleExtents(LayerGeometryProvider *, double &min, double &max, bool &log) const;
141 bool shouldConvertMIDIToHz() const; 141 bool shouldConvertMIDIToHz() const;
142 142
143 int getDefaultColourHint(bool dark, bool &impose) override; 143 int getDefaultColourHint(bool dark, bool &impose) override;
144 144
145 NoteModel::PointList getLocalPoints(LayerGeometryProvider *v, int) const; 145 EventVector getLocalPoints(LayerGeometryProvider *v, int) const;
146 146
147 bool getPointToDrag(LayerGeometryProvider *v, int x, int y, NoteModel::Point &) const; 147 bool getPointToDrag(LayerGeometryProvider *v, int x, int y, Event &) const;
148 148
149 NoteModel *m_model; 149 NoteModel *m_model;
150 bool m_editing; 150 bool m_editing;
151 int m_dragPointX; 151 int m_dragPointX;
152 int m_dragPointY; 152 int m_dragPointY;
153 int m_dragStartX; 153 int m_dragStartX;
154 int m_dragStartY; 154 int m_dragStartY;
155 NoteModel::Point m_originalPoint; 155 Event m_originalPoint;
156 NoteModel::Point m_editingPoint; 156 Event m_editingPoint;
157 NoteModel::EditCommand *m_editingCommand; 157 NoteModel::EditCommand *m_editingCommand;
158 bool m_editIsOpen; 158 bool m_editIsOpen;
159 VerticalScale m_verticalScale; 159 VerticalScale m_verticalScale;
160 160
161 typedef std::set<NoteModel::Point, NoteModel::Point::Comparator> NoteSet; 161 typedef std::set<Event> NoteSet;
162 NoteSet m_pendingNoteOns; 162 NoteSet m_pendingNoteOns;
163 163
164 mutable double m_scaleMinimum; 164 mutable double m_scaleMinimum;
165 mutable double m_scaleMaximum; 165 mutable double m_scaleMaximum;
166 166