changeset 21:05070252e43f

larger notes plus basic editing functions are now enabled by temporary star icon in toolbar

--- a/.hgsubstate	Mon Apr 15 18:07:05 2013 +0100
+++ b/.hgsubstate	Wed Apr 17 09:15:05 2013 +0100
@@ -1,3 +1,3 @@
 cf32a7c584c22a5d89916f3af5abb8a82569f6ac svapp
 2fa49f5caac5b63479c3cb4e9fe86a6616cd29b9 svcore
-764a9452a71a96e0b87679ac2d5921bb762b1b80 svgui
+03d5f370c9a024c955288ef4b8031a1bed72d002 svgui

--- a/src/Analyser.cpp	Mon Apr 15 18:07:05 2013 +0100
+++ b/src/Analyser.cpp	Wed Apr 17 09:15:05 2013 +0100
@@ -48,11 +48,11 @@
     m_fileModel = model;
     m_pane = pane;
 
-    TransformId f0 = "vamp:yintony:yintony:f0";
-    TransformId notes = "vamp:yintony:yintony:notes";
+    // TransformId f0 = "vamp:yintony:yintony:f0";
+    // TransformId notes = "vamp:yintony:yintony:notes";
 
-    // TransformId f0 = "vamp:cepstral-pitchtracker:cepstral-pitchtracker:f0";
-    // TransformId notes = "vamp:cepstral-pitchtracker:cepstral-pitchtracker:notes";
+    TransformId f0 = "vamp:cepstral-pitchtracker:cepstral-pitchtracker:f0";
+    TransformId notes = "vamp:cepstral-pitchtracker:cepstral-pitchtracker:notes";
 
     // We don't want a waveform in the main pane. We must have a
     // main-model layer of some sort, but the layers created by
@@ -73,6 +73,8 @@
 	    tvl->setPlotStyle(TimeValueLayer::PlotPoints);
 	    tvl->setBaseColour(ColourDatabase::getInstance()->
 			       getColourIndex(QString("Black")));
+			tvl->setVerticalScale(TimeValueLayer::LogScale);
+			tvl->setDisplayExtents(120.f,350.f); // temporary values: better get the real extents of the data form the model
 	}
     }
 
@@ -83,6 +85,8 @@
 	if (nl) {
 	    nl->setBaseColour(ColourDatabase::getInstance()->
 			      getColourIndex(QString("Bright Blue")));
+			nl->setVerticalScale(FlexiNoteLayer::LogScale);
+			nl->setDisplayExtents(120.f,350.f); // temporary values: better get the real extents of the data form the model
 	}
     }
 

--- a/src/MainWindow.cpp	Mon Apr 15 18:07:05 2013 +0100
+++ b/src/MainWindow.cpp	Wed Apr 17 09:15:05 2013 +0100
@@ -195,13 +195,15 @@
 
     frame->setLayout(layout);
 
+    m_analyser = new Analyser();
+
     setupMenus();
     setupToolbars();
     setupHelpMenu();
 
     statusBar();
 
-    m_analyser = new Analyser();
+    // m_analyser = new Analyser();
 
     newSession();
 }
@@ -565,10 +567,30 @@
     toolbar->addWidget(m_playSpeed);
     toolbar->addWidget(m_fader);
 
+	toolbar = addToolBar(tr("Test actions toolbar")); // GF: temporary toolbar for triggering actions manually
+	
+	// GF: TEMP : this created a menu item
+    QAction *test = toolbar->addAction(il.load("new"), tr("Test"));
+    test->setShortcut(tr("Home"));
+    test->setStatusTip(tr("Test"));
+	test->setEnabled(true);
+    // connect(test, SIGNAL(triggered()), this, SLOT(about()));
+    // connect(test, SIGNAL(triggered()), m_analyser, SLOT(resizeLayer()));
+    connect(test, SIGNAL(triggered()), this, SLOT(selectEditMode())); 
+    // connect(this, SIGNAL(canPlay(bool)), test, SLOT(setEnabled(bool)));
+	menu->addAction(test);
+
     Pane::registerShortcuts(*m_keyReference);
 }
 
 void
+MainWindow::selectEditMode()	
+{
+	std::cerr << "Edit mode selected" << std::endl;
+	m_viewManager->setToolMode(ViewManager::EditMode);
+}
+
+void
 MainWindow::updateMenuStates()
 {
     MainWindowBase::updateMenuStates();

--- a/src/MainWindow.h	Mon Apr 15 18:07:05 2013 +0100
+++ b/src/MainWindow.h	Wed Apr 17 09:15:05 2013 +0100
@@ -97,6 +97,10 @@
     virtual void about();
     virtual void keyReference();
 
+   // GF: temporary function for switching to edit mode
+   virtual void selectEditMode();
+
+
 protected:
     Analyser      *m_analyser;