Mercurial > hg > svgui

changeset 65:7f608ec9a061

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* More structural work on feature extraction plugin C <-> C++ adapter * Allow use of LADSPA/DSSI plugins with control outputs as feature extraction plugins (DSSI with MIDI output still to come) * Reorder labels on spectrogram status box * Minor tweaks in doc etc.
author Chris Cannam
date Mon, 27 Mar 2006 15:03:02 +0000
parents 10bcd53ddc71
children e9eac9368e29
files layer/SpectrogramLayer.cpp widgets/PluginParameterDialog.cpp
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp	Thu Mar 23 18:42:17 2006 +0000
+++ b/layer/SpectrogramLayer.cpp	Mon Mar 27 15:03:02 2006 +0000
@@ -2119,10 +2119,10 @@
 	}
 
 	if (adjFreqMin != adjFreqMax) {
-	    adjFreqText = tr("Adjusted Frequency:\t%1 - %2 Hz\n")
+	    adjFreqText = tr("Peak Frequency:\t%1 - %2 Hz\n")
 		.arg(adjFreqMin).arg(adjFreqMax);
 	} else {
-	    adjFreqText = tr("Adjusted Frequency:\t%1 Hz\n")
+	    adjFreqText = tr("Peak Frequency:\t%1 Hz\n")
 		.arg(adjFreqMin);
 	}
 
@@ -2130,9 +2130,9 @@
 	QString pmax = Pitch::getPitchLabelForFrequency(adjFreqMax);
 
 	if (pmin != pmax) {
-	    adjPitchText = tr("Adjusted Pitch:\t%3 - %4\n").arg(pmin).arg(pmax);
+	    adjPitchText = tr("Peak Pitch:\t%3 - %4\n").arg(pmin).arg(pmax);
 	} else {
-	    adjPitchText = tr("Adjusted Pitch:\t%2\n").arg(pmin);
+	    adjPitchText = tr("Peak Pitch:\t%2\n").arg(pmin);
 	}
 
     } else {
@@ -2152,19 +2152,19 @@
     }
 
     if (freqMin != freqMax) {
-	text += tr("Frequency:\t%1 - %2 Hz\n%3Pitch:\t%4 - %5\n%6")
+	text += tr("%1Bin Frequency:\t%2 - %3 Hz\n%4Bin Pitch:\t%5 - %6\n")
+	    .arg(adjFreqText)
 	    .arg(freqMin)
 	    .arg(freqMax)
+	    .arg(adjPitchText)
+	    .arg(Pitch::getPitchLabelForFrequency(freqMin))
+	    .arg(Pitch::getPitchLabelForFrequency(freqMax));
+    } else {
+	text += tr("%1Bin Frequency:\t%2 Hz\n%3Bin Pitch:\t%4\n")
 	    .arg(adjFreqText)
-	    .arg(Pitch::getPitchLabelForFrequency(freqMin))
-	    .arg(Pitch::getPitchLabelForFrequency(freqMax))
-	    .arg(adjPitchText);
-    } else {
-	text += tr("Frequency:\t%1 Hz\n%2Pitch:\t%3\n%4")
 	    .arg(freqMin)
-	    .arg(adjFreqText)
-	    .arg(Pitch::getPitchLabelForFrequency(freqMin))
-	    .arg(adjPitchText);
+	    .arg(adjPitchText)
+	    .arg(Pitch::getPitchLabelForFrequency(freqMin));
     }	
 
     if (haveValues) {
--- a/widgets/PluginParameterDialog.cpp	Thu Mar 23 18:42:17 2006 +0000
+++ b/widgets/PluginParameterDialog.cpp	Mon Mar 27 15:03:02 2006 +0000
@@ -49,14 +49,14 @@
     nameLabel->setFont(font);
 
     QLabel *makerLabel = new QLabel(plugin->getMaker().c_str());
-    makerLabel->setFont(font);
+//    makerLabel->setFont(font);
 
     QLabel *versionLabel = new QLabel(QString("%1")
                                       .arg(plugin->getPluginVersion()));
-    versionLabel->setFont(font);
+//    versionLabel->setFont(font);
 
     QLabel *copyrightLabel = new QLabel(plugin->getCopyright().c_str());
-    copyrightLabel->setFont(font);
+//    copyrightLabel->setFont(font);
 
     QLabel *typeLabel = new QLabel(plugin->getType().c_str());
     typeLabel->setFont(font);