# HG changeset patch # User Chris Cannam # Date 1470403876 -3600 # Node ID 6f7a440b6218ddfac9ffdfa3b32b6e706e4c527f # Parent 825d0d7641ba3dfda096d7cd75bd9fe371b416ac Fixes to phase display and colour scale for it; tidy up some debug output diff -r 825d0d7641ba -r 6f7a440b6218 base/ColumnOp.h --- a/base/ColumnOp.h Thu Aug 04 14:02:56 2016 +0100 +++ b/base/ColumnOp.h Fri Aug 05 14:31:16 2016 +0100 @@ -200,7 +200,7 @@ float value = in[bin]; - if (value > out[y]) { + if (bin == by0 || value > out[y]) { out[y] = value; } } diff -r 825d0d7641ba -r 6f7a440b6218 base/RangeMapper.cpp --- a/base/RangeMapper.cpp Thu Aug 04 14:02:56 2016 +0100 +++ b/base/RangeMapper.cpp Fri Aug 05 14:31:16 2016 +0100 @@ -70,7 +70,7 @@ double value = m_minval + ((double(position - m_minpos) / double(m_maxpos - m_minpos)) * (m_maxval - m_minval)); - cerr << "getValueForPositionUnclamped(" << position << "): minval " << m_minval << ", maxval " << m_maxval << ", value " << value << endl; +// cerr << "getValueForPositionUnclamped(" << position << "): minval " << m_minval << ", maxval " << m_maxval << ", value " << value << endl; return value; } diff -r 825d0d7641ba -r 6f7a440b6218 data/model/FFTModel.cpp --- a/data/model/FFTModel.cpp Thu Aug 04 14:02:56 2016 +0100 +++ b/data/model/FFTModel.cpp Fri Aug 05 14:31:16 2016 +0100 @@ -109,7 +109,9 @@ auto cplx = getFFTColumn(x); Column col; col.reserve(cplx.size()); - for (auto c: cplx) col.push_back(arg(c)); + for (auto c: cplx) { + col.push_back(arg(c)); + } return move(col); }