comparison src/Analyser.cpp @ 192:431a95c9d14d

Calculate frequency constraint for region outlining (does not actually do the analysis correctly yet)

     m_document = doc;
     m_fileModel = model;
     m_paneStack = paneStack;
     m_pane = pane;
 
-    disconnect(m_pane, SIGNAL(regionOutlined(QRect)),
-               m_pane, SLOT(zoomToRegion(QRect)));
-    connect(m_pane, SIGNAL(regionOutlined(QRect)),
-            this, SLOT(regionOutlined(QRect)));
-
     m_reAnalysingSelection = Selection();
     m_reAnalysisCandidates.clear();
     m_currentCandidate = -1;
     m_candidatesVisible = false;
 

     }
     
     return "";
 }
 
-void
-Analyser::regionOutlined(QRect r)
-{
-    cerr << "regionOutlined(" << r.x() << "," << r.y() << "," << r.width() << "," << r.height() << ")" << endl;
-}
-
 QString
-Analyser::reAnalyseSelection(Selection sel)
+Analyser::reAnalyseSelection(Selection sel, FrequencyRange range)
 {
     if (sel == m_reAnalysingSelection) return "";
 
     clearReAnalysis();
 

     TransformFactory *tf = TransformFactory::getInstance();
     
     QString plugname = "pYIN";
     QString base = "vamp:pyin:localcandidatepyin:";
     QString out = "pitchtrackcandidates";
+
+    if (range.isConstrained()) {
+        base = "vamp:pyin:yinfc:";
+        out = "f0";
+    }
 
     Transforms transforms;
 
     QString notFound = tr("Transform \"%1\" not found. Unable to perform interactive analysis.<br><br>Is the %2 Vamp plugin correctly installed?");
     if (!tf->haveTransform(base + out)) {

 
     Transform t = tf->getDefaultTransformFor
         (base + out, m_fileModel->getSampleRate());
     t.setStepSize(256);
     t.setBlockSize(2048);
+
+    if (range.isConstrained()) {
+        t.setParameter("minfreq", range.min);
+        t.setParameter("maxfreq", range.max);
+    }
 
     RealTime start = RealTime::frame2RealTime
         (round(sel.getStartFrame()*1.0/256) * 256 - 2*256, m_fileModel->getSampleRate());
 
     RealTime end = RealTime::frame2RealTime