Update to make field names better, and to add variable precision rounding

See PR 5072 for the input that lead to this change.
This commit is contained in:
Jake 2020-09-25 22:11:12 -07:00
parent 8af8f470a5
commit ec92fae942

View file

@ -24,20 +24,31 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
namespace ShareX.HelpersLib
{
public class CodeMenuEntryPixelInfo : CodeMenuEntry
{
protected override string Prefix { get; } = "$";
// We need access to the prefix later on
private static readonly string _prefix = "$";
protected override string Prefix { get; } = _prefix;
public static readonly CodeMenuEntryPixelInfo r = new CodeMenuEntryPixelInfo("r", "Red color (0-255)");
public static readonly CodeMenuEntryPixelInfo g = new CodeMenuEntryPixelInfo("g", "Green color (0-255)");
public static readonly CodeMenuEntryPixelInfo b = new CodeMenuEntryPixelInfo("b", "Blue color (0-255)");
public static readonly CodeMenuEntryPixelInfo R = new CodeMenuEntryPixelInfo("R", "Red color (0-1.000)");
public static readonly CodeMenuEntryPixelInfo G = new CodeMenuEntryPixelInfo("G", "Green color (0-1.000)");
public static readonly CodeMenuEntryPixelInfo B = new CodeMenuEntryPixelInfo("B", "Blue color (0-1.000)");
// This shouldn't show up in the list of options, but will continue to work for backwards compatibility's sake.
//public static readonly CodeMenuEntryPixelInfo r = new CodeMenuEntryPixelInfo("r", "Red color (0-255)");
//public static readonly CodeMenuEntryPixelInfo g = new CodeMenuEntryPixelInfo("g", "Green color (0-255)");
//public static readonly CodeMenuEntryPixelInfo b = new CodeMenuEntryPixelInfo("b", "Blue color (0-255)");
public static readonly CodeMenuEntryPixelInfo r255 = new CodeMenuEntryPixelInfo("r255", "Red color (0-255)");
public static readonly CodeMenuEntryPixelInfo g255 = new CodeMenuEntryPixelInfo("g255", "Green color (0-255)");
public static readonly CodeMenuEntryPixelInfo b255 = new CodeMenuEntryPixelInfo("b255", "Blue color (0-255)");
public static readonly CodeMenuEntryPixelInfo r1 = new CodeMenuEntryPixelInfo("r1", "Red color (0-1). Specify decimal precison with {n}, defaults to 3.");
public static readonly CodeMenuEntryPixelInfo g1 = new CodeMenuEntryPixelInfo("g1", "Green color (0-1). Specify decimal precison with {n}, defaults to 3.");
public static readonly CodeMenuEntryPixelInfo b1 = new CodeMenuEntryPixelInfo("b1", "Blue color (0-1). Specify decimal precison with {n}, defaults to 3.");
public static readonly CodeMenuEntryPixelInfo hex = new CodeMenuEntryPixelInfo("hex", "Hex color value (Lowercase)");
public static readonly CodeMenuEntryPixelInfo HEX = new CodeMenuEntryPixelInfo("HEX", "Hex color value (Uppercase)");
public static readonly CodeMenuEntryPixelInfo x = new CodeMenuEntryPixelInfo("x", "X position");
@ -50,17 +61,82 @@ public CodeMenuEntryPixelInfo(string value, string description) : base(value, de
public static string Parse(string input, Color color, Point position)
{
return input.Replace(r.ToPrefixString(), color.R.ToString(), StringComparison.InvariantCulture).
Replace(g.ToPrefixString(), color.G.ToString(), StringComparison.InvariantCulture).
Replace(b.ToPrefixString(), color.B.ToString(), StringComparison.InvariantCulture).
Replace(R.ToPrefixString(), Math.Round(color.R / 255.0, 3, MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(G.ToPrefixString(), Math.Round(color.G / 255.0, 3, MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(B.ToPrefixString(), Math.Round(color.B / 255.0, 3, MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase).
input = input.Replace(r255.ToPrefixString(), color.R.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(g255.ToPrefixString(), color.G.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(b255.ToPrefixString(), color.B.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(HEX.ToPrefixString(), ColorHelpers.ColorToHex(color), StringComparison.InvariantCulture).
Replace(hex.ToPrefixString(), ColorHelpers.ColorToHex(color).ToLowerInvariant(), StringComparison.InvariantCultureIgnoreCase).
Replace(x.ToPrefixString(), position.X.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(y.ToPrefixString(), position.Y.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(n.ToPrefixString(), Environment.NewLine, StringComparison.InvariantCultureIgnoreCase);
// Special cases for r1{n} that includes variable length rounding.
// Turns out the rounding must be between 0 and 15 inclusive. I will force all numbers to that range.
foreach (Tuple<string, int> entry in ListEntryWithValue(input, r1.ToPrefixString()))
{
input = input.Replace(entry.Item1, Math.Round(color.B / 255.0, Math.Min(Math.Max(entry.Item2, 0), 15), MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase);
}
foreach (Tuple<string, int> entry in ListEntryWithValue(input, g1.ToPrefixString()))
{
input = input.Replace(entry.Item1, Math.Round(color.B / 255.0, Math.Min(Math.Max(entry.Item2, 0), 15), MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase);
}
foreach (Tuple<string, int> entry in ListEntryWithValue(input, b1.ToPrefixString()))
{
input = input.Replace(entry.Item1, Math.Round(color.B / 255.0, Math.Min(Math.Max(entry.Item2, 0), 15), MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase);
}
// Case for r1 that does not include variable lenthg rounding, defaults to 3 didgets
input = input.Replace(r1.ToPrefixString(), Math.Round(color.B / 255.0, 3, MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(g1.ToPrefixString(), Math.Round(color.B / 255.0, 3, MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(b1.ToPrefixString(), Math.Round(color.B / 255.0, 3, MidpointRounding.AwayFromZero).ToString(), StringComparison.InvariantCultureIgnoreCase);
// This is here for backwards compatibility. These do not show up in the list, so they have to be done slightly differently,
// and have to be done last so they don't munch the `$r` from other entries.
input = input.Replace(_prefix + "r", color.R.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(_prefix + "g", color.G.ToString(), StringComparison.InvariantCultureIgnoreCase).
Replace(_prefix + "b", color.B.ToString(), StringComparison.InvariantCultureIgnoreCase);
return input;
}
private static IEnumerable<Tuple<string, string[]>> ListEntryWithArguments(string text, string entry, int elements)
{
foreach (Tuple<string, string> o in text.ForEachBetween(entry + "{", "}"))
{
string[] s = o.Item2.Split(',');
if (elements > s.Length)
{
Array.Resize(ref s, elements);
}
yield return new Tuple<string, string[]>(o.Item1, s);
}
}
private static IEnumerable<Tuple<string, int[]>> ListEntryWithValues(string text, string entry, int elements)
{
foreach (Tuple<string, string[]> o in ListEntryWithArguments(text, entry, elements))
{
int[] a = new int[o.Item2.Length];
for (int i = o.Item2.Length - 1; i >= 0; --i)
{
int n = 0;
if (int.TryParse(o.Item2[i], out n))
{
a[i] = n;
}
}
yield return new Tuple<string, int[]>(o.Item1, a);
}
}
private static IEnumerable<Tuple<string, int>> ListEntryWithValue(string text, string entry)
{
foreach (Tuple<string, int[]> o in ListEntryWithValues(text, entry, 1))
{
yield return new Tuple<string, int>(o.Item1, o.Item2[0]);
}
}
}
}