comparison layer/WaveformLayer.cpp @ 1366:c2a3ac0a6688

Fix the mix/merge channels behaviour in pixels-per-frame zone

 #endif
     }
     
     if (mixingOrMerging) {
         if (minChannel != 0 || maxChannel != 0) {
-            SVCERR << "Internal error: min & max channels should be 0 when merging or mixing all channels" << endl;
+            throw std::logic_error("Internal error: min & max channels should be 0 when merging or mixing all channels");
         } else if (m_model->getChannelCount() > 1) {
             ranges.push_back({});
             m_model->getSummaries
                 (1, frame0, frame1 - frame0, ranges[1], blockSize);
         }
     }
 }
 
 void
 WaveformLayer::getOversampledRanges(int minChannel, int maxChannel,
-                                    bool /* mixingOrMerging */,
+                                    bool mixingOrMerging,
                                     sv_frame_t frame0, sv_frame_t frame1,
                                     int oversampleBy, RangeVec &ranges)
     const
 {
+    if (mixingOrMerging) {
+        if (minChannel != 0 || maxChannel != 0) {
+            throw std::logic_error("Internal error: min & max channels should be 0 when merging or mixing all channels");
+        }
+        if (m_model->getChannelCount() > 1) {
+            // call back on self for the individual channels with
+            // mixingOrMerging false
+            getOversampledRanges
+                (0, 1, false, frame0, frame1, oversampleBy, ranges);
+            return;
+        }
+    }
+    
     // These frame values, tail length, etc variables are at the model
     // sample rate, not the oversampled rate
 
     sv_frame_t tail = 16;
     sv_frame_t startFrame = m_model->getStartFrame();

                << " -> got " << oversampled.size()
                << " oversampled values for channel " << ch
                << ", from which returning " << rr.size() << " ranges" << endl;
 #endif    
     }
-
-    //!!! + channel modes
     
     return;
 }
 
 void

         }
 
         if (showIndividualSample) {
             paint->setPen(baseColour);
             paint->drawRect(x-1, rangeTop-1, 2, 2);
+            if (rangeTop != rangeBottom) { // e.g. for "butterfly" merging mode
+                paint->drawRect(x-1, rangeBottom-1, 2, 2);
+            }
         }
         
         if (x != x0 && prevRangeBottom != -1) {
             if (prevRangeBottom > rangeBottom + 1 &&
                 prevRangeTop    > rangeBottom + 1) {