Mercurial > hg > tony

changeset 82:92e8231466a8 tonioni_multi_transform

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to the multi-transform stuff (not yet taken full advantage of)
author Chris Cannam
date Mon, 02 Dec 2013 12:30:08 +0000
parents f3ab20d784ff
children 4db051a704b2
files .hgsubstate src/Analyser.cpp
diffstat 2 files changed, 6 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
 }