选框大小可调

src/WeChatOcrCpp/ocr_aliyun.js

@@ -1,3 +1,5 @@
+const { json } = require('stream/consumers');
+
 (async () => {
 
     // New-NetFirewallRule -DisplayName "Allow Port 7788" -Direction Inbound -Protocol TCP -LocalPort 7788 -Action Allow
@@ -10,11 +12,17 @@
 
 
     async function ocr(imgData) {
-        // const api = 'https://gjbsb.market.alicloudapi.com/ocrservice/advanced';
+
+        let fs = require('fs')
+        
+        let config = fs.readFileSync("../WpfEditor/config.json", {encoding: "utf-8"})
+        config = JSON.parse(config)
+
+        const api = config.aliOCR.api // 'https://gjbsb.market.alicloudapi.com/ocrservice/advanced';
         //const api = 'http://127.0.0.1:7788/wechatocr';
-        const api = 'http://127.0.0.1:8889/ppocr';
-        const appCode = ``;
-        const appSecret = ``;
+        //const api = 'http://127.0.0.1:8889/ppocr';
+        const appCode = config.aliOCR.appCode;
+        const appSecret = config.aliOCR.appSecret;
 
         let request = require('request')
 
@@ -80,17 +88,17 @@
 
 
     let fs = require('fs')
-    let md5 = require('md5')
+    // let md5 = require('md5')
 
     let bytes = fs.readFileSync("0170.jpg")
     let buf = Buffer.from(bytes)
-    let m5 = md5(buf)
+    // let m5 = md5(buf)
     let b64 = buf.toString('base64')
 
 
     for (let i = 0; i < 5000; i++) {
         console.log(`Send ${i}`)
-        ocr(b64);
+        await ocr(b64);
         await sleep(300);
     }
 

src/WpfEditor/MainWindow.xaml

@@ -224,7 +224,9 @@
                                 </ItemsControl.ItemContainerStyle>
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                        <Grid>
+                                        <Grid Width="{Binding Width}" Height="{Binding Height}" 
+                                              MouseEnter="RectangleGrid_MouseEnter" 
+                                              MouseLeave="RectangleGrid_MouseLeave">
                                             <!-- 矩形框 -->
                                             <Rectangle Width="{Binding Width}"
                                              Height="{Binding Height}"
@@ -246,6 +248,167 @@
                                                  FontSize="12"
                                                  FontWeight="Bold"/>
                                             </Border>
+
+                                            <!-- 调整大小的控制点 -->
+                                            <!-- 右下角调整点 -->
+                                            <Thumb x:Name="ResizeThumb"
+                                                   Width="8"
+                                                   Height="8"
+                                                   Background="Lime"
+                                                   BorderBrush="DarkGreen"
+                                                   BorderThickness="1"
+                                                   HorizontalAlignment="Right"
+                                                   VerticalAlignment="Bottom"
+                                                   Margin="0,0,-4,-4"
+                                                   Cursor="SizeNWSE"
+                                                   DragDelta="ResizeThumb_DragDelta">
+                                                <Thumb.Visibility>
+                                                    <MultiBinding Converter="{x:Static local:VisibilityAndHoverConverter.Instance}">
+                                                        <Binding Path="IsVisible"/>
+                                                        <Binding Path="IsHovered"/>
+                                                    </MultiBinding>
+                                                </Thumb.Visibility>
+                                            </Thumb>
+
+                                            <!-- 右边中间调整点 -->
+                                            <Thumb x:Name="ResizeRightThumb"
+                                                   Width="8"
+                                                   Height="8"
+                                                   Background="Lime"
+                                                   BorderBrush="DarkGreen"
+                                                   BorderThickness="1"
+                                                   HorizontalAlignment="Right"
+                                                   VerticalAlignment="Center"
+                                                   Margin="0,0,-4,0"
+                                                   Cursor="SizeWE"
+                                                   DragDelta="ResizeRightThumb_DragDelta">
+                                                <Thumb.Visibility>
+                                                    <MultiBinding Converter="{x:Static local:VisibilityAndHoverConverter.Instance}">
+                                                        <Binding Path="IsVisible"/>
+                                                        <Binding Path="IsHovered"/>
+                                                    </MultiBinding>
+                                                </Thumb.Visibility>
+                                            </Thumb>
+
+                                            <!-- 下边中间调整点 -->
+                                            <Thumb x:Name="ResizeBottomThumb"
+                                                   Width="8"
+                                                   Height="8"
+                                                   Background="Lime"
+                                                   BorderBrush="DarkGreen"
+                                                   BorderThickness="1"
+                                                   HorizontalAlignment="Center"
+                                                   VerticalAlignment="Bottom"
+                                                   Margin="0,0,0,-4"
+                                                   Cursor="SizeNS"
+                                                   DragDelta="ResizeBottomThumb_DragDelta">
+                                                <Thumb.Visibility>
+                                                    <MultiBinding Converter="{x:Static local:VisibilityAndHoverConverter.Instance}">
+                                                        <Binding Path="IsVisible"/>
+                                                        <Binding Path="IsHovered"/>
+                                                    </MultiBinding>
+                                                </Thumb.Visibility>
+                                            </Thumb>
+
+                                            <!-- 左边中间调整点 -->
+                                            <Thumb x:Name="ResizeLeftThumb"
+                                                   Width="8"
+                                                   Height="8"
+                                                   Background="Lime"
+                                                   BorderBrush="DarkGreen"
+                                                   BorderThickness="1"
+                                                   HorizontalAlignment="Left"
+                                                   VerticalAlignment="Center"
+                                                   Margin="-4,0,0,0"
+                                                   Cursor="SizeWE"
+                                                   DragDelta="ResizeLeftThumb_DragDelta">
+                                                <Thumb.Visibility>
+                                                    <MultiBinding Converter="{x:Static local:VisibilityAndHoverConverter.Instance}">
+                                                        <Binding Path="IsVisible"/>
+                                                        <Binding Path="IsHovered"/>
+                                                    </MultiBinding>
+                                                </Thumb.Visibility>
+                                            </Thumb>
+
+                                            <!-- 上边中间调整点 -->
+                                            <Thumb x:Name="ResizeTopThumb"
+                                                   Width="8"
+                                                   Height="8"
+                                                   Background="Lime"
+                                                   BorderBrush="DarkGreen"
+                                                   BorderThickness="1"
+                                                   HorizontalAlignment="Center"
+                                                   VerticalAlignment="Top"
+                                                   Margin="0,-4,0,0"
+                                                   Cursor="SizeNS"
+                                                   DragDelta="ResizeTopThumb_DragDelta">
+                                                <Thumb.Visibility>
+                                                    <MultiBinding Converter="{x:Static local:VisibilityAndHoverConverter.Instance}">
+                                                        <Binding Path="IsVisible"/>
+                                                        <Binding Path="IsHovered"/>
+                                                    </MultiBinding>
+                                                </Thumb.Visibility>
+                                            </Thumb>
+
+                                            <!-- 左上角调整点 -->
+                                            <Thumb x:Name="ResizeTopLeftThumb"
+                                                   Width="8"
+                                                   Height="8"
+                                                   Background="Lime"
+                                                   BorderBrush="DarkGreen"
+                                                   BorderThickness="1"
+                                                   HorizontalAlignment="Left"
+                                                   VerticalAlignment="Top"
+                                                   Margin="-4,-4,0,0"
+                                                   Cursor="SizeNWSE"
+                                                   DragDelta="ResizeTopLeftThumb_DragDelta">
+                                                <Thumb.Visibility>
+                                                    <MultiBinding Converter="{x:Static local:VisibilityAndHoverConverter.Instance}">
+                                                        <Binding Path="IsVisible"/>
+                                                        <Binding Path="IsHovered"/>
+                                                    </MultiBinding>
+                                                </Thumb.Visibility>
+                                            </Thumb>
+
+                                            <!-- 右上角调整点 -->
+                                            <Thumb x:Name="ResizeTopRightThumb"
+                                                   Width="8"
+                                                   Height="8"
+                                                   Background="Lime"
+                                                   BorderBrush="DarkGreen"
+                                                   BorderThickness="1"
+                                                   HorizontalAlignment="Right"
+                                                   VerticalAlignment="Top"
+                                                   Margin="0,-4,-4,0"
+                                                   Cursor="SizeNESW"
+                                                   DragDelta="ResizeTopRightThumb_DragDelta">
+                                                <Thumb.Visibility>
+                                                    <MultiBinding Converter="{x:Static local:VisibilityAndHoverConverter.Instance}">
+                                                        <Binding Path="IsVisible"/>
+                                                        <Binding Path="IsHovered"/>
+                                                    </MultiBinding>
+                                                </Thumb.Visibility>
+                                            </Thumb>
+
+                                            <!-- 左下角调整点 -->
+                                            <Thumb x:Name="ResizeBottomLeftThumb"
+                                                   Width="8"
+                                                   Height="8"
+                                                   Background="Lime"
+                                                   BorderBrush="DarkGreen"
+                                                   BorderThickness="1"
+                                                   HorizontalAlignment="Left"
+                                                   VerticalAlignment="Bottom"
+                                                   Margin="-4,0,0,-4"
+                                                   Cursor="SizeNESW"
+                                                   DragDelta="ResizeBottomLeftThumb_DragDelta">
+                                                <Thumb.Visibility>
+                                                    <MultiBinding Converter="{x:Static local:VisibilityAndHoverConverter.Instance}">
+                                                        <Binding Path="IsVisible"/>
+                                                        <Binding Path="IsHovered"/>
+                                                    </MultiBinding>
+                                                </Thumb.Visibility>
+                                            </Thumb>
                                         </Grid>
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>

src/WpfEditor/MainWindow.xaml.cs

@@ -1,4 +1,4 @@
-using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Win32;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -1860,7 +1860,191 @@ namespace WpfEditor
             _previousImageWidth = newWidth;
             _previousImageHeight = newHeight;
         }
-    }
+
+        // 右下角调整大小事件处理
+        private void ResizeThumb_DragDelta(object sender, DragDeltaEventArgs e)
+        {
+            var thumb = sender as Thumb;
+            if (thumb?.DataContext is RectangleItem rectangle)
+            {
+                // 调整宽度和高度
+                double newWidth = Math.Max(10, rectangle.Width + e.HorizontalChange);
+                double newHeight = Math.Max(10, rectangle.Height + e.VerticalChange);
+                
+                rectangle.Width = newWidth;
+                rectangle.Height = newHeight;
+                
+                // 标记文本已更改
+                _textChanged = true;
+            }
+        }
+
+        // 右边中间调整大小事件处理
+        private void ResizeRightThumb_DragDelta(object sender, DragDeltaEventArgs e)
+        {
+            var thumb = sender as Thumb;
+            if (thumb?.DataContext is RectangleItem rectangle)
+            {
+                // 只调整宽度
+                double newWidth = Math.Max(10, rectangle.Width + e.HorizontalChange);
+                rectangle.Width = newWidth;
+                
+                // 标记文本已更改
+                _textChanged = true;
+            }
+        }
+
+        // 下边中间调整大小事件处理
+         private void ResizeBottomThumb_DragDelta(object sender, DragDeltaEventArgs e)
+         {
+             var thumb = sender as Thumb;
+             if (thumb?.DataContext is RectangleItem rectangle)
+             {
+                 // 只调整高度
+                 double newHeight = Math.Max(10, rectangle.Height + e.VerticalChange);
+                 rectangle.Height = newHeight;
+                 
+                 // 标记文本已更改
+                 _textChanged = true;
+             }
+         }
+
+         // 左边中间调整大小事件处理
+         private void ResizeLeftThumb_DragDelta(object sender, DragDeltaEventArgs e)
+         {
+             var thumb = sender as Thumb;
+             if (thumb?.DataContext is RectangleItem rectangle)
+             {
+                 // 调整左边位置和宽度
+                 double newLeft = rectangle.Left + e.HorizontalChange;
+                 double newWidth = rectangle.Width - e.HorizontalChange;
+                 
+                 // 确保最小宽度
+                 if (newWidth >= 10)
+                 {
+                     rectangle.Left = newLeft;
+                     rectangle.Width = newWidth;
+                 }
+                 
+                 // 标记文本已更改
+                 _textChanged = true;
+             }
+         }
+
+         // 上边中间调整大小事件处理
+         private void ResizeTopThumb_DragDelta(object sender, DragDeltaEventArgs e)
+         {
+             var thumb = sender as Thumb;
+             if (thumb?.DataContext is RectangleItem rectangle)
+             {
+                 // 调整上边位置和高度
+                 double newTop = rectangle.Top + e.VerticalChange;
+                 double newHeight = rectangle.Height - e.VerticalChange;
+                 
+                 // 确保最小高度
+                 if (newHeight >= 10)
+                 {
+                     rectangle.Top = newTop;
+                     rectangle.Height = newHeight;
+                 }
+                 
+                 // 标记文本已更改
+                 _textChanged = true;
+             }
+         }
+
+         // 左上角调整大小事件处理
+         private void ResizeTopLeftThumb_DragDelta(object sender, DragDeltaEventArgs e)
+         {
+             var thumb = sender as Thumb;
+             if (thumb?.DataContext is RectangleItem rectangle)
+             {
+                 // 调整左上角位置和尺寸
+                 double newLeft = rectangle.Left + e.HorizontalChange;
+                 double newTop = rectangle.Top + e.VerticalChange;
+                 double newWidth = rectangle.Width - e.HorizontalChange;
+                 double newHeight = rectangle.Height - e.VerticalChange;
+                 
+                 // 确保最小尺寸
+                 if (newWidth >= 10 && newHeight >= 10)
+                 {
+                     rectangle.Left = newLeft;
+                     rectangle.Top = newTop;
+                     rectangle.Width = newWidth;
+                     rectangle.Height = newHeight;
+                 }
+                 
+                 // 标记文本已更改
+                 _textChanged = true;
+             }
+         }
+
+         // 右上角调整大小事件处理
+         private void ResizeTopRightThumb_DragDelta(object sender, DragDeltaEventArgs e)
+         {
+             var thumb = sender as Thumb;
+             if (thumb?.DataContext is RectangleItem rectangle)
+             {
+                 // 调整右上角位置和尺寸
+                 double newTop = rectangle.Top + e.VerticalChange;
+                 double newWidth = rectangle.Width + e.HorizontalChange;
+                 double newHeight = rectangle.Height - e.VerticalChange;
+                 
+                 // 确保最小尺寸
+                 if (newWidth >= 10 && newHeight >= 10)
+                 {
+                     rectangle.Top = newTop;
+                     rectangle.Width = newWidth;
+                     rectangle.Height = newHeight;
+                 }
+                 
+                 // 标记文本已更改
+                 _textChanged = true;
+             }
+         }
+
+         // 左下角调整大小事件处理
+         private void ResizeBottomLeftThumb_DragDelta(object sender, DragDeltaEventArgs e)
+         {
+             var thumb = sender as Thumb;
+             if (thumb?.DataContext is RectangleItem rectangle)
+             {
+                 // 调整左下角位置和尺寸
+                 double newLeft = rectangle.Left + e.HorizontalChange;
+                 double newWidth = rectangle.Width - e.HorizontalChange;
+                 double newHeight = rectangle.Height + e.VerticalChange;
+                 
+                 // 确保最小尺寸
+                 if (newWidth >= 10 && newHeight >= 10)
+                 {
+                     rectangle.Left = newLeft;
+                     rectangle.Width = newWidth;
+                     rectangle.Height = newHeight;
+                 }
+                 
+                 // 标记文本已更改
+                 _textChanged = true;
+             }
+         }
+
+        // 鼠标进入矩形区域事件处理器
+        private void RectangleGrid_MouseEnter(object sender, MouseEventArgs e)
+        {
+            if (sender is Grid grid && grid.DataContext is RectangleItem rectangle)
+            {
+                rectangle.IsHovered = true;
+            }
+        }
+
+        // 鼠标离开矩形区域事件处理器
+        private void RectangleGrid_MouseLeave(object sender, MouseEventArgs e)
+        {
+            if (sender is Grid grid && grid.DataContext is RectangleItem rectangle)
+            {
+                rectangle.IsHovered = false;
+            }
+        }
+     }
 
 
     // 添加布尔值到可见性转换器
@@ -1879,6 +2063,26 @@ namespace WpfEditor
         }
     }
 
+    // 多值转换器：同时检查IsVisible和IsHovered属性
+    public class VisibilityAndHoverConverter : IMultiValueConverter
+    {
+        public static readonly VisibilityAndHoverConverter Instance = new VisibilityAndHoverConverter();
+
+        public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            if (values.Length >= 2 && values[0] is bool isVisible && values[1] is bool isHovered)
+            {
+                return (isVisible && isHovered) ? Visibility.Visible : Visibility.Collapsed;
+            }
+            return Visibility.Collapsed;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
 }
 
 

src/WpfEditor/ViewModel.cs

@@ -26,6 +26,9 @@ namespace WpfEditor
         [ObservableProperty]
         private bool isVisible = true;
 
+        [ObservableProperty]
+        private bool isHovered = false;
+
         public RectangleItem(int id, double left, double top, double width, double height)
         {
             Id = id;