Mercurial > hg > svgui
changeset 324:1f67b110c1a3
* fix pane layout problem; fix waveform butterfly mode
| author | Chris Cannam |
|---|---|
| date | Wed, 07 Nov 2007 16:52:52 +0000 |
| parents | 267586900360 |
| children | 90e10a236c44 4f4f38a11cd2 |
| files | layer/WaveformLayer.cpp view/PaneStack.cpp |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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);