comparison layer/ScrollableMagRangeCache.cpp @ 1143:c53ed1a6fcbd spectrogram-minor-refactor

Fixes to phase display and colour scale for it; tidy up some debug output

 #include "ScrollableMagRangeCache.h"
 
 #include <iostream>
 using namespace std;
 
-#define DEBUG_SCROLLABLE_MAG_RANGE_CACHE 1
+//#define DEBUG_SCROLLABLE_MAG_RANGE_CACHE 1
 
 void
 ScrollableMagRangeCache::scrollTo(const LayerGeometryProvider *v,
 				  sv_frame_t newStartFrame)
 {	

 	newRanges.insert(newRanges.begin(),
 			 m_ranges.begin() + dx, m_ranges.end());
 	m_ranges = newRanges;
     }
 
+#ifdef DEBUG_SCROLLABLE_MAG_RANGE_CACHE
     cerr << "maxes (" << m_ranges.size() << ") now: ";
     for (int i = 0; in_range_for(m_ranges, i); ++i) {
 	cerr << m_ranges[i].getMax() << " ";
     }
     cerr << endl;
+#endif
 }
 
 MagnitudeRange
 ScrollableMagRangeCache::getRange(int x, int count) const
 {

     } else {
 	m_ranges[column].sample(r);
     }
 }
 
-//!!! unneeded?
-void
-ScrollableMagRangeCache::sampleColumn(const LayerGeometryProvider *v,
-				      sv_frame_t frame,
-				      const MagnitudeRange &r)
-{
-    int x = (v->getXForFrame(frame) -
-	     v->getXForFrame(m_startFrame));
-
-    if (!in_range_for(m_ranges, x)) {
-	cerr << "WARNING: ScrollableMagRangeCache::sampleColumn: column " << x
-	     << " arising from frame " << frame << " is out of range for cache "
-	     << "of width " << m_ranges.size()
-	     << " (with start frame " << m_startFrame << ")" << endl;
-	throw logic_error("column out of range");
-    } else {
-	sampleColumn(x, r);
-    }
-}
-