校对模式恢复选框

src/WpfEditor/MainWindow.xaml.cs

@@ -86,7 +86,10 @@ namespace WpfEditor
         private Canvas _selectionCanvas;
         // 添加存储多个矩形选框的集合
         private List<Rectangle> _selectionRectangles = new List<Rectangle>();
-        
+
+        // 在类中添加一个字段来存储待处理的矩形数据
+        private List<JObject> _pendingRectangles = new List<JObject>();  // 等图片显示后才能正确进行坐标转换
+
         // 添加调整大小相关变量
         private bool _isResizing = false;
         private Rectangle _resizingRectangle = null;
@@ -768,6 +771,7 @@ namespace WpfEditor
                 if (result == MessageBoxResult.Cancel)
                     return;
                 if (result == MessageBoxResult.Yes)
+                    _textChanged = false;
                     SaveFile();
             }
 
@@ -886,10 +890,24 @@ namespace WpfEditor
                     //    File.WriteAllText(pth_json, jsn_str);
                     //}
 
-                    OnOpenImage_Click(openFileDialog.FileName);
+                    //OnOpenImage_Click(openFileDialog.FileName);
 
                     var (jsn, m5, pth_img, pth_json) = Global.img_md5_jsn(openFileDialog.FileName);
 
+                    // 加载原图
+                    string b64_str = File.ReadAllText(pth_img, Encoding.UTF8);
+                    byte[] img_bytes = Base64.Base64Decode(b64_str);
+                    Mat im_orig = Cv2.ImDecode(img_bytes, ImreadModes.Color);
+                    BitmapSource source = TextEditorControl.MatToBitmapSource(im_orig);
+                    ViewModel.Image = source;
+                    ViewModel.ClearAllRectangles();
+
+
+                    // 重置图片尺寸记录
+                    _previousImageWidth = 0;
+                    _previousImageHeight = 0;
+
+
                     Editor._pthimg = openFileDialog.FileName;
                     Editor._jsn_OpenImg = jsn;
                     Editor._md5_OpenImg = m5;
@@ -915,14 +933,77 @@ namespace WpfEditor
                     {
                         // 整理校对模式要手动框选才出字
 
-                        string b64_str = File.ReadAllText(pth_img, Encoding.UTF8);
-                        byte[] img_bytes = Base64.Base64Decode(b64_str);
+                        try
+                        {
+                            //string b64_str = File.ReadAllText(pth_img, Encoding.UTF8);
+                            //byte[] img_bytes = Base64.Base64Decode(b64_str);
+
+                            //Mat im_orig = Cv2.ImDecode(img_bytes, ImreadModes.Color);
+
+                            //BitmapSource source = TextEditorControl.MatToBitmapSource(im_orig);
+
+                            //this.ShowImageInPanel(source);
+
+
+                            //Editor.SetText(jsn, m5);
+
+
+                            Editor._lines.Clear();
+
+                            Editor._lines = Global.loadJsonReviseEdit_FromOriginalPath(pth_json);
+
+                            // 恢复框选
+                            ViewModel.ClearAllRectangles();
+                            //ViewModel.AddRectangle(int Id, double left, double top, double width, double height)
+
+                            foreach (var item in Editor._lines)
+                            {
+                                if ( item.Characters.Count == 0 )
+                                {
+                                    continue;
+                                }
+
+                                JObject selected_rectange = item.selected_rectange;
+                                if (selected_rectange == null || !selected_rectange.HasValues)
+                                {
+                                    continue;
+                                }
+                                int Id = selected_rectange["Id"].Value<int>();
+                                int lft = selected_rectange["lft"].Value<int>();
+                                int tp = selected_rectange["tp"].Value<int>();
+                                int wdth = selected_rectange["wdth"].Value<int>();
+                                int hght = selected_rectange["hght"].Value<int>();
 
-                        Mat im_orig = Cv2.ImDecode(img_bytes, ImreadModes.Color);
+                                _pendingRectangles.Add(selected_rectange);  // 等图片显示后再处理 see Image_SizeChanged
 
-                        BitmapSource source = TextEditorControl.MatToBitmapSource(im_orig);
 
-                        this.ShowImageInPanel(source);
+                                //var displayPos = Editor.ConvertOriginalToDisplayCoordinates(lft, tp);
+                                //var displaySize = Editor.ConvertOriginalToDisplaySize(wdth, hght);
+
+                                //ViewModel.AddRectangle(Id, displayPos.X, displayPos.Y, displaySize.Width, displaySize.Height);
+
+                            }
+
+
+                            Editor._undoBuffer.Clear();
+                            Editor._undoIndex = -1;
+                            Editor._cursorLine = 0;
+                            Editor._cursorColumn = 0;
+                            Editor.ClearSelection();
+                            Editor._textChanged = true;
+                            Editor.InvalidateVisual();
+
+                            // 触发文本改变事件
+                            Editor.OnTextChanged();
+
+                            UpdateTitle();
+                            StatusText.Text = $"已打开: {_currentFilePath}";
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show($"打开文件时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
+
                     }
                 }
             }
