# HG changeset patch # User Chris Cannam # Date 1480066733 0 # Node ID dd195633fc9fd3735dcf49fb71c9d881ad55e1ce # Parent 36aa947ec9629108da8abe39b37fb97c1e989514 Implement "Subdivide Selected Instants". Also add the relabel command to the history, which I previously forgot to do! diff -r 36aa947ec962 -r dd195633fc9f framework/MainWindowBase.cpp --- a/framework/MainWindowBase.cpp Wed Nov 16 16:12:42 2016 +0000 +++ b/framework/MainWindowBase.cpp Fri Nov 25 09:38:53 2016 +0000 @@ -625,6 +625,7 @@ emit canInsertInstantsAtBoundaries(haveCurrentPane && haveSelection); emit canInsertItemAtSelection(haveCurrentPane && haveSelection && haveCurrentDurationLayer); emit canRenumberInstants(haveCurrentTimeInstantsLayer && haveSelection); + emit canSubdivideInstants(haveCurrentTimeInstantsLayer && haveSelection); emit canPlaySelection(haveMainModel && havePlayTarget && haveSelection); emit canClearSelection(haveSelection); emit canEditSelection(haveSelection && haveCurrentEditableLayer); @@ -1217,9 +1218,34 @@ Labeller labeller(*m_labeller); labeller.setSampleRate(sodm->getSampleRate()); - // This uses a command - - labeller.labelAll(*sodm, &ms); + Command *c = labeller.labelAll(*sodm, &ms); + if (c) CommandHistory::getInstance()->addCommand(c, false); +} + +void +MainWindowBase::subdivideInstantsBy(int n) +{ + Pane *pane = m_paneStack->getCurrentPane(); + if (!pane) return; + + Layer *layer = dynamic_cast(pane->getSelectedLayer()); + if (!layer) return; + + MultiSelection ms(m_viewManager->getSelection()); + + Model *model = layer->getModel(); + SparseOneDimensionalModel *sodm = + dynamic_cast(model); + if (!sodm) return; + + if (!m_labeller) return; + + Labeller labeller(*m_labeller); + labeller.setSampleRate(sodm->getSampleRate()); + + Command *c = labeller.subdivide + (*sodm, &ms, n); + if (c) CommandHistory::getInstance()->addCommand(c, false); } MainWindowBase::FileOpenStatus diff -r 36aa947ec962 -r dd195633fc9f framework/MainWindowBase.h --- a/framework/MainWindowBase.h Wed Nov 16 16:12:42 2016 +0000 +++ b/framework/MainWindowBase.h Fri Nov 25 09:38:53 2016 +0000 @@ -168,6 +168,7 @@ void canInsertInstantsAtBoundaries(bool); void canInsertItemAtSelection(bool); void canRenumberInstants(bool); + void canSubdivideInstants(bool); void canDeleteCurrentLayer(bool); void canZoom(bool); void canScroll(bool); @@ -275,6 +276,7 @@ virtual void insertItemAtSelection(); virtual void insertItemAt(sv_frame_t, sv_frame_t); virtual void renumberInstants(); + virtual void subdivideInstantsBy(int); virtual void documentModified(); virtual void documentRestored();