Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 03:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Waveform/spectrogram: Moving start/end with ALT down now always works - thx Leon :)

Browse Source 
Also, move border left/right now also always works even when it's near next/prev border


git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2380 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2014-01-15 18:15:58 +00:00
parent 50c946a834
commit d00635a266
1 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/Controls/AudioVisualizer.cs
View File

@ -72,6 +72,9 @@ namespace Nikse.SubtitleEdit.Controls
private Paragraph _selectedParagraph; private Paragraph _selectedParagraph;
private Paragraph _currentParagraph; private Paragraph _currentParagraph;
private List<Paragraph> _previousAndNextParagraphs = new List<Paragraph>(); private List<Paragraph> _previousAndNextParagraphs = new List<Paragraph>();
private Paragraph _prevParagraph;
private Paragraph _nextParagraph;
private bool _firstMove = true;
private double _currentVideoPositionSeconds = -1; private double _currentVideoPositionSeconds = -1;
private WavePeakGenerator _wavePeaks; private WavePeakGenerator _wavePeaks;
private Subtitle _subtitle; private Subtitle _subtitle;
@ -281,6 +284,7 @@ namespace Nikse.SubtitleEdit.Controls
{ {
_previousAndNextParagraphs.Clear(); _previousAndNextParagraphs.Clear();
_currentParagraph = null; _currentParagraph = null;
int positionMilliseconds = (int)Math.Round(currentVideoPositionSeconds * 1000.0); int positionMilliseconds = (int)Math.Round(currentVideoPositionSeconds * 1000.0);
if (_selectedParagraph != null && _selectedParagraph.StartTime.TotalMilliseconds < positionMilliseconds && _selectedParagraph.EndTime.TotalMilliseconds > positionMilliseconds) if (_selectedParagraph != null && _selectedParagraph.StartTime.TotalMilliseconds < positionMilliseconds && _selectedParagraph.EndTime.TotalMilliseconds > positionMilliseconds)
{ {
@ -746,8 +750,10 @@ namespace Nikse.SubtitleEdit.Controls
if (_wavePeaks == null) if (_wavePeaks == null)
return; return;
Paragraph oldMouseDownParagraph = null;
_mouseDownParagraphType = MouseDownParagraphType.None; _mouseDownParagraphType = MouseDownParagraphType.None;
_gapAtStart = -1; _gapAtStart = -1;
_firstMove = true;
if (e.Button == MouseButtons.Left) if (e.Button == MouseButtons.Left)
{ {
_buttonDownTimeTicks = DateTime.Now.Ticks; _buttonDownTimeTicks = DateTime.Now.Ticks;
@ -758,6 +764,8 @@ namespace Nikse.SubtitleEdit.Controls
if (SetParagrapBorderHit(milliseconds, NewSelectionParagraph)) if (SetParagrapBorderHit(milliseconds, NewSelectionParagraph))
{ {
if (_mouseDownParagraph != null)
oldMouseDownParagraph = new Paragraph(_mouseDownParagraph);
if (_mouseDownParagraphType == MouseDownParagraphType.Start) if (_mouseDownParagraphType == MouseDownParagraphType.Start)
{ {
_mouseDownParagraph.StartTime.TotalMilliseconds = milliseconds; _mouseDownParagraph.StartTime.TotalMilliseconds = milliseconds;
@ -778,6 +786,8 @@ namespace Nikse.SubtitleEdit.Controls
SetParagrapBorderHit(milliseconds, _currentParagraph) || SetParagrapBorderHit(milliseconds, _currentParagraph) ||
SetParagrapBorderHit(milliseconds, _previousAndNextParagraphs)) SetParagrapBorderHit(milliseconds, _previousAndNextParagraphs))
{ {
if (_mouseDownParagraph != null)
oldMouseDownParagraph = new Paragraph(_mouseDownParagraph);
NewSelectionParagraph = null; NewSelectionParagraph = null;
if (_mouseDownParagraphType == MouseDownParagraphType.Start) if (_mouseDownParagraphType == MouseDownParagraphType.Start)
_mouseDownParagraph.StartTime.TotalMilliseconds = milliseconds; _mouseDownParagraph.StartTime.TotalMilliseconds = milliseconds;
@ -792,6 +802,7 @@ namespace Nikse.SubtitleEdit.Controls
{ {
_oldParagraph = new Paragraph(p); _oldParagraph = new Paragraph(p);
_mouseDownParagraph = p; _mouseDownParagraph = p;
oldMouseDownParagraph = new Paragraph(_mouseDownParagraph);
_mouseDownParagraphType = MouseDownParagraphType.Whole; _mouseDownParagraphType = MouseDownParagraphType.Whole;
_moveWholeStartDifferenceMilliseconds = (XPositionToSeconds(e.X) * 1000.0) - p.StartTime.TotalMilliseconds; _moveWholeStartDifferenceMilliseconds = (XPositionToSeconds(e.X) * 1000.0) - p.StartTime.TotalMilliseconds;
Cursor = Cursors.Hand; Cursor = Cursors.Hand;
@ -812,8 +823,10 @@ namespace Nikse.SubtitleEdit.Controls
if (_subtitle != null && _mouseDownParagraph != null) if (_subtitle != null && _mouseDownParagraph != null)
{ {
int curIdx = _subtitle.Paragraphs.IndexOf(_mouseDownParagraph); int curIdx = _subtitle.Paragraphs.IndexOf(_mouseDownParagraph);
//if (curIdx > 0)
// _gapAtStart = _subtitle.Paragraphs[curIdx].StartTime.TotalMilliseconds - _subtitle.Paragraphs[curIdx - 1].EndTime.TotalMilliseconds;
if (curIdx > 0) if (curIdx > 0)
_gapAtStart = _subtitle.Paragraphs[curIdx].StartTime.TotalMilliseconds - _subtitle.Paragraphs[curIdx - 1].EndTime.TotalMilliseconds; _gapAtStart = oldMouseDownParagraph.StartTime.TotalMilliseconds - _subtitle.Paragraphs[curIdx - 1].EndTime.TotalMilliseconds;
} }
} }
else if (_mouseDownParagraphType == MouseDownParagraphType.End) else if (_mouseDownParagraphType == MouseDownParagraphType.End)
@ -821,8 +834,10 @@ namespace Nikse.SubtitleEdit.Controls
if (_subtitle != null && _mouseDownParagraph != null) if (_subtitle != null && _mouseDownParagraph != null)
{ {
int curIdx = _subtitle.Paragraphs.IndexOf(_mouseDownParagraph); int curIdx = _subtitle.Paragraphs.IndexOf(_mouseDownParagraph);
//if (curIdx >= 0 && curIdx < _subtitle.Paragraphs.Count - 1)
// _gapAtStart = _subtitle.Paragraphs[curIdx + 1].StartTime.TotalMilliseconds - _subtitle.Paragraphs[curIdx].EndTime.TotalMilliseconds;
if (curIdx >= 0 && curIdx < _subtitle.Paragraphs.Count - 1) if (curIdx >= 0 && curIdx < _subtitle.Paragraphs.Count - 1)
_gapAtStart = _subtitle.Paragraphs[curIdx + 1].StartTime.TotalMilliseconds - _subtitle.Paragraphs[curIdx].EndTime.TotalMilliseconds; _gapAtStart = _subtitle.Paragraphs[curIdx + 1].StartTime.TotalMilliseconds - oldMouseDownParagraph.EndTime.TotalMilliseconds;
} }
} }
_mouseDown = true; _mouseDown = true;
@ -1049,6 +1064,7 @@ namespace Nikse.SubtitleEdit.Controls
if (_wavePeaks == null) if (_wavePeaks == null)
return; return;
int oldMouseMoveLastX = _mouseMoveLastX;
if (e.X < 0 && StartPositionSeconds > 0.1 && _mouseDown) if (e.X < 0 && StartPositionSeconds > 0.1 && _mouseDown)
{ {
if (e.X < _mouseMoveLastX) if (e.X < _mouseMoveLastX)
@ -1106,6 +1122,9 @@ namespace Nikse.SubtitleEdit.Controls
} }
else if (e.Button == MouseButtons.Left) else if (e.Button == MouseButtons.Left)
{ {
if (oldMouseMoveLastX == e.X)
return; // no horizontal movement
if (_mouseDown) if (_mouseDown)
{ {
if (_mouseDownParagraph != null) if (_mouseDownParagraph != null)
@ -1113,6 +1132,30 @@ namespace Nikse.SubtitleEdit.Controls
double seconds = XPositionToSeconds(e.X); double seconds = XPositionToSeconds(e.X);
int milliseconds = (int)(seconds * 1000.0); int milliseconds = (int)(seconds * 1000.0);
var subtitleIndex = _subtitle.GetIndex(_mouseDownParagraph);
_prevParagraph = _subtitle.GetParagraphOrDefault(subtitleIndex - 1);
_nextParagraph = _subtitle.GetParagraphOrDefault(subtitleIndex + 1);
if (Control.ModifierKeys != Keys.Alt)
{
if (_firstMove && e.X > oldMouseMoveLastX && _nextParagraph != null && _mouseDownParagraphType == MouseDownParagraphType.End)
{
if (Math.Abs(_nextParagraph.StartTime.TotalMilliseconds - _mouseDownParagraph.EndTime.TotalMilliseconds) <= ClosenessForBorderSelection + 2)
{
_mouseDownParagraph = _nextParagraph;
_mouseDownParagraphType = MouseDownParagraphType.Start;
}
}
else if (_firstMove && e.X < oldMouseMoveLastX && _prevParagraph != null && _mouseDownParagraphType == MouseDownParagraphType.Start)
{
if (Math.Abs(_prevParagraph.EndTime.TotalMilliseconds - _mouseDownParagraph.StartTime.TotalMilliseconds) <= ClosenessForBorderSelection + 2)
{
_mouseDownParagraph = _prevParagraph;
_mouseDownParagraphType = MouseDownParagraphType.End;
}
}
}
_firstMove = false;
if (_mouseDownParagraphType == MouseDownParagraphType.Start) if (_mouseDownParagraphType == MouseDownParagraphType.Start)
{ {
if (_mouseDownParagraph.EndTime.TotalMilliseconds - milliseconds > MininumSelectionMilliseconds) if (_mouseDownParagraph.EndTime.TotalMilliseconds - milliseconds > MininumSelectionMilliseconds)
@ -1168,6 +1211,12 @@ namespace Nikse.SubtitleEdit.Controls
} }
else else
{ {
//SHOW DEBUG MSG SolidBrush tBrush = new SolidBrush(Color.Turquoise);
//var g = this.CreateGraphics();
//g.DrawString("AllowMovePrevOrNext: " + AllowMovePrevOrNext.ToString() + ", GapStart: " + _gapAtStart.ToString(), Font, tBrush, new PointF(100, 100));
//tBrush.Dispose();
//g.Dispose();
if (OnTimeChanged != null) if (OnTimeChanged != null)
OnTimeChanged.Invoke(this, new ParagraphEventArgs(seconds, _mouseDownParagraph, _oldParagraph, _mouseDownParagraphType, AllowMovePrevOrNext)); OnTimeChanged.Invoke(this, new ParagraphEventArgs(seconds, _mouseDownParagraph, _oldParagraph, _mouseDownParagraphType, AllowMovePrevOrNext));
} }