xiongwei/detect
1
0
Fork 0
mirror of http://git.xinwangdao.com/cnnc-embedded-parts-detect/detect.git synced 2025-06-23 21:14:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
njdaoyehu 2025-03-05 11:41:37 +08:00
parent 32de473068
commit 833534013b
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/.idea.detect/.idea/avalonia.xml generated
View File

@ -7,7 +7,10 @@
<entry key="detect.gui/Assets/Button.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Assets/DefaultResources.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Assets/NotificationCard.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Assets/PathIcon.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Assets/RadioButton.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Assets/TextBlock.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Assets/TextBox.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Controls/Arrow.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Controls/PageControl.axaml" value="detect.gui/detect.gui.csproj" />
<entry key="detect.gui/Controls/ProgressBox.axaml" value="detect.gui/detect.gui.csproj" />

36
detect.gui/Services/OCRService.cs
View File

@ -106,6 +106,36 @@ public class OCRService
{
try
{
var w = "0";
var h = "0";
var type = ReplaceChars(resultList[item.Index + 1].Text);
if (string.IsNullOrWhiteSpace(type)) continue;
if (type.Contains('P', StringComparison.CurrentCultureIgnoreCase) && type.Contains('L', StringComparison.CurrentCultureIgnoreCase))
{
type = type.Replace("P", string.Empty);
type = type.Replace("L", string.Empty);
if (type.Contains('-', StringComparison.CurrentCultureIgnoreCase))
{
type = type.Split("-")[0];
if (type.Contains('x', StringComparison.CurrentCultureIgnoreCase))
{
w = type.Split("x")[1];
h = type.Split("x")[0];
}
else
{
w = type;
h = type;
}
}
else
continue;
}
else
{
w = type.Split("x")[1];
h = type.Split("x")[0];
}
data.Add(new
{
code = ReplaceChars(resultList[item.Index].Text),
@ -113,8 +143,10 @@ public class OCRService
x = ReplaceChars(resultList[item.Index + 2].Text),
y = ReplaceChars(resultList[item.Index + 3].Text),
center = ReplaceChars(resultList[item.Index + 4].Text),
w = ReplaceChars(resultList[item.Index + 1].Text).Split("x")[1],
h = ReplaceChars(resultList[item.Index + 1].Text).Split("x")[0],
w = w,
h = h,
// w = ReplaceChars(resultList[item.Index + 1].Text).Split("x")[1],
// h = ReplaceChars(resultList[item.Index + 1].Text).Split("x")[0],
angle = ReplaceChars(resultList[item.Index + 5].Text),
});
}

1
detect.sln.DotSettings.user
View File

@ -41,6 +41,7 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003FNick_0020Wang_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F508692f6bb174a3eafd584fab2e8a72216e8a0_003F40_003F54bbca37_003FThrowHelper_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003FNick_0020Wang_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F2c8e7ca976f350cba9836d5565dac56b11e0b56656fa786460eb1395857a6fa_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003FNick_0020Wang_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fc477631345eaf8cfe1df375f64e71199f9c6662c7b8181db1bdfaa010e8eec4_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWebApplication_002Ecs_002Fl_003AC_0021_003FUsers_003FNick_0020Wang_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2c7f26baccec4c7b84a75f1eaacc531a1b8a0_003Fb5_003Fa4858c1c_003FWebApplication_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWindowNotificationManager_002Ecs_002Fl_003AC_0021_003FUsers_003FNick_0020Wang_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F99c50fdf786f8602b74ad1c24959792812e8e852274bf578e255ae78f9efca6_003FWindowNotificationManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWindow_002Ecs_002Fl_003AC_0021_003FUsers_003FNick_0020Wang_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fb430e084ab33d5b318f28876dedabb8aa879f7f7b6e60df3a5da1dd196ecda2_003FWindow_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWindow_002Ecs_002Fl_003AC_0021_003FUsers_003Fxiongwei_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fb430e084ab33d5b318f28876dedabb8aa879f7f7b6e60df3a5da1dd196ecda2_003FWindow_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>