Mercurial > hg > svgui
changeset 991:2adca8f05583 3.0-integration
Merge from branch simple-fft-model
| author | Chris Cannam |
|---|---|
| date | Wed, 01 Jul 2015 18:31:28 +0100 |
| parents | 4f4f0e158ecf (current diff) 2d4d0dbb94e3 (diff) |
| children | b0662a3c4679 |
| files | layer/RegionLayer.cpp layer/TimeInstantLayer.cpp layer/TimeRulerLayer.cpp layer/WaveformLayer.cpp |
| diffstat | 4 files changed, 33 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/layer/RegionLayer.cpp Wed Jul 01 13:27:03 2015 +0100 +++ b/layer/RegionLayer.cpp Wed Jul 01 18:31:28 2015 +0100 @@ -306,7 +306,7 @@ { if (!m_model) return RegionModel::PointList(); - long frame = v->getFrameForX(x); + sv_frame_t frame = v->getFrameForX(x); RegionModel::PointList onPoints = m_model->getPoints(frame); @@ -349,7 +349,7 @@ { if (!m_model) return false; - long frame = v->getFrameForX(x); + sv_frame_t frame = v->getFrameForX(x); RegionModel::PointList onPoints = m_model->getPoints(frame); if (onPoints.empty()) return false; @@ -1125,7 +1125,7 @@ { if (!m_model) return; - long frame = v->getFrameForX(e->x()); + sv_frame_t frame = v->getFrameForX(e->x()); if (frame < 0) frame = 0; frame = frame / m_model->getResolution() * m_model->getResolution(); @@ -1263,7 +1263,7 @@ int newx = m_dragPointX + xdist; int newy = m_dragPointY + ydist; - long frame = v->getFrameForX(newx); + sv_frame_t frame = v->getFrameForX(newx); if (frame < 0) frame = 0; frame = frame / m_model->getResolution() * m_model->getResolution();
--- a/layer/TimeInstantLayer.cpp Wed Jul 01 13:27:03 2015 +0100 +++ b/layer/TimeInstantLayer.cpp Wed Jul 01 18:31:28 2015 +0100 @@ -162,7 +162,7 @@ if (!m_model) return SparseOneDimensionalModel::PointList(); - long frame = v->getFrameForX(x); + sv_frame_t frame = v->getFrameForX(x); SparseOneDimensionalModel::PointList onPoints = m_model->getPoints(frame); @@ -229,7 +229,7 @@ } } - long useFrame = points.begin()->frame; + sv_frame_t useFrame = points.begin()->frame; RealTime rt = RealTime::frame2RealTime(useFrame, m_model->getSampleRate()); @@ -329,8 +329,8 @@ int x0 = rect.left(), x1 = rect.right(); - long frame0 = v->getFrameForX(x0); - long frame1 = v->getFrameForX(x1); + sv_frame_t frame0 = v->getFrameForX(x0); + sv_frame_t frame1 = v->getFrameForX(x1); SparseOneDimensionalModel::PointList points(m_model->getPoints (frame0, frame1)); @@ -367,7 +367,7 @@ // << m_model->getResolution() << " frames" << endl; QPoint localPos; - long illuminateFrame = -1; + sv_frame_t illuminateFrame = -1; if (v->shouldIlluminateLocalFeatures(this, localPos)) { SparseOneDimensionalModel::PointList localPoints = @@ -474,7 +474,7 @@ if (!m_model) return; - long frame = v->getFrameForX(e->x()); + sv_frame_t frame = v->getFrameForX(e->x()); if (frame < 0) frame = 0; frame = frame / m_model->getResolution() * m_model->getResolution(); @@ -497,7 +497,7 @@ if (!m_model || !m_editing) return; - long frame = v->getFrameForX(e->x()); + sv_frame_t frame = v->getFrameForX(e->x()); if (frame < 0) frame = 0; frame = frame / m_model->getResolution() * m_model->getResolution(); m_editingCommand->deletePoint(m_editingPoint); @@ -597,7 +597,7 @@ if (!m_model || !m_editing) return; - long frame = v->getFrameForX(e->x()); + sv_frame_t frame = v->getFrameForX(e->x()); if (frame < 0) frame = 0; frame = frame / m_model->getResolution() * m_model->getResolution();
--- a/layer/TimeRulerLayer.cpp Wed Jul 01 13:27:03 2015 +0100 +++ b/layer/TimeRulerLayer.cpp Wed Jul 01 18:31:28 2015 +0100 @@ -88,7 +88,7 @@ case SnapNearest: { - if (labs(frame - left) > labs(right - frame)) { + if (llabs(frame - left) > llabs(right - frame)) { frame = right; } else { frame = left;
--- a/layer/WaveformLayer.cpp Wed Jul 01 13:27:03 2015 +0100 +++ b/layer/WaveformLayer.cpp Wed Jul 01 18:31:28 2015 +0100 @@ -730,14 +730,17 @@ cerr << "WaveformLayer::paint: ERROR: i1 " << i1 << " > i0 " << i0 << " plus one (zoom = " << zoomLevel << ", model zoom = " << modelZoomLevel << ")" << endl; } - if (ranges && i0 < (int)ranges->size()) { + if (ranges && i0 < (sv_frame_t)ranges->size()) { - range = (*ranges)[i0]; + range = (*ranges)[size_t(i0)]; if (i1 > i0 && i1 < (int)ranges->size()) { - range.setMax(std::max(range.max(), (*ranges)[i1].max())); - range.setMin(std::min(range.min(), (*ranges)[i1].min())); - range.setAbsmean((range.absmean() + (*ranges)[i1].absmean()) / 2); + range.setMax(std::max(range.max(), + (*ranges)[size_t(i1)].max())); + range.setMin(std::min(range.min(), + (*ranges)[size_t(i1)].min())); + range.setAbsmean((range.absmean() + + (*ranges)[size_t(i1)].absmean()) / 2); } } else { @@ -751,30 +754,33 @@ if (mergingChannels) { - if (otherChannelRanges && i0 < (int)otherChannelRanges->size()) { + if (otherChannelRanges && i0 < (sv_frame_t)otherChannelRanges->size()) { range.setMax(fabsf(range.max())); - range.setMin(-fabsf((*otherChannelRanges)[i0].max())); + range.setMin(-fabsf((*otherChannelRanges)[size_t(i0)].max())); range.setAbsmean ((range.absmean() + - (*otherChannelRanges)[i0].absmean()) / 2); + (*otherChannelRanges)[size_t(i0)].absmean()) / 2); - if (i1 > i0 && i1 < (int)otherChannelRanges->size()) { + if (i1 > i0 && i1 < (sv_frame_t)otherChannelRanges->size()) { // let's not concern ourselves about the mean range.setMin (std::min (range.min(), - -fabsf((*otherChannelRanges)[i1].max()))); + -fabsf((*otherChannelRanges)[size_t(i1)].max()))); } } } else if (mixingChannels) { - if (otherChannelRanges && i0 < (int)otherChannelRanges->size()) { + if (otherChannelRanges && i0 < (sv_frame_t)otherChannelRanges->size()) { - range.setMax((range.max() + (*otherChannelRanges)[i0].max()) / 2); - range.setMin((range.min() + (*otherChannelRanges)[i0].min()) / 2); - range.setAbsmean((range.absmean() + (*otherChannelRanges)[i0].absmean()) / 2); + range.setMax((range.max() + + (*otherChannelRanges)[size_t(i0)].max()) / 2); + range.setMin((range.min() + + (*otherChannelRanges)[size_t(i0)].min()) / 2); + range.setAbsmean((range.absmean() + + (*otherChannelRanges)[size_t(i0)].absmean()) / 2); } }