From b72f81dfbe5d81816b2a1b6cb9871d9f98127fc5 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 25 Aug 2010 16:12:53 +0000
Subject: [PATCH] add exp scale, rm spline

---
 timeside/grapher/core.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/timeside/grapher/core.py b/timeside/grapher/core.py
index 539ba5b..211f59a 100644
--- a/timeside/grapher/core.py
+++ b/timeside/grapher/core.py
@@ -268,17 +268,27 @@ class WaveformImageJoyContour(WaveformImage):
         self.contour[x] = numpy.max(peaks)
         self.centroids[x] = spectral_centroid
 
+
+    def normalize(self, contour):
+        contour = contour-min(contour)
+        return contour/max(contour)
+
     def draw_peaks_contour(self):
-        #contour = self.contour.copy()
-        contour = smooth(self.contour, window_len=13)
-
-        l_min = min(contour)
-        contour = (contour-l_min)
-        l_max = max(contour)
-        l_range= l_max - l_min
-        contour = contour/l_max
-        contour = cspline1d(contour)
-        contour = cspline1d_eval(contour, self.x, dx=self.dx1, x0=self.x[0])
+        contour = self.contour.copy()
+
+        # Smoothing
+        contour = smooth(contour, window_len=16)
+
+        # Normalize
+        contour = self.normalize(contour)
+
+        # Scaling
+        ratio = 0.1
+        contour = self.normalize(numpy.expm1(ratio*contour))
+        print min(contour), max(contour)
+
+        #contour = cspline1d(contour)
+        #contour = cspline1d_eval(contour, self.x, dx=self.dx1, x0=self.x[0])
 
         # Multispline scales
         for i in range(0,self.ndiv):
-- 
2.39.5