From db26c788f42d9e6510f511c2795c1fa60ecd3a8c Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Thu, 23 Jun 2011 00:22:56 +0000
Subject: [PATCH] Tweak nyan cat's values a bit to make him more interesting

---
 src/analyzers/nyancatanalyzer.cpp | 9 +++++----
 src/analyzers/nyancatanalyzer.h   | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/analyzers/nyancatanalyzer.cpp b/src/analyzers/nyancatanalyzer.cpp
index f86cdb486..c7f8e0aad 100644
--- a/src/analyzers/nyancatanalyzer.cpp
+++ b/src/analyzers/nyancatanalyzer.cpp
@@ -18,7 +18,7 @@
 #include "nyancatanalyzer.h"
 #include "core/logging.h"
 
-#include <algorithm>
+#include <cmath>
 
 #include <QTimerEvent>
 
@@ -73,7 +73,7 @@ void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s) {
   for (int band=0 ; band<kRainbowBands ; ++band) {
     float* accumulator = &history_[(band+1) * kHistorySize - 1];
     for (int i=0 ; i<samples_per_band ; ++i) {
-      *accumulator += qAbs(s[sample++]);
+      *accumulator += s[sample++];
     }
   }
 
@@ -85,11 +85,12 @@ void NyanCatAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s) {
 
   for (int band=0 ; band<kRainbowBands ; ++band) {
     // Calculate the Y position of this band.
-    float y = float(height()) / (kRainbowBands) * (band + 0.5);
+    const float y = float(height()) / (kRainbowBands + 2) * (band + 0.5);
+    const float band_scale = std::pow(2, band);
 
     // Add each point in the line.
     for (int x=0 ; x<kHistorySize ; ++x) {
-      *dest = QPointF(px_per_frame * x, y + *source * kPixelScale * (band+1));
+      *dest = QPointF(px_per_frame * x, y + *source * kPixelScale * band_scale);
       ++ dest;
       ++ source;
     }
diff --git a/src/analyzers/nyancatanalyzer.h b/src/analyzers/nyancatanalyzer.h
index 411f5d320..94ea4113f 100644
--- a/src/analyzers/nyancatanalyzer.h
+++ b/src/analyzers/nyancatanalyzer.h
@@ -43,9 +43,9 @@ private:
   static const int kCatFrameCount = 5;
   static const int kRainbowOverlap = 13;
 
-  static const int kHistorySize = 256;
+  static const int kHistorySize = 128;
   static const int kRainbowBands = 6;
-  static const float kPixelScale = 0.01;
+  static const float kPixelScale = 0.03;
 
   static const int kFrameIntervalMs = 150;