Alt + S 截图加入O键切换 OCR 语言类型

src/ScreenGrab.Sample/MainWindow.xaml.cs

@@ -34,11 +34,11 @@ public partial class MainWindow
         if (ScreenGrabber.IsCapturing) return;
         // https://github.com/wuqinchao/ScreenCapturer
             // 替代品 
-        ScreenGrabber.OnCaptured = async bitmap => await ScreenshotCallbackAsync(bitmap, null);
+        ScreenGrabber.OnCaptured = async (bitmap, type) => await ScreenshotCallbackAsync(bitmap, type, null);
         ScreenGrabber.Capture(true);
     }
 
-    internal async Task ScreenshotCallbackAsync(Bitmap? bitmap, CancellationToken? token = null)
+    internal async Task ScreenshotCallbackAsync(Bitmap? bitmap, string type, CancellationToken? token = null)
     {
         if (bitmap == null)
         {

src/ScreenGrab/ScreenGrab.csproj

@@ -6,6 +6,7 @@
     <UseWPF>true</UseWPF>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ImplicitUsings>enable</ImplicitUsings>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

src/ScreenGrab/ScreenGrabView.xaml

@@ -75,7 +75,7 @@
                 ChildMargin="3"
                 ChildVerticalAlignment="Center"
                 Columns="*, *"
-                RowCount="2"
+                RowCount="3"
                 RowHeight="30">
                 <Grid.Resources>
                     <Style TargetType="StackPanel">
@@ -98,6 +98,10 @@
                     <local:UcCharacter DisplayChar="F" />
                 </StackPanel>
                 <TextBlock x:Name="FreezeTb" Text="取消冻结窗口" />
+                <StackPanel>
+                    <local:UcCharacter DisplayChar="O" />
+                </StackPanel>
+                <TextBlock x:Name="OCRTYPE" Text="微信识别" />
             </local:AutoGrid>
         </Border>
     </Grid>

src/ScreenGrab/ScreenGrabView.xaml.cs

@@ -12,6 +12,12 @@ using Size = System.Windows.Size;
 
 namespace ScreenGrab;
 
+public enum OcrType
+{
+    WechatOCR,
+    ComicOCR
+}
+
 /// <summary>
 ///     Extracted from the project <see href="https://github.com/TheJoeFin/Text-Grab" />
 /// </summary>
@@ -19,7 +25,7 @@ public partial class ScreenGrabView
 {
     #region Constructors
 
-    public ScreenGrabView(Action<Bitmap>? action, bool isAuxiliary = false)
+    public ScreenGrabView(Action<Bitmap, string>? action, bool isAuxiliary = false)
     {
         InitializeComponent();
         _onImageCaptured = action;
@@ -33,6 +39,10 @@ public partial class ScreenGrabView
     public Action? OnGrabClose { get; set; }
     private DisplayInfo? CurrentScreen { get; set; }
 
+    public OcrType _OcrMode { get; set; } = OcrType.WechatOCR;
+
+
+
     #endregion Properties
 
     #region Fields
@@ -54,7 +64,7 @@ public partial class ScreenGrabView
     private const double SelectBorderThickness = 2;
     private readonly Color _borderColor = Color.FromArgb(255, 146, 202, 244);
 
-    private readonly Action<Bitmap>? _onImageCaptured;
+    private readonly Action<Bitmap, string>? _onImageCaptured;
     private readonly bool _isAuxiliary;
 
     #endregion Fields
@@ -123,6 +133,18 @@ public partial class ScreenGrabView
             case Key.F:
                 FreezeUnfreezeAllScreenGrabs();
                 break;
+            case Key.O:
+                if (_OcrMode == OcrType.WechatOCR)
+                {
+                    _OcrMode = OcrType.ComicOCR;
+                    OCRTYPE.Text = "漫画识别";
+                }
+                else if (_OcrMode == OcrType.ComicOCR)
+                {
+                    _OcrMode = OcrType.WechatOCR;
+                    OCRTYPE.Text = "微信识别";
+                }
+                break;
         }
     }
 
@@ -371,7 +393,7 @@ public partial class ScreenGrabView
         var bitmap = correctedRegion.GetRegionOfScreenAsBitmap();
         CloseAllScreenGrabs();
 
-        _onImageCaptured?.Invoke(bitmap);
+        _onImageCaptured?.Invoke(bitmap, OCRTYPE.Text);
     }
 
     private void PanSelection(Point movingPoint)

src/ScreenGrab/ScreenGrabber.cs

@@ -5,11 +5,19 @@ using ScreenGrab.Extensions;
 
 namespace ScreenGrab;
 
+//public enum OcrType
+//{
+//    WechatOCR,
+//    ComicOCR
+//}
+
 public abstract class ScreenGrabber
 {
     public static bool IsCapturing { get; private set; }
 
-    public static Action<Bitmap>? OnCaptured { get; set; }
+    //public static OcrType _OcrMode { get; set; } = OcrType.WechatOCR;
+
+    public static Action<Bitmap, string>? OnCaptured { get; set; }
 
     public static void Capture(bool isAuxiliary = false)
     {

src/WpfEditor/TreeMenuPage.xaml.cs

@@ -28,14 +28,14 @@ namespace WpfEditor
                 if (ScreenGrabber.IsCapturing) return;
                     // https://github.com/wuqinchao/ScreenCapturer
                         // 替代品
-                ScreenGrabber.OnCaptured = async bitmap => await ScreenshotCallbackAsync(bitmap, null);
+                ScreenGrabber.OnCaptured = async (bitmap, type) => await ScreenshotCallbackAsync(bitmap, type, null);
                 ScreenGrabber.Capture(true);
 
             });
 
         }
 
-        private async Task ScreenshotCallbackAsync(Bitmap? bitmap, CancellationToken? token = null)
+        private async Task ScreenshotCallbackAsync(Bitmap? bitmap, string type, CancellationToken? token = null)
         {
             if (bitmap == null)
             {
@@ -79,7 +79,13 @@ namespace WpfEditor
             //win.Show();
 
             var ReviseEditWindow = new MainWindow(EditorMode.ReviseEdit);
-            ReviseEditWindow._ocrMode = OcrMode.ComicOcr;
+            if (type == "微信识别")
+            {
+                ReviseEditWindow._ocrMode = OcrMode.WeChatOcr;
+            } else if (type == "漫画识别")
+            {
+                ReviseEditWindow._ocrMode = OcrMode.ComicOcr;
+            }
             ReviseEditWindow.WindowState = WindowState.Maximized;
             ReviseEditWindow.Show();
             ReviseEditWindow.handle_comicocr_open_img(tempFile);