comparison src/Analyser.cpp @ 16:c6f5a9b4b617 tonioni

cleanup
author gyorgyf
date Sat, 13 Apr 2013 15:36:54 +0100
parents 50ab01b77262
children f97399f18564
comparison
equal deleted inserted replaced
15:50ab01b77262 16:c6f5a9b4b617
25 #include "layer/Layer.h" 25 #include "layer/Layer.h"
26 #include "layer/TimeValueLayer.h" 26 #include "layer/TimeValueLayer.h"
27 #include "layer/NoteLayer.h" 27 #include "layer/NoteLayer.h"
28 #include "layer/FlexiNoteLayer.h" 28 #include "layer/FlexiNoteLayer.h"
29 #include "layer/ColourDatabase.h" 29 #include "layer/ColourDatabase.h"
30 #include "layer/LayerFactory.h" // GF: added so we can access the FlexiNotes enum value. 30 #include "layer/LayerFactory.h"
31 31
32 Analyser::Analyser() : 32 Analyser::Analyser() :
33 m_document(0), 33 m_document(0),
34 m_fileModel(0), 34 m_fileModel(0),
35 m_pane(0) 35 m_pane(0)
77 layer = addLayerForNotes(notes); 77 layer = addLayerForNotes(notes);
78 78
79 if (layer) { 79 if (layer) {
80 FlexiNoteLayer *nl = qobject_cast<FlexiNoteLayer *>(layer); 80 FlexiNoteLayer *nl = qobject_cast<FlexiNoteLayer *>(layer);
81 if (nl) { 81 if (nl) {
82 // GF: delete this later !
83 std::cerr << "NOTE: layer type cast successful...." << std::endl;
84 nl->setBaseColour(ColourDatabase::getInstance()-> 82 nl->setBaseColour(ColourDatabase::getInstance()->
85 getColourIndex(QString("Bright Blue"))); 83 getColourIndex(QString("Bright Blue")));
86 } 84 }
87 } 85 }
88 86
111 layer = m_document->createDerivedLayer(transform, m_fileModel); 109 layer = m_document->createDerivedLayer(transform, m_fileModel);
112 110
113 if (layer) { 111 if (layer) {
114 m_document->addLayerToView(m_pane, layer); 112 m_document->addLayerToView(m_pane, layer);
115 } else { 113 } else {
116 std::cerr << "ERROR: Cound not create layer. " << std::endl; 114 std::cerr << "ERROR: Analyser::addLayerFor: Cound not create layer. " << std::endl;
117 } 115 }
118 116
119 return layer; 117 return layer;
120 } 118 }
121 119
142 // preferredModel = FeatureExtractionModelTransformer::NoteOutputModel; 140 // preferredModel = FeatureExtractionModelTransformer::NoteOutputModel;
143 preferredModel = FeatureExtractionModelTransformer::FlexiNoteOutputModel; 141 preferredModel = FeatureExtractionModelTransformer::FlexiNoteOutputModel;
144 142
145 // preferredLayer = LayerFactory::Notes ; 143 // preferredLayer = LayerFactory::Notes ;
146 preferredLayer = LayerFactory::FlexiNotes ; 144 preferredLayer = LayerFactory::FlexiNotes ;
147 std::cerr << "NOTE: Trying to create layer type(" << preferredLayer << ")" << std::endl; 145
148 146 // std::cerr << "NOTE: Trying to create layer type(" << preferredLayer << ")" << std::endl;
149 Layer *layer; 147 Layer *layer;
150 layer = m_document->createDerivedLayer(transform, m_fileModel, preferredLayer, preferredModel); 148 layer = m_document->createDerivedLayer(transform, m_fileModel, preferredLayer, preferredModel);
151 149
152 if (layer) { 150 if (layer) {
153 m_document->addLayerToView(m_pane, layer); 151 m_document->addLayerToView(m_pane, layer);
154 } else { 152 } else {
155 std::cerr << "ERROR: Cound not create layer type(" << preferredLayer << ")" << std::endl; 153 std::cerr << "ERROR: Analyser::addLayerForNotes: Cound not create layer type(" << preferredLayer << ")" << std::endl;
156 } 154 }
157 155
158 return layer; 156 return layer;
159 } 157 }
160 158