@@ -1564,14 +1645,35 @@ namespace WpfEditor
             }
         }
 
-        // 将Image_SizeChanged方法移动到这里（MainWindow类内部）
         private void Image_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            if (ViewModel.Image == null || ViewModel.Rectangles.Count == 0) return;
+            if (ViewModel.Image == null) return;  // ViewModel.Rectangles.Count == 0
 
             var newWidth = e.NewSize.Width;
             var newHeight = e.NewSize.Height;
 
+            // 校对模式打开图片需要恢复选框
+            if (_pendingRectangles.Count > 0 && newWidth > 0 && newHeight > 0)
+            {
+                foreach(var selected_rectange in _pendingRectangles)
+                {
+                    int Id = selected_rectange["Id"].Value<int>();
+                    int lft = selected_rectange["lft"].Value<int>();
+                    int tp = selected_rectange["tp"].Value<int>();
+                    int wdth = selected_rectange["wdth"].Value<int>();
+                    int hght = selected_rectange["hght"].Value<int>();
+
+
+                    var displayPos = Editor.ConvertOriginalToDisplayCoordinates(lft, tp);
+                    var displaySize = Editor.ConvertOriginalToDisplaySize(wdth, hght);
+
+                    ViewModel.AddRectangle(Id, displayPos.X, displayPos.Y, displaySize.Width, displaySize.Height);
+                }
+
+                _pendingRectangles.Clear();
+                return;
+            }
+
             // 如果是首次设置尺寸，记录初始值
             if (_previousImageWidth == 0 || _previousImageHeight == 0)
             {

src/WpfEditor/TextEditorControl.cs

@@ -391,14 +391,14 @@ namespace WpfEditor
         public List<TextLine> _lines = new List<TextLine>();
         public int _cursorLine = 0;
         public int _cursorColumn = 0;
-        private int _selectionStartLine = -1;
-        private int _selectionStartColumn = -1;
-        private int _selectionEndLine = -1;
-        private int _selectionEndColumn = -1;
-        private List<UndoAction> _undoBuffer = new List<UndoAction>();
-        private int _undoIndex = -1;
-        private bool _textChanged = false;
-        private int _scrollOffset = 0; // 添加滚动偏移量变量
+        public int _selectionStartLine = -1;
+        public int _selectionStartColumn = -1;
+        public int _selectionEndLine = -1;
+        public int _selectionEndColumn = -1;
+        public List<UndoAction> _undoBuffer = new List<UndoAction>();
+        public int _undoIndex = -1;
+        public bool _textChanged = false;
+        public int _scrollOffset = 0; // 添加滚动偏移量变量
 
         #endregion
 
@@ -2064,7 +2064,7 @@ namespace WpfEditor
             return false;
         }
 
