comparison layer/ScrollableMagRangeCache.cpp @ 1122:94370157b265 spectrogram-minor-refactor

Fixes and debug output for mag range calculations

 #define DEBUG_SCROLLABLE_MAG_RANGE_CACHE 1
 
 void
 ScrollableMagRangeCache::scrollTo(const LayerGeometryProvider *v,
 				  sv_frame_t newStartFrame)
-{
-    if (m_startFrame == newStartFrame) {
-	// haven't moved
-        return;
-    }
-	
+{	
     int dx = (v->getXForFrame(m_startFrame) -
 	      v->getXForFrame(newStartFrame));
 
 #ifdef DEBUG_SCROLLABLE_MAG_RANGE_CACHE
     cerr << "ScrollableMagRangeCache::scrollTo: start frame " << m_startFrame
 	 << " -> " << newStartFrame << ", dx = " << dx << endl;
 #endif
+
+    if (m_startFrame == newStartFrame) {
+	// haven't moved
+        return;
+    }
     
     m_startFrame = newStartFrame;
 
     if (dx == 0) {
 	// haven't moved visibly (even though start frame may have changed)

 	// end and clip the right end. Assemble -dx new values, then
 	// w+dx old values starting at index 0.
 
 	auto newRanges = vector<MagnitudeRange>(-dx);
 	newRanges.insert(newRanges.end(),
-			 m_ranges.begin(), m_ranges.begin() + w + dx);
+			 m_ranges.begin(), m_ranges.begin() + (w + dx));
 	m_ranges = newRanges;
 	
     } else {
 	// The new start frame is to the right of the old start
 	// frame. We want to clip the left (start) end and add some

 	auto newRanges = vector<MagnitudeRange>(dx);
 	newRanges.insert(newRanges.begin(),
 			 m_ranges.begin() + dx, m_ranges.end());
 	m_ranges = newRanges;
     }
+
+    cerr << "maxes now: ";
+    for (int i = 0; in_range_for(m_ranges, i); ++i) {
+	cerr << m_ranges[i].getMax() << " ";
+    }
+    cerr << endl;
+}
+
+MagnitudeRange
+ScrollableMagRangeCache::getRange(int x, int count) const
+{
+    MagnitudeRange r;
+#ifdef DEBUG_SCROLLABLE_MAG_RANGE_CACHE
+    cerr << "ScrollableMagRangeCache::getRange(" << x << ", " << count << ")" << endl;
+#endif
+    for (int i = 0; i < count; ++i) {
+	r.sample(m_ranges.at(x + i));
+    }
+    return r;
 }
 
 void
 ScrollableMagRangeCache::sampleColumn(int column, const MagnitudeRange &r)
 {

     } else {
 	m_ranges[column].sample(r);
     }
 }
 
+//!!! unneeded?
 void
 ScrollableMagRangeCache::sampleColumn(const LayerGeometryProvider *v,
 				      sv_frame_t frame,
 				      const MagnitudeRange &r)
 {