校对模式 TextLine 有 pos 和选框记录

src/WpfEditor/MainWindow.xaml.cs

@@ -307,7 +307,7 @@ namespace WpfEditor
                 if (ViewModel.RectangleWidth > 5 && ViewModel.RectangleHeight > 5)
                 {
                     // 添加新的矩形框到集合
-                    ViewModel.AddRectangle(
+                    int Id = ViewModel.AddRectangle(
                         ViewModel.RectangleLeft,
                         ViewModel.RectangleTop,
                         ViewModel.RectangleWidth,
@@ -334,7 +334,7 @@ namespace WpfEditor
 
                     // 找出框选的文字
                     JObject jsn = (JObject)Editor._jsn_OpenImg.DeepClone();
-                    jsn = Global.find_rectange_text(jsn, rect.X, rect.Y, rect.Width, rect.Height);
+                    jsn = Global.find_rectange_text(jsn, rect.X, rect.Y, rect.Width, rect.Height, Id);
                     Editor.InsertText(jsn, Editor._md5_OpenImg);
 
 

src/WpfEditor/TextEditorControl.cs

@@ -1258,11 +1258,20 @@ namespace WpfEditor
 
                 var prism_wordsInfo = jsn["prism_wordsInfo"].Value<JArray>();
                 foreach (var item in prism_wordsInfo)
-                {
+                {
+                    JObject selected_rectange = new JObject(); 
+                    if (_mode == EditorMode.ReviseEdit) // 校对模式才有选框
+                    {
+                        selected_rectange = item["selected_rectange"].Value<JObject>();
+                    }
+
+                    JArray pos = item["pos"].Value<JArray>();
                     JArray charInfo = item["charInfo"].Value<JArray>();
+
+
                     string line_word = item["word"].Value<string>();
 
-                    var textLine = new TextLine();
+                    var textLine = new TextLine(pos, selected_rectange);
                     foreach (var item2 in charInfo)
                     {
                         string oneChar = item2["word"].Value<string>();
@@ -2467,7 +2476,21 @@ namespace WpfEditor
     }
 
     public class TextLine
-    {
+    {
+        public TextLine()
+        {
+
+        }
+
+        public TextLine(JArray po, JObject rectange)
+        {
+            this.pos = po;
+            this.selected_rectange = rectange;
+        }
+
+        public JArray pos { get; set; } = new JArray();
+        public JObject selected_rectange { get; set; } = new JObject();
+
         public List<TextCharacter> Characters { get; set; } = new List<TextCharacter>();
     }
 

src/WpfEditor/ViewModel.cs

@@ -93,11 +93,12 @@ namespace WpfEditor
         }
 
         // 添加新的矩形框
-        public void AddRectangle(double left, double top, double width, double height)
+        public int AddRectangle(double left, double top, double width, double height)
         {
             RectangleCounter++;
             var newRectangle = new RectangleItem(RectangleCounter, left, top, width, height);
             Rectangles.Add(newRectangle);
+            return RectangleCounter;
         }
 
         // 清除单个临时矩形（绘制过程中使用）

src/WpfEditor/global.cs

@@ -107,7 +107,7 @@ namespace WpfEditor
 
 
         // 删掉 jsn 里不在选区的文字
-        public static JObject find_rectange_text(JObject jsn, int lft, int tp, int wdth, int hght ) 
+        public static JObject find_rectange_text(JObject jsn, int lft, int tp, int wdth, int hght, int Id ) // 矩形框 ID，从 1 开始递增
         {
             //_lines.Add(new TextLine());
 
@@ -153,6 +153,10 @@ namespace WpfEditor
                 line_new["word"] = "";
                 line_new["pos"] = pos_new;
                 line_new["charInfo"] = charInfo_new;
+
+                JObject selected_rectange = new JObject { { "Id", Id }, { "lft", lft }, { "tp", tp }, { "wdth", wdth }, { "hght", hght } };  // 框选矩形
+                line_new["selected_rectange"] = selected_rectange;
+
                 prism_wordsInfo_new.Add(line_new);
 
                 // 再看列文字左右是否在选区内

src/WpfEditor/readme.txt

@@ -39,6 +39,13 @@ WpfEditor\MainWindow.xaml.cs
 
 单个字的修改逻辑 先选中一个字符，再打一个字
 WpfEditor\TextEditorControl.cs
+        
+        protected override void OnTextInput(TextCompositionEventArgs e)
+            // 应该是改到这里了
+            //InsertText(e.Text);
+            InsertTextCharacters(e.Text);
+
+
         private void InsertText(string text)
             // 如果有选中的文本，先删除或修改它
             if (HasSelection())
@@ -50,4 +57,10 @@ WpfEditor\TextEditorControl.cs
                         // 此处是修改单个字符的情况
                         var line = _lines[_cursorLine];
                         TextCharacter c = line.Characters[_cursorColumn-1];
-                        c.Character = System.Text.Rune.GetRuneAt(text, 0); // 修改字符
+                        c.Character = System.Text.Rune.GetRuneAt(text, 0); // 修改字符
+
+
+保存
+public bool saveJson(string pth_img_)
+
+