-        private void ClearSelection()
+        public void ClearSelection()
         {
             // 清除选择
             _selectionStartLine = -1;

src/WpfEditor/ViewModel.cs

@@ -101,6 +101,14 @@ namespace WpfEditor
             return RectangleCounter;
         }
 
+        public int AddRectangle(int Id, double left, double top, double width, double height)
+        {
+            var newRectangle = new RectangleItem(Id, left, top, width, height);
+            Rectangles.Add(newRectangle);
+            RectangleCounter = Rectangles.Count;
+            return RectangleCounter;
+        }
+
         // 清除单个临时矩形（绘制过程中使用）
         public void ClearRectangle()
         {

src/WpfEditor/global.cs

@@ -371,7 +371,9 @@ namespace WpfEditor
             {
                 if (!File.Exists(pth_json_reviseEdit))
                 {
-                    throw new FileNotFoundException($"JSON 文件不存在: {pth_json_reviseEdit}");
+                    //throw new FileNotFoundException($"JSON 文件不存在: {pth_json_reviseEdit}");
+
+                    return new List<TextLine>();
                 }
 
                 string jsonString = File.ReadAllText(pth_json_reviseEdit, Encoding.UTF8);
@@ -407,14 +409,24 @@ namespace WpfEditor
             }
         }
 
-        // 重载方法：根据原始 JSON 路径自动构建 reviseEdit JSON 路径
-        public static List<TextLine> loadJsonReviseEdit_FromOriginalPath(string pth_json)
+        public static string get_json2_path(string pth_json)
         {
             var dir = Path.GetDirectoryName(Path.GetDirectoryName(pth_json));
             var name_json = Path.GetFileName(pth_json);
             var dir_new = Path.Combine(dir, "json2");
             var pth_json_reviseEdit = Path.Combine(dir_new, name_json);
-            
+            return pth_json_reviseEdit;
+        }
+
+        // 重载方法：根据原始 JSON 路径自动构建 reviseEdit JSON 路径
+        public static List<TextLine> loadJsonReviseEdit_FromOriginalPath(string pth_json)
+        {
+            //var dir = Path.GetDirectoryName(Path.GetDirectoryName(pth_json));
+            //var name_json = Path.GetFileName(pth_json);
+            //var dir_new = Path.Combine(dir, "json2");
+            //var pth_json_reviseEdit = Path.Combine(dir_new, name_json);
+            var pth_json_reviseEdit =  get_json2_path(pth_json);
+
             return loadJsonReviseEdit(pth_json_reviseEdit);
         }
 

src/WpfEditor/readme.txt

@@ -64,3 +64,30 @@ WpfEditor\TextEditorControl.cs
 public bool saveJson(string pth_img_)
 
 
+校对模式恢复选框
+src\WpfEditor\MainWindow.xaml.cs
+    private void Image_SizeChanged(object sender, SizeChangedEventArgs e)
+        // 校对模式打开图片需要恢复选框
+            if (_pendingRectangles.Count > 0 && newWidth > 0 && newHeight > 0)
+            {
+                foreach(var selected_rectange in _pendingRectangles)
+                {
+                    int Id = selected_rectange["Id"].Value<int>();
+                    int lft = selected_rectange["lft"].Value<int>();
+                    int tp = selected_rectange["tp"].Value<int>();
+                    int wdth = selected_rectange["wdth"].Value<int>();
+                    int hght = selected_rectange["hght"].Value<int>();
+
+
+                    var displayPos = Editor.ConvertOriginalToDisplayCoordinates(lft, tp);
+                    var displaySize = Editor.ConvertOriginalToDisplaySize(wdth, hght);
+
+                    ViewModel.AddRectangle(Id, displayPos.X, displayPos.Y, displaySize.Width, displaySize.Height);
+                }
+
+                _pendingRectangles.Clear();
+                return;
+            }
+
+
+