ASSA resizer - max three decimals

This commit is contained in:
niksedk 2021-08-14 09:22:47 +02:00
parent 9329457b2e
commit 2030f0a79a

View File

@ -105,7 +105,7 @@ namespace Nikse.SubtitleEdit.Core.Common
if (float.TryParse(element, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var number)) if (float.TryParse(element, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var number))
{ {
var x = Resample(sourceWidth, targetWidth, number); var x = Resample(sourceWidth, targetWidth, number);
sb.Append(x.ToString(CultureInfo.InvariantCulture)); sb.Append(x.ToString("0.###", CultureInfo.InvariantCulture));
sb.Append(' '); sb.Append(' ');
state = "y"; state = "y";
} }
@ -119,7 +119,7 @@ namespace Nikse.SubtitleEdit.Core.Common
if (float.TryParse(element, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var number)) if (float.TryParse(element, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var number))
{ {
var y = Resample(sourceHeight, targetHeight, number); var y = Resample(sourceHeight, targetHeight, number);
sb.Append(y.ToString(CultureInfo.InvariantCulture)); sb.Append(y.ToString("0.###", CultureInfo.InvariantCulture));
sb.Append(' '); sb.Append(' ');
state = "start"; state = "start";
} }
@ -165,10 +165,10 @@ namespace Nikse.SubtitleEdit.Core.Common
var resizedY2 = Resample(sourceHeight, targetHeight, y2); var resizedY2 = Resample(sourceHeight, targetHeight, y2);
s = s.Remove(match.Index, match.Value.Length); s = s.Remove(match.Index, match.Value.Length);
s = s.Insert(match.Index, "\\" + tag + "(" + s = s.Insert(match.Index, "\\" + tag + "(" +
resizedX1.ToString(CultureInfo.InvariantCulture) + "," + resizedX1.ToString("0.###", CultureInfo.InvariantCulture) + "," +
resizedY1.ToString(CultureInfo.InvariantCulture) + "," + resizedY1.ToString("0.###", CultureInfo.InvariantCulture) + "," +
resizedX2.ToString(CultureInfo.InvariantCulture) + "," + resizedX2.ToString("0.###", CultureInfo.InvariantCulture) + "," +
resizedY2.ToString(CultureInfo.InvariantCulture) + ")"); resizedY2.ToString("0.###", CultureInfo.InvariantCulture) + ")");
match = regex.Match(s, match.Index + tag.Length); match = regex.Match(s, match.Index + tag.Length);
} }
else else
@ -203,12 +203,12 @@ namespace Nikse.SubtitleEdit.Core.Common
var resizedY2 = Resample(sourceHeight, targetHeight, y2); var resizedY2 = Resample(sourceHeight, targetHeight, y2);
s = s.Remove(match.Index, match.Value.Length); s = s.Remove(match.Index, match.Value.Length);
s = s.Insert(match.Index, "\\" + tag + "(" + s = s.Insert(match.Index, "\\" + tag + "(" +
resizedX1.ToString(CultureInfo.InvariantCulture) + "," + resizedX1.ToString("0.###", CultureInfo.InvariantCulture) + "," +
resizedY1.ToString(CultureInfo.InvariantCulture) + "," + resizedY1.ToString("0.###", CultureInfo.InvariantCulture) + "," +
resizedX2.ToString(CultureInfo.InvariantCulture) + "," + resizedX2.ToString("0.###", CultureInfo.InvariantCulture) + "," +
resizedY2.ToString(CultureInfo.InvariantCulture) + "," + resizedY2.ToString("0.###", CultureInfo.InvariantCulture) + "," +
t1.ToString(CultureInfo.InvariantCulture) + "," + t1.ToString("0.###", CultureInfo.InvariantCulture) + "," +
t2.ToString(CultureInfo.InvariantCulture) + ")"); t2.ToString("0.###", CultureInfo.InvariantCulture) + ")");
match = regex.Match(s, match.Index + tag.Length); match = regex.Match(s, match.Index + tag.Length);
} }
else else
@ -237,8 +237,8 @@ namespace Nikse.SubtitleEdit.Core.Common
var resizedY = Resample(sourceHeight, targetHeight, y); var resizedY = Resample(sourceHeight, targetHeight, y);
s = s.Remove(match.Index, match.Value.Length); s = s.Remove(match.Index, match.Value.Length);
s = s.Insert(match.Index, "\\" + tag + "(" + s = s.Insert(match.Index, "\\" + tag + "(" +
resizedX.ToString(CultureInfo.InvariantCulture) + "," + resizedX.ToString("0.###", CultureInfo.InvariantCulture) + "," +
resizedY.ToString(CultureInfo.InvariantCulture) + ")"); resizedY.ToString("0.###", CultureInfo.InvariantCulture) + ")");
match = regex.Match(s, match.Index + tag.Length); match = regex.Match(s, match.Index + tag.Length);
} }
else else