comparison layer/TimeInstantLayer.h @ 1459:42c87368287c

Merge from branch single-point
author Chris Cannam
date Fri, 17 May 2019 10:02:52 +0100
parents 9abddbd57667
children 696e569ff21b
comparison
equal deleted inserted replaced
1441:8d5bf4ab98ef 1459:42c87368287c
110 } 110 }
111 111
112 int getVerticalScaleWidth(LayerGeometryProvider *, bool, QPainter &) const override { return 0; } 112 int getVerticalScaleWidth(LayerGeometryProvider *, bool, QPainter &) const override { return 0; }
113 113
114 protected: 114 protected:
115 SparseOneDimensionalModel::PointList getLocalPoints(LayerGeometryProvider *v, int) const; 115 EventVector getLocalPoints(LayerGeometryProvider *v, int) const;
116 116
117 int getDefaultColourHint(bool dark, bool &impose) override; 117 int getDefaultColourHint(bool dark, bool &impose) override;
118 118
119 bool clipboardAlignmentDiffers(LayerGeometryProvider *v, const Clipboard &) const; 119 bool clipboardAlignmentDiffers(LayerGeometryProvider *v, const Clipboard &) const;
120 120
121 SparseOneDimensionalModel *m_model; 121 SparseOneDimensionalModel *m_model;
122 bool m_editing; 122 bool m_editing;
123 SparseOneDimensionalModel::Point m_editingPoint; 123 Event m_editingPoint;
124 SparseOneDimensionalModel::EditCommand *m_editingCommand; 124 ChangeEventsCommand *m_editingCommand;
125 PlotStyle m_plotStyle; 125 PlotStyle m_plotStyle;
126 126
127 void finish(SparseOneDimensionalModel::EditCommand *command) { 127 void finish(ChangeEventsCommand *command) {
128 Command *c = command->finish(); 128 Command *c = command->finish();
129 if (c) CommandHistory::getInstance()->addCommand(c, false); 129 if (c) CommandHistory::getInstance()->addCommand(c, false);
130 } 130 }
131 }; 131 };
132 132