Mercurial > hg > svgui
diff layer/TimeValueLayer.h @ 1459:42c87368287c
Merge from branch single-point
author | Chris Cannam |
---|---|
date | Fri, 17 May 2019 10:02:52 +0100 |
parents | 8a7c82282fbc |
children | 696e569ff21b |
line wrap: on
line diff
--- a/layer/TimeValueLayer.h Wed Apr 24 11:29:53 2019 +0100 +++ b/layer/TimeValueLayer.h Fri May 17 10:02:52 2019 +0100 @@ -174,15 +174,15 @@ void getScaleExtents(LayerGeometryProvider *, double &min, double &max, bool &log) const; bool shouldAutoAlign() const; - SparseTimeValueModel::PointList getLocalPoints(LayerGeometryProvider *v, int) const; + EventVector getLocalPoints(LayerGeometryProvider *v, int) const; int getDefaultColourHint(bool dark, bool &impose) override; SparseTimeValueModel *m_model; bool m_editing; - SparseTimeValueModel::Point m_originalPoint; - SparseTimeValueModel::Point m_editingPoint; - SparseTimeValueModel::EditCommand *m_editingCommand; + Event m_originalPoint; + Event m_editingPoint; + ChangeEventsCommand *m_editingCommand; int m_colourMap; bool m_colourInverted; PlotStyle m_plotStyle; @@ -193,7 +193,7 @@ mutable double m_scaleMinimum; mutable double m_scaleMaximum; - void finish(SparseTimeValueModel::EditCommand *command) { + void finish(ChangeEventsCommand *command) { Command *c = command->finish(); if (c) CommandHistory::getInstance()->addCommand(c, false); }