Mercurial > hg > svapp
diff framework/MainWindowBase.cpp @ 649:284cb118368e single-point
Further updates for new API - but we still need some more support in the API itself
author | Chris Cannam |
---|---|
date | Tue, 19 Mar 2019 13:06:58 +0000 |
parents | eec0c50bb44f |
children | b63dfd7e2780 |
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp Fri Mar 15 14:24:46 2019 +0000 +++ b/framework/MainWindowBase.cpp Tue Mar 19 13:06:58 2019 +0000 @@ -1162,14 +1162,14 @@ m_labeller->setSampleRate(sodm->getSampleRate()); - if (m_labeller->actingOnPrevPoint() && havePrevPoint) { + if (m_labeller->actingOnPrevEvent() && havePrevPoint) { command->deletePoint(prevPoint); } - +/*!!! to be updated after we have switched SODM to new API m_labeller->label<SparseOneDimensionalModel::Point> (point, havePrevPoint ? &prevPoint : nullptr); - - if (m_labeller->actingOnPrevPoint() && havePrevPoint) { +*/ + if (m_labeller->actingOnPrevEvent() && havePrevPoint) { command->addPoint(prevPoint); } } @@ -1282,9 +1282,10 @@ Labeller labeller(*m_labeller); labeller.setSampleRate(sodm->getSampleRate()); - +/*!!! to be updated after SODM API update Command *c = labeller.labelAll<SparseOneDimensionalModel::Point>(*sodm, &ms); if (c) CommandHistory::getInstance()->addCommand(c, false); +*/ } void @@ -1308,9 +1309,12 @@ Labeller labeller(*m_labeller); labeller.setSampleRate(sodm->getSampleRate()); + (void)n; +/*!!! to be updated after SODM API update Command *c = labeller.subdivide<SparseOneDimensionalModel::Point> (*sodm, &ms, n); if (c) CommandHistory::getInstance()->addCommand(c, false); +*/ } void @@ -1334,9 +1338,12 @@ Labeller labeller(*m_labeller); labeller.setSampleRate(sodm->getSampleRate()); + (void)n; +/*!!! to be updated after SODM API update Command *c = labeller.winnow<SparseOneDimensionalModel::Point> (*sodm, &ms, n); if (c) CommandHistory::getInstance()->addCommand(c, false); +*/ } MainWindowBase::FileOpenStatus