# HG changeset patch
# User Chris Cannam
# Date 1194454372 0
# Node ID 1f67b110c1a35947a15f808b7e15f8d766c2505c
# Parent  2675869003603da0f30b5f10e4cf3e0677a8de9f
* fix pane layout problem; fix waveform butterfly mode

diff -r 267586900360 -r 1f67b110c1a3 layer/WaveformLayer.cpp
--- a/layer/WaveformLayer.cpp	Wed Nov 07 16:37:17 2007 +0000
+++ b/layer/WaveformLayer.cpp	Wed Nov 07 16:52:52 2007 +0000
@@ -753,7 +753,7 @@
                     else rangeBottom = AudioLevel::multiplier_to_preview(range.absmean * gain, m);
                     meanBottom  = rangeBottom;
                 } else {
-                    rangeBottom =  AudioLevel::multiplier_to_preview(range.min * gain, m * greyLevels);
+                    rangeBottom = -AudioLevel::multiplier_to_preview(range.min * gain, m * greyLevels);
                     rangeTop    =  AudioLevel::multiplier_to_preview(range.max * gain, m * greyLevels);
                     meanBottom  = -AudioLevel::multiplier_to_preview(range.absmean * gain, m);
                     meanTop     =  AudioLevel::multiplier_to_preview(range.absmean * gain, m);
@@ -996,6 +996,8 @@
         break;
     }
 
+//    std::cerr << "mergingChannels= " << mergingChannels << ", channel  = " << channel << ", value = " << value << ", vy = " << vy << std::endl;
+
     return my - vy;
 }
 
diff -r 267586900360 -r 1f67b110c1a3 view/PaneStack.cpp
--- a/view/PaneStack.cpp	Wed Nov 07 16:37:17 2007 +0000
+++ b/view/PaneStack.cpp	Wed Nov 07 16:52:52 2007 +0000
@@ -69,13 +69,13 @@
 
     QVBoxLayout *vlayout = new QVBoxLayout;
     layout->addLayout(vlayout);
-    layout->setStretchFactor(vlayout, 1);
+    layout->setStretchFactor(vlayout, 0);
 
     QPushButton *xButton = new QPushButton(frame);
     xButton->setIcon(IconLoader().load("cross"));
     xButton->setFixedSize(QSize(16, 16));
     vlayout->addWidget(xButton);
-    vlayout->setStretchFactor(xButton, 1);
+    vlayout->setStretchFactor(xButton, 0);
     connect(xButton, SIGNAL(clicked()), this, SLOT(paneDeleteButtonClicked()));
 
     QLabel *currentIndicator = new QLabel(frame);