AppSettings and Configuration changes,
major changes to E_Distance and minor for D_Face
This commit is contained in:
@ -7,40 +7,40 @@ namespace View_by_Distance.Shared.Models;
|
||||
public class Location : Properties.ILocation, ILocation, IEquatable<Location>
|
||||
{
|
||||
|
||||
public double Confidence => _Confidence;
|
||||
protected double _Confidence;
|
||||
protected int _Bottom;
|
||||
protected double _Confidence;
|
||||
protected int _Left;
|
||||
protected double? _PixelPercentage;
|
||||
protected readonly int? _NormalizedPixelPercentage;
|
||||
protected int _Right;
|
||||
protected int _Top;
|
||||
public int Bottom => _Bottom;
|
||||
public double Confidence => _Confidence;
|
||||
public int Left => _Left;
|
||||
public double? PixelPercentage => _PixelPercentage;
|
||||
public int? NormalizedPixelPercentage => _NormalizedPixelPercentage;
|
||||
public int Right => _Right;
|
||||
public int Top => _Top;
|
||||
|
||||
[JsonConstructor]
|
||||
public Location(double confidence, int bottom, int left, double? pixelPercentage, int right, int top)
|
||||
public Location(int bottom, double confidence, int left, int? normalizedPixelPercentage, int right, int top)
|
||||
{
|
||||
_Confidence = confidence;
|
||||
_Bottom = bottom;
|
||||
_Left = left;
|
||||
_PixelPercentage = pixelPercentage;
|
||||
_NormalizedPixelPercentage = normalizedPixelPercentage;
|
||||
_Right = right;
|
||||
_Top = top;
|
||||
}
|
||||
|
||||
public Location(double confidence, int bottom, int left, int right, int top, int width, int height) :
|
||||
this(confidence, bottom, left, GetPixelPercentage(bottom, left, right, top, width, height), right, top)
|
||||
this(bottom, confidence, left, GetNormalizedPixelPercentage(bottom, height, left, right, top, width), right, top)
|
||||
{ }
|
||||
|
||||
public Location(double confidence, Location location, int width, int height) :
|
||||
this(confidence, location.Bottom, location.Left, location.Right, location.Top, width, height)
|
||||
this(location.Bottom, confidence, location.Left, GetNormalizedPixelPercentage(location.Bottom, height, location.Left, location.Right, location.Top, width), location.Right, location.Top)
|
||||
{ }
|
||||
|
||||
public Location(int left, int top, int right, int bottom, int width, int height) :
|
||||
this(-1.0d, bottom, left, right, top, width, height)
|
||||
this(bottom, -1.0d, left, GetNormalizedPixelPercentage(bottom, height, left, right, top, width), right, top)
|
||||
{ }
|
||||
|
||||
public override bool Equals(object? obj) => Equals(obj as Location);
|
||||
@ -61,13 +61,13 @@ public class Location : Properties.ILocation, ILocation, IEquatable<Location>
|
||||
return hashCode;
|
||||
}
|
||||
|
||||
public static double GetPixelPercentage(int left, int top, int right, int bottom, int width, int height)
|
||||
public static int GetNormalizedPixelPercentage(int bottom, int height, int left, int right, int top, int width)
|
||||
{
|
||||
double result;
|
||||
double xCenter = left + ((right - left) / 2);
|
||||
double yCenter = top + ((bottom - top) / 2);
|
||||
result = ((yCenter * width) + xCenter) / (width * height);
|
||||
return (double)Math.Round((decimal)result, 4);
|
||||
return (int)(Math.Round((decimal)result, 4) * Stateless.Methods.ILocation.Factor);
|
||||
}
|
||||
|
||||
public bool Equals(Location? location)
|
||||
|
Reference in New Issue
Block a user