From bb4fe56bb71b7ec96f329434494dab3d87b2b918 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 20 Mar 2021 12:50:21 -0400 Subject: [PATCH] 2021-03-20 Fred Gleason * Fixed a bug in 'RDMarkerView' that caused an incorrect limit stop to be applied to the 'Fade Down' marker after deletion of the 'Fade Up' marker'. Signed-off-by: Fred Gleason --- ChangeLog | 4 ++++ lib/rdmarkerview.cpp | 7 ++----- lib/rdmarkerview.h | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c24d92e4..f06a56b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21291,3 +21291,7 @@ 2021-03-20 Fred Gleason * Fixed a bug in 'RDMarkerView' that transposed the handle direction for the 'Fade Up' and 'Fade Down' markers. +2021-03-20 Fred Gleason + * Fixed a bug in 'RDMarkerView' that caused an incorrect limit + stop to be applied to the 'Fade Down' marker after deletion of + the 'Fade Up' marker'. diff --git a/lib/rdmarkerview.cpp b/lib/rdmarkerview.cpp index f5a0502f..e9957663 100644 --- a/lib/rdmarkerview.cpp +++ b/lib/rdmarkerview.cpp @@ -695,7 +695,6 @@ void RDMarkerView::addFadeupData() DrawMarker(RDMarkerHandle::End,RDMarkerHandle::FadeUp,80); InterlockFadeMarkerPair(); - // InterlockMarkerPair(RDMarkerHandle::FadeUp); d_has_unsaved_changes=true; @@ -710,7 +709,6 @@ void RDMarkerView::addFadedownData() DrawMarker(RDMarkerHandle::Start,RDMarkerHandle::FadeDown,80); InterlockFadeMarkerPair(); - // InterlockMarkerPair(RDMarkerHandle::FadeDown); d_has_unsaved_changes=true; @@ -735,7 +733,6 @@ void RDMarkerView::updateInterlocks() // // Check for "swiped" markers and remove them // - /* for(int i=2;i<(RDMarkerHandle::LastRole);i++) { RDMarkerHandle::PointerRole role=(RDMarkerHandle::PointerRole)i; if((d_pointers[i]>=0)&& @@ -764,7 +761,7 @@ void RDMarkerView::updateInterlocks() } } } - */ + // // Update the limit stops // @@ -826,7 +823,7 @@ void RDMarkerView::InterlockFadeMarkerPair() d_pointers[RDMarkerHandle::FadeUp]); } else { - d_handles[RDMarkerHandle::FadeUp][i]-> + d_handles[RDMarkerHandle::FadeDown][i]-> setMinimum(d_handles[RDMarkerHandle::CutStart][i]->pos().x()-LEFT_MARGIN, d_pointers[RDMarkerHandle::CutStart]); } diff --git a/lib/rdmarkerview.h b/lib/rdmarkerview.h index 6398e931..6e9aae0b 100644 --- a/lib/rdmarkerview.h +++ b/lib/rdmarkerview.h @@ -130,7 +130,6 @@ class RDMarkerView : public QWidget int Msec(int frame) const; void InterlockMarkerPair(RDMarkerHandle::PointerRole start_marker); void InterlockFadeMarkerPair(); - // void InterlockFadeUp(); bool LoadCutData(); void WriteWave(); void DrawMarker(RDMarkerHandle::PointerType type,