# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1242749891 0
# Node ID 2e25bdc9f826f19e8280de530ff76cb1356090cc
# Parent  a8292af4806278a8f3027922995009a18e385311
* label bins
* return power (x^2) rather than energy... not necessarily a good idea,
  may be better to return raw data and improve its display in SV

diff -r a8292af48062 -r 2e25bdc9f826 plugins/AdaptiveSpectrogram.cpp
--- a/plugins/AdaptiveSpectrogram.cpp	Mon May 18 12:34:12 2009 +0000
+++ b/plugins/AdaptiveSpectrogram.cpp	Tue May 19 16:18:11 2009 +0000
@@ -210,6 +210,12 @@
     d.sampleType = OutputDescriptor::FixedSampleRate;
     d.sampleRate = m_inputSampleRate / ((2 << m_w) / 2);
     d.hasDuration = false;
+    char name[20];
+    for (int i = 0; i < d.binCount; ++i) {
+        float freq = (m_inputSampleRate / d.binCount) * (i + 1); // no DC bin
+        sprintf(name, "%d Hz", int(freq));
+        d.binNames.push_back(name);
+    }
     list.push_back(d);
 
     return list;
@@ -454,7 +460,7 @@
     case Cutting::Finished:
         for (int i = 0; i < w; ++i) {
             for (int j = 0; j < h; ++j) {
-                rmat[x+i][y+j] = cutting->value;
+                rmat[x+i][y+j] = cutting->value * cutting->value;
             }
         }
         return;