# HG changeset patch # User Chris Cannam # Date 1385987408 0 # Node ID 92e8231466a832cc52a9a7565e5e93f19607b2fc # Parent f3ab20d784ffcd9eb638b0ef2b05ec1679f82723 Update to the multi-transform stuff (not yet taken full advantage of) diff -r f3ab20d784ff -r 92e8231466a8 .hgsubstate --- a/.hgsubstate Sun Dec 01 14:33:55 2013 +0000 +++ b/.hgsubstate Mon Dec 02 12:30:08 2013 +0000 @@ -1,4 +1,4 @@ 236814e07bd07473958c1ff89103124536a0c3c8 dataquay -14b1768e54069b9b6ff386546cacd75d65d8f5a8 svapp -2d53205f70cd8985126b491673b419a8c0f00d67 svcore +19282182e60dab3e8fe3a666525579ddf80ea653 svapp +dba8a02b0413335ee34cf302aef7754daebd0b8d svcore 212644efa523f61316450bc6ee92f3f5158f68f3 svgui diff -r f3ab20d784ff -r 92e8231466a8 src/Analyser.cpp --- a/src/Analyser.cpp Sun Dec 01 14:33:55 2013 +0000 +++ b/src/Analyser.cpp Mon Dec 02 12:30:08 2013 +0000 @@ -147,23 +147,14 @@ ModelTransformer::Input input(m_fileModel, -1); - FeatureExtractionModelTransformer::PreferredOutputModel preferredModel; - - // preferredModel = FeatureExtractionModelTransformer::NoteOutputModel; - preferredModel = FeatureExtractionModelTransformer::FlexiNoteOutputModel; - - // preferredLayer = LayerFactory::Notes ; - preferredLayer = LayerFactory::FlexiNotes ; - - // std::cerr << "NOTE: Trying to create layer type(" << preferredLayer << ")" << std::endl; Layer *layer; - layer = m_document->createDerivedLayer(transform, m_fileModel, preferredLayer, preferredModel); + layer = m_document->createDerivedLayer(transform, m_fileModel); if (layer) { - m_document->addLayerToView(m_pane, layer); + m_document->addLayerToView(m_pane, layer); } else { - std::cerr << "ERROR: Analyser::addLayerForNotes: Cound not create layer type(" << preferredLayer << ")" << std::endl; - } + std::cerr << "ERROR: Analyser::addLayerForNotes: Cound not create layer type(" << preferredLayer << ")" << std::endl; + } return layer; }