Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 20:52:44 +01:00
Code Issues Projects Releases Wiki Activity

Validate zones on profile form

Browse Source
This commit is contained in:
Martijn van Berkel (Flitskikker) 2023-05-21 19:21:45 +02:00
parent a32eac41cd
commit 76df1d1f34
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libse/Forms/TimeCodesBeautifier.cs
View File

@ -171,8 +171,8 @@ namespace Nikse.SubtitleEdit.Core.Forms
private double FindNewBestCueTime(double cueTime, bool isInCue)
{
var cueTimeFrame = SubtitleFormat.MillisecondsToFrames(cueTime, _frameRate);
var previousShotChange = new List<int> { -1 }.Concat(_shotChangesFrames).Last(x => x <= cueTimeFrame); // will return -1 if non found
var nextShotChange = _shotChangesFrames.Concat(new List<int> { int.MaxValue }).First(x => x >= cueTimeFrame); // will return maxValue if non found
var previousShotChange = new List<int> { -1 }.Concat(_shotChangesFrames).Last(x => x <= cueTimeFrame); // will return -1 if none found
var nextShotChange = _shotChangesFrames.Concat(new List<int> { int.MaxValue }).First(x => x >= cueTimeFrame); // will return maxValue if none found
// If both not found, return self
if (previousShotChange < 0 && nextShotChange == int.MaxValue)

26
src/ui/Forms/BeautifyTimeCodesProfile.cs
View File

@ -48,38 +48,38 @@ namespace Nikse.SubtitleEdit.Forms
numericUpDownGap.Value = settings.Gap;
numericUpDownInCuesGap.Value = settings.InCuesGap;
numericUpDownInCuesLeftGreenZone.Value = settings.InCuesLeftGreenZone;
numericUpDownInCuesLeftRedZone.Value = settings.InCuesLeftRedZone;
numericUpDownInCuesRightRedZone.Value = settings.InCuesRightRedZone;
numericUpDownInCuesLeftGreenZone.Value = settings.InCuesLeftGreenZone;
numericUpDownInCuesRightGreenZone.Value = settings.InCuesRightGreenZone;
numericUpDownOutCuesGap.Value = settings.OutCuesGap;
numericUpDownOutCuesLeftGreenZone.Value = settings.OutCuesLeftGreenZone;
numericUpDownOutCuesLeftRedZone.Value = settings.OutCuesLeftRedZone;
numericUpDownOutCuesRightRedZone.Value = settings.OutCuesRightRedZone;
numericUpDownOutCuesLeftGreenZone.Value = settings.OutCuesLeftGreenZone;
numericUpDownOutCuesRightGreenZone.Value = settings.OutCuesRightGreenZone;
numericUpDownConnectedSubtitlesLeftGap.Value = settings.ConnectedSubtitlesLeftGap;
numericUpDownConnectedSubtitlesRightGap.Value = settings.ConnectedSubtitlesRightGap;
comboBoxConnectedSubtitlesBehavior.SelectedIndex = (int)settings.ConnectedSubtitlesBehavior;
numericUpDownConnectedSubtitlesLeftGreenZone.Value = settings.ConnectedSubtitlesLeftGreenZone;
numericUpDownConnectedSubtitlesLeftRedZone.Value = settings.ConnectedSubtitlesLeftRedZone;
numericUpDownConnectedSubtitlesRightRedZone.Value = settings.ConnectedSubtitlesRightRedZone;
numericUpDownConnectedSubtitlesLeftGreenZone.Value = settings.ConnectedSubtitlesLeftGreenZone;
numericUpDownConnectedSubtitlesRightGreenZone.Value = settings.ConnectedSubtitlesRightGreenZone;
numericUpDownConnectedSubtitlesTreatConnected.Value = settings.ConnectedSubtitlesTreatConnected;
radioButtonChainingGeneralZones.Checked = settings.ChainingGeneralUseZones;
radioButtonChainingGeneralMaxGap.Checked = !settings.ChainingGeneralUseZones;
numericUpDownChainingGeneralMaxGap.Value = settings.ChainingGeneralMaxGap;
numericUpDownChainingGeneralLeftGreenZone.Value = settings.ChainingGeneralLeftGreenZone;
numericUpDownChainingGeneralLeftRedZone.Value = settings.ChainingGeneralLeftRedZone;
numericUpDownChainingGeneralLeftGreenZone.Value = settings.ChainingGeneralLeftGreenZone;
comboBoxChainingGeneralShotChangeBehavior.SelectedIndex = (int)settings.ChainingGeneralShotChangeBehavior;
radioButtonChainingInCueOnShotZones.Checked = settings.ChainingInCueOnShotUseZones;
radioButtonChainingInCueOnShotMaxGap.Checked = !settings.ChainingInCueOnShotUseZones;
numericUpDownChainingInCueOnShotMaxGap.Value = settings.ChainingInCueOnShotMaxGap;
numericUpDownChainingInCueOnShotLeftGreenZone.Value = settings.ChainingInCueOnShotLeftGreenZone;
numericUpDownChainingInCueOnShotLeftRedZone.Value = settings.ChainingInCueOnShotLeftRedZone;
numericUpDownChainingInCueOnShotLeftGreenZone.Value = settings.ChainingInCueOnShotLeftGreenZone;
radioButtonChainingOutCueOnShotZones.Checked = settings.ChainingOutCueOnShotUseZones;
radioButtonChainingOutCueOnShotMaxGap.Checked = !settings.ChainingOutCueOnShotUseZones;
@ -225,6 +225,7 @@ namespace Nikse.SubtitleEdit.Forms
}
private void numericUpDown_ValueChanged(object sender, EventArgs e)
{
ValidateZones();
RefreshControls();
}
@ -250,5 +251,20 @@ namespace Nikse.SubtitleEdit.Forms
numericUpDownConnectedSubtitlesRightGap.Value = numericUpDownGap.Value;
}
}
private void ValidateZones()
{
numericUpDownInCuesLeftGreenZone.Minimum = numericUpDownInCuesLeftRedZone.Value;
numericUpDownInCuesRightGreenZone.Minimum = numericUpDownInCuesRightRedZone.Value;
numericUpDownOutCuesLeftGreenZone.Minimum = numericUpDownOutCuesLeftRedZone.Value;
numericUpDownOutCuesRightGreenZone.Minimum = numericUpDownOutCuesRightRedZone.Value;
numericUpDownConnectedSubtitlesLeftGreenZone.Minimum = numericUpDownConnectedSubtitlesLeftRedZone.Value;
numericUpDownConnectedSubtitlesRightGreenZone.Minimum = numericUpDownConnectedSubtitlesRightRedZone.Value;
numericUpDownChainingGeneralLeftGreenZone.Minimum = numericUpDownChainingGeneralLeftRedZone.Value;
numericUpDownChainingInCueOnShotLeftGreenZone.Minimum = numericUpDownChainingInCueOnShotLeftRedZone.Value;
numericUpDownChainingOutCueOnShotRightGreenZone.Minimum = numericUpDownChainingOutCueOnShotRightRedZone.Value;
}
}
}