Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-29 16:50:13 +01:00
Code Issues Projects Releases Wiki Activity

2022-04-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the 'Marker Viewer' dialog that caused the cursor
	to be repositioned to outside of the waveform viewport when zooming
	into or out from the waveform.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-04-18 15:27:12 -04:00
parent 3cc7806db1
commit de6abc01be
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -22975,3 +22975,7 @@
a SoundExchange Statutory License report using the command-line a SoundExchange Statutory License report using the command-line
option would cause a crash. option would cause a crash.
* Added an '-h' option to rdlogmanager(1). * Added an '-h' option to rdlogmanager(1).
2022-04-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'Marker Viewer' dialog that caused the cursor
to be repositioned to outside of the waveform viewport when zooming
into or out from the waveform.

16
lib/rdmarkerview.cpp
View File

@@ -2,7 +2,7 @@
// //
// Widget for displaying/editing cut markers // Widget for displaying/editing cut markers
// //
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2021-2022 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@@ -367,6 +367,8 @@ RDMarkerView::RDMarkerView(int width,int height,QWidget *parent)
d_scene=NULL; d_scene=NULL;
d_sample_rate=rda->system()->sampleRate(); d_sample_rate=rda->system()->sampleRate();
d_right_margin=0; d_right_margin=0;
printf("clearing cursor\n");
d_cursor=NULL;
clear(); clear();
d_view=new QGraphicsView(this); d_view=new QGraphicsView(this);
@@ -795,7 +797,6 @@ void RDMarkerView::clear()
} }
d_no_segue_fade=false; d_no_segue_fade=false;
d_play_gain=0; d_play_gain=0;
d_cursor=NULL;
d_shrink_factor=1; d_shrink_factor=1;
d_max_shrink_factor=1; d_max_shrink_factor=1;
d_pad_size=0; d_pad_size=0;
@@ -1157,8 +1158,15 @@ int RDMarkerView::Msec(int frame) const
void RDMarkerView::SetShrinkFactor(int sf) void RDMarkerView::SetShrinkFactor(int sf)
{ {
if((d_shrink_factor!=sf)&&(sf<=d_max_shrink_factor)) { if((d_shrink_factor!=sf)&&(sf<=d_max_shrink_factor)) {
//
// Reposition cursor
//
int x=LEFT_MARGIN+(d_cursor->pos().x()-LEFT_MARGIN)*d_shrink_factor/sf;
d_cursor->setPos(x,0);
d_shrink_factor=sf; d_shrink_factor=sf;
WriteWave(); WriteWave();
gotoCursor();
emit canShrinkTimeChanged(canShrinkTime()); emit canShrinkTimeChanged(canShrinkTime());
emit canGrowTimeChanged(canGrowTime()); emit canGrowTimeChanged(canGrowTime());
} }
@@ -1256,7 +1264,9 @@ void RDMarkerView::WriteWave()
DrawMarker(RDMarkerHandle::Start,RDMarkerHandle::CutStart,20); DrawMarker(RDMarkerHandle::Start,RDMarkerHandle::CutStart,20);
DrawMarker(RDMarkerHandle::End,RDMarkerHandle::CutEnd,20); DrawMarker(RDMarkerHandle::End,RDMarkerHandle::CutEnd,20);
d_cursor=new QGraphicsLineItem(0,0,0,d_height); if(d_cursor==NULL) {
d_cursor=new QGraphicsLineItem(0,0,0,d_height);
}
QPen pen(Qt::green); QPen pen(Qt::green);
pen.setWidth(2); pen.setWidth(2);
d_cursor->setPen(pen); d_cursor->setPen(pen);