显示大图

src/WeChatOcrCpp/WeChatOcrCpp.vcxproj

@@ -46,7 +46,7 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>

src/WeChatOcrCpp/main.cpp

@@ -115,7 +115,7 @@ void StartHttpServer(int port) {
             res.status = 500;
             res.set_content("{\"error\":\"服务器内部错误: " + std::string(e.what()) + "\"}", "application/json");
         }
-        });
+    });
 
     // 添加一个简单的GET接口，用于测试服务器是否正常运行
     svr.Get("/", [](const httplib::Request&, httplib::Response& res) {

src/WpfEditor/TextEditorControl.cs

@@ -48,10 +48,13 @@ namespace WpfEditor
             );
         }
 
-        public void ShowDraggableImageControl(Mat image)
-        {
+        public void ShowDraggableImageControl(Mat image, Mat image_orig)
+        {
+            var mainWindow = Window.GetWindow(this) as MainWindow;
+
             // 将Mat转换为BitmapSource
             BitmapSource bitmapSource = MatToBitmapSource(image); // OpenCvSharp.Extensions.BitmapSourceConverter.ToBitmapSource(image);
+            BitmapSource bitmapSource2 = MatToBitmapSource(image_orig);
 
             // 如果窗口已存在，则更新图片内容
             if (_imageWindow != null)  //  && _imageWindow.IsLoaded
@@ -67,6 +70,8 @@ namespace WpfEditor
                     
                     // 根据新图片调整窗口大小
                     AdjustWindowSizeBasedOnImage(_imageWindow, bitmapSource.PixelWidth, bitmapSource.PixelHeight);
+
+                    mainWindow?.ShowImageInPanel(bitmapSource2);
                 }
                 return;
             }
@@ -164,18 +169,27 @@ namespace WpfEditor
             border.ContextMenu = contextMenu;
             
             // 显示窗口
-            _imageWindow.Show();
-            
-            // 根据图片大小调整窗口尺寸
+            _imageWindow.Show();  // 单行文本图
+
+            // 根据图片大小调整窗口尺寸
             AdjustWindowSizeBasedOnImage(_imageWindow, bitmapSource.PixelWidth, bitmapSource.PixelHeight);
             
             // 设置初始位置（居中显示）
-            var mainWindow = Window.GetWindow(this);
             if (mainWindow != null)
             {
                 _imageWindow.Left = 0; // mainWindow.Left + (mainWindow.Width - _imageWindow.ActualWidth) / 2;
                 _imageWindow.Top = mainWindow.Top + (mainWindow.Height - _imageWindow.ActualHeight) / 2;
             }
+
+            if (mainWindow != null)
+            {
+                if (true || mainWindow.ImageViewer.Source == null)
+                {
+                    mainWindow.ShowImageInPanel(bitmapSource2);  // 全图
+                }
+            }
+
+
         }
         
         // 根据图片大小调整窗口尺寸的辅助方法
@@ -528,7 +542,7 @@ namespace WpfEditor
                                             Mat cut = im_orig.Clone(new OpenCvSharp.Rect(0, line_y, im_orig.Width, line_height));
 
                                             // 显示图片预览窗口
-                                            ShowDraggableImageControl(cut);
+                                            ShowDraggableImageControl(cut, im_orig);
 
                                             found = true;
                                             break;