comparison layer/FlexiNoteLayer.h @ 649:2ad082c5a090 tonioni

boundary actions and note delete consolidated
author gyorgyf
date Sun, 16 Jun 2013 20:40:05 +0100
parents ba76130ed7e5
children 76c5dfe333ee
comparison
equal deleted inserted replaced
648:f61a54364d1d 649:2ad082c5a090
86 AutoAlignScale, 86 AutoAlignScale,
87 LinearScale, 87 LinearScale,
88 LogScale, 88 LogScale,
89 MIDIRangeScale 89 MIDIRangeScale
90 }; 90 };
91
92 //GF: Tonioni: context sensitive note edit actions (denoted clockwise from top).
93 enum EditMode {
94 dragNote,
95 rightBoundary,
96 splitNote,
97 leftBoundary
98 };
91 99
92 void setVerticalScale(VerticalScale scale); 100 void setVerticalScale(VerticalScale scale);
93 VerticalScale getVerticalScale() const { return m_verticalScale; } 101 VerticalScale getVerticalScale() const { return m_verticalScale; }
94 102
95 virtual bool isLayerScrollable(const View *v) const; 103 virtual bool isLayerScrollable(const View *v) const;
156 int m_dragStartY; 164 int m_dragStartY;
157 FlexiNoteModel::Point m_originalPoint; 165 FlexiNoteModel::Point m_originalPoint;
158 FlexiNoteModel::Point m_editingPoint; 166 FlexiNoteModel::Point m_editingPoint;
159 FlexiNoteModel::EditCommand *m_editingCommand; 167 FlexiNoteModel::EditCommand *m_editingCommand;
160 VerticalScale m_verticalScale; 168 VerticalScale m_verticalScale;
169 EditMode m_editMode;
161 170
162 typedef std::set<FlexiNoteModel::Point, FlexiNoteModel::Point::Comparator> FlexiNoteSet; 171 typedef std::set<FlexiNoteModel::Point, FlexiNoteModel::Point::Comparator> FlexiNoteSet;
163 FlexiNoteSet m_pendingNoteOns; 172 FlexiNoteSet m_pendingNoteOns;
164 173
165 mutable float m_scaleMinimum; 174 mutable float m_scaleMinimum;