Mercurial > hg > sonic-visualiser
comparison main/MainWindow.cpp @ 357:dbc1d2d72cf1
* Reinstate configure dialog for transforms (closes #16)
author | Chris Cannam |
---|---|
date | Fri, 08 Oct 2010 11:21:39 +0100 |
parents | 2260737068b5 |
children | 8b3038e55d50 487d208fadb3 |
comparison
equal
deleted
inserted
replaced
356:2fbd3919323a | 357:dbc1d2d72cf1 |
---|---|
24 #include "data/model/SparseOneDimensionalModel.h" | 24 #include "data/model/SparseOneDimensionalModel.h" |
25 #include "data/model/NoteModel.h" | 25 #include "data/model/NoteModel.h" |
26 #include "data/model/Labeller.h" | 26 #include "data/model/Labeller.h" |
27 #include "data/osc/OSCQueue.h" | 27 #include "data/osc/OSCQueue.h" |
28 #include "framework/Document.h" | 28 #include "framework/Document.h" |
29 #include "framework/TransformUserConfigurator.h" | |
29 #include "view/ViewManager.h" | 30 #include "view/ViewManager.h" |
30 #include "base/Preferences.h" | 31 #include "base/Preferences.h" |
31 #include "layer/WaveformLayer.h" | 32 #include "layer/WaveformLayer.h" |
32 #include "layer/TimeRulerLayer.h" | 33 #include "layer/TimeRulerLayer.h" |
33 #include "layer/TimeInstantLayer.h" | 34 #include "layer/TimeInstantLayer.h" |
3299 size_t endFrame = 0; | 3300 size_t endFrame = 0; |
3300 m_viewManager->getSelection().getExtents(startFrame, endFrame); | 3301 m_viewManager->getSelection().getExtents(startFrame, endFrame); |
3301 if (endFrame > startFrame) duration = endFrame - startFrame; | 3302 if (endFrame > startFrame) duration = endFrame - startFrame; |
3302 else startFrame = 0; | 3303 else startFrame = 0; |
3303 | 3304 |
3305 TransformUserConfigurator configurator; | |
3306 | |
3304 ModelTransformer::Input input = ModelTransformerFactory::getInstance()-> | 3307 ModelTransformer::Input input = ModelTransformerFactory::getInstance()-> |
3305 getConfigurationForTransform | 3308 getConfigurationForTransform |
3306 (transform, | 3309 (transform, |
3307 candidateInputModels, | 3310 candidateInputModels, |
3308 defaultInputModel, | 3311 defaultInputModel, |
3309 m_playSource, | 3312 m_playSource, |
3310 startFrame, | 3313 startFrame, |
3311 duration); | 3314 duration, |
3315 &configurator); | |
3312 | 3316 |
3313 if (!input.getModel()) return; | 3317 if (!input.getModel()) return; |
3314 | 3318 |
3315 // std::cerr << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName().toStdString() << "\"" << std::endl << "transform:" << std::endl << transform.toXmlString().toStdString() << std::endl; | 3319 // std::cerr << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName().toStdString() << "\"" << std::endl << "transform:" << std::endl << transform.toXmlString().toStdString() << std::endl; |
3316 | 3320 |