Mercurial > hg > svgui
diff layer/TimeInstantLayer.cpp @ 1423:62e908518c71 single-point
Update to Event api in place of Clipboard points
author | Chris Cannam |
---|---|
date | Fri, 08 Mar 2019 13:37:30 +0000 |
parents | c8a6fd3f9dff |
children | 9abddbd57667 |
line wrap: on
line diff
--- a/layer/TimeInstantLayer.cpp Tue Mar 05 10:02:48 2019 +0000 +++ b/layer/TimeInstantLayer.cpp Fri Mar 08 13:37:30 2019 +0000 @@ -761,9 +761,8 @@ for (SparseOneDimensionalModel::PointList::iterator i = points.begin(); i != points.end(); ++i) { if (s.contains(i->frame)) { - Clipboard::Point point(i->frame, i->label); - point.setReferenceFrame(alignToReference(v, i->frame)); - to.addPoint(point); + Event point(i->frame, i->label); + to.addPoint(point.withReferenceFrame(alignToReference(v, i->frame))); } } } @@ -773,7 +772,7 @@ { if (!m_model) return false; - const Clipboard::PointList &points = from.getPoints(); + const EventVector &points = from.getPoints(); bool realign = false; @@ -797,11 +796,9 @@ SparseOneDimensionalModel::EditCommand *command = new SparseOneDimensionalModel::EditCommand(m_model, tr("Paste")); - for (Clipboard::PointList::const_iterator i = points.begin(); + for (EventVector::const_iterator i = points.begin(); i != points.end(); ++i) { - if (!i->haveFrame()) continue; - sv_frame_t frame = 0; if (!realign) { @@ -810,7 +807,7 @@ } else { - if (i->haveReferenceFrame()) { + if (i->hasReferenceFrame()) { frame = i->getReferenceFrame(); frame = alignFromReference(v, frame); } else { @@ -825,9 +822,9 @@ } SparseOneDimensionalModel::Point newPoint(frame); - if (i->haveLabel()) { + if (i->hasLabel()) { newPoint.label = i->getLabel(); - } else if (i->haveValue()) { + } else if (i->hasValue()) { newPoint.label = QString("%1").arg(i->getValue()); }