babaev-an/anbsoftware_componentspack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

20230102

Browse Source
This commit is contained in:
Александр Бабаев 2023-01-02 10:18:22 +03:00
parent af7a5dd299
commit a2990fe1ef
6 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
anbs_cp/Classes/CountConverter.cs
View File

@ -14,7 +14,8 @@ public sealed class CountConverter : ValueConverter
/// Конструктор класса
/// </summary>
/// <param name="valueNames">Массив имён размерностей</param>
public CountConverter (string[] valueNames) : base(valueNames, 1000)
/// <param name="decimalPlace">Знаков после запятой (0, 1, 2)</param>
public CountConverter (string[] valueNames, byte decimalPlace = 0) : base(valueNames, 1000, decimalPlace)
{
}
}

3
anbs_cp/Classes/FileSizeConverter.cs
View File

@ -14,7 +14,8 @@ public sealed class FileSizeConverter : ValueConverter
/// Конструктор класса
/// </summary>
/// <param name="valueNames">Массив имён размерностей</param>
public FileSizeConverter (string[] valueNames) : base(valueNames, 1024)
/// <param name="decimalPlace">Знаков после запятой (0, 1, 2)</param>
public FileSizeConverter (string[] valueNames, byte decimalPlace = 2) : base(valueNames, 1024, decimalPlace)
{
}
}

23
anbs_cp/Classes/ValueConverter.cs
View File

@ -12,10 +12,12 @@ public abstract class ValueConverter: IValueConverter
/// </summary>
/// <param name="valueNames">Массив имён размерностей</param>
/// <param name="divider">Делитель</param>
protected ValueConverter (string[] valueNames, long divider)
/// <param name="decimalPlaces">Число знаков после запятой</param>
protected ValueConverter (string[] valueNames, long divider, byte decimalPlaces)
{
ValueNames = valueNames;
Divider = divider;
DecimalPlaces = (byte)(decimalPlaces < 3 ? decimalPlaces : 2);
}
#region Реализация интерфейса
@ -28,6 +30,12 @@ public abstract class ValueConverter: IValueConverter
/// Делитель
/// </summary>
public long Divider { get; init; }
/// <summary>
/// Знаков после запятой (0, 1, 2)
/// </summary>
public byte DecimalPlaces { get; init; }
#endregion
#region Методы
@ -38,9 +46,18 @@ public abstract class ValueConverter: IValueConverter
/// <returns>Конвертирование значение в строку</returns>
public string Convert (long value)
{
//Получаю разделенное значение
(decimal, int) result = DivideIt(value, 0);
return $"{result.Item1:F2} {ValueNames[result.Item2]}";
//Преобразую значение в строку
string resultValue = DecimalPlaces switch {
0 => $"{result.Item1:F0}",
1 => $"{result.Item1:F1}",
_ => $"{result.Item1:F2}"
};
//Возвращаю результат
return $"{resultValue} {ValueNames[result.Item2]}";
}
@ -65,8 +82,6 @@ public abstract class ValueConverter: IValueConverter
//... и продолжаем цикл
return DivideIt(value / Divider, count);
}
#endregion
}

5
anbs_cp/Interfaces/IValueConverter.cs
View File

@ -14,4 +14,9 @@ public interface IValueConverter
/// Делитель
/// </summary>
public long Divider { get; init; }
/// <summary>
/// Знаков после запятой (0, 1, 2)
/// </summary>
public byte DecimalPlaces { get; init; }
}

7
anbs_cp/anbs_cp.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Version>2022.1224.1</Version>
<Version>2023.102.0</Version>
<Authors>Alexander Babaev</Authors>
<Product>ANB Software Components Pack</Product>
<Description>Library of some useful functions in C# language.</Description>
@ -15,8 +15,8 @@
<SignAssembly>True</SignAssembly>
<PackageProjectUrl>https://git.babaev-an.ru/babaev-an/anbsoftware_componentspack</PackageProjectUrl>
<RepositoryUrl>https://git.babaev-an.ru/babaev-an/anbsoftware_componentspack</RepositoryUrl>
<AssemblyVersion>2022.1224.1</AssemblyVersion>
<FileVersion>2022.1224.1</FileVersion>
<AssemblyVersion>2023.102.0</AssemblyVersion>
<FileVersion>2023.102.0</FileVersion>
<PackageId>ANBSoftware.ComponentsPack</PackageId>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AnalysisLevel>6.0</AnalysisLevel>
@ -44,6 +44,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
</ItemGroup>
</Project>

1
anbsoftware.componentspack.sln.DotSettings
View File

@ -5,6 +5,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0421_043E_0437_0434_0430_0451_043C/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0432_0432_0435_0434_0451_043D/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0438_043C_0451_043D/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0441_0447_0451_0442/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0441_0447_0451_0442_0447_0438_043A/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0445_044D_0448_0430/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0445_044D_0448_0435_043C/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>