chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Add Yandex Vision OCR client

Browse Source
This commit is contained in:
Serghei Cebotari 2024-11-08 09:23:36 +03:00
parent c3da89678e
commit cd9c2734f0
8 changed files with 65 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
View File

@ -1,4 +1,5 @@
using System.Net;
using VisionClient.Services;
namespace RhSolutions.AddIn;
@ -40,6 +41,8 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
Services.AddTransient<SleevesCalculator>()
.AddTransient<IFittingsCalculator, SleevesCalculator>(s => s.GetService<SleevesCalculator>());
Services.AddTransient<IYandexVisionClient, YandexVisionClient>();
Services.AddSingleton<ToolFactory>();
ServiceProvider = Services.BuildServiceProvider();

3
RhSolutions.AddIn/RhSolutions.AddIn.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<LangVersion>10</LangVersion>
@ -30,6 +30,7 @@
<ItemGroup>
<ProjectReference Include="..\RhSolutions.ProductSku\RhSolutions.ProductSku.csproj" />
<ProjectReference Include="..\SnippingTool\SnippingTool.csproj" />
<ProjectReference Include="..\VisionClient\VisionClient.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="Images\Coupling.png">

7
RhSolutions.AddIn/Tools/OcrTool.cs
View File

@ -1,14 +1,17 @@
using System.Threading.Tasks;
using SnippingTool;
using VisionClient.Services;
namespace RhSolutions.Tools;
internal class OcrTool : Tool
{
public Application Application { get; set; }
public OcrTool(ReaderFactory readerFactory, WriterFactory writerFactory, Application application) : base(readerFactory, writerFactory)
private IYandexVisionClient client;
public OcrTool(ReaderFactory readerFactory, WriterFactory writerFactory, Application application, IYandexVisionClient visionClient) : base(readerFactory, writerFactory)
{
Application = application;
client = visionClient;
}
public override void Execute()
@ -20,6 +23,8 @@ internal class OcrTool : Tool
}).Wait();
string shot = Snipper.SnipBase64();
var result = client.ProcessImage(shot);
Application.Visible = true;
}
}

7
RhSolutions.AddIn/Tools/ToolFactory.cs
View File

@ -1,4 +1,6 @@
namespace RhSolutions.Tools;
using VisionClient.Services;
namespace RhSolutions.Tools;
internal class ToolFactory
{
@ -6,6 +8,7 @@ internal class ToolFactory
static WriterFactory writerFactory = RhSolutionsAddIn.ServiceProvider.GetService<WriterFactory>();
static FittingsCalculatorFactory fittingsCalculatorFactory = RhSolutionsAddIn.ServiceProvider.GetService<FittingsCalculatorFactory>();
static Application application = RhSolutionsAddIn.ServiceProvider.GetService<Application>();
static IYandexVisionClient yandexClinet = RhSolutionsAddIn.ServiceProvider.GetService<IYandexVisionClient>();
public Tool GetTool(string toolName)
{
@ -18,7 +21,7 @@ internal class ToolFactory
"guess" => new GuessTool(readerFactory, writerFactory),
"fillsleeves" => new FittingsTool(readerFactory, writerFactory, fittingsCalculatorFactory, "Sleeves"),
"fillcouplings" => new FittingsTool(readerFactory, writerFactory, fittingsCalculatorFactory, "Couplings"),
"ocr" => new OcrTool(readerFactory, writerFactory, application),
"ocr" => new OcrTool(readerFactory, writerFactory, application, yandexClinet),
_ => throw new Exception($"Неизвестный инструмент {toolName}"),
};
return tool;

6
RhSolutions.sln
View File

@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RhSolutions.ProductSku", "R
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnippingTool", "SnippingTool\SnippingTool.csproj", "{DDB517C7-DF61-4C26-B691-956D0E5906C3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisionClient", "VisionClient\VisionClient.csproj", "{53F322B3-F477-4831-8E16-EA76934A0D59}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -33,6 +35,10 @@ Global
{DDB517C7-DF61-4C26-B691-956D0E5906C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDB517C7-DF61-4C26-B691-956D0E5906C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDB517C7-DF61-4C26-B691-956D0E5906C3}.Release|Any CPU.Build.0 = Release|Any CPU
{53F322B3-F477-4831-8E16-EA76934A0D59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53F322B3-F477-4831-8E16-EA76934A0D59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53F322B3-F477-4831-8E16-EA76934A0D59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53F322B3-F477-4831-8E16-EA76934A0D59}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

5
VisionClient/Models/VisionResponse.cs Normal file
View File

@ -0,0 +1,5 @@
namespace VisionClient.Models;
public class VisionResponse
{
}

24
VisionClient/Services/IYandexVisionClient.cs Normal file
View File

@ -0,0 +1,24 @@
using VisionClient.Models;
using System.Net.Http;
namespace VisionClient.Services;
public interface IYandexVisionClient
{
public Task<VisionResponse> ProcessImage(string base64Image);
}
public class YandexVisionClient : IYandexVisionClient
{
private readonly HttpClient _httpClient;
public YandexVisionClient(HttpClient httpClient)
{
_httpClient = httpClient;
}
public Task<VisionResponse> ProcessImage(string base64Image)
{
throw new NotImplementedException();
}
}

14
VisionClient/VisionClient.csproj Normal file
View File

@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<LangVersion>10</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
</Project>