fix bug

src/WpfEditor/MainWindow.xaml.cs

@@ -416,11 +416,15 @@ namespace WpfEditor
 
                     var (jsn, m5, pth_img, pth_json) = Global.img_md5_jsn(openFileDialog.FileName);
 
+                    Editor._pthimg = openFileDialog.FileName;
+                    Editor._jsn_OpenImg = jsn;
+                    Editor._md5_OpenImg = m5;
+
                     if (this._mode == EditorMode.ImageOCR)
                     {
                         try
                         {
-                            Editor._pthimg = openFileDialog.FileName;
+                            
                             Editor.SetText(jsn, m5);
 
                             _currentFilePath = openFileDialog.FileName;
@@ -435,8 +439,6 @@ namespace WpfEditor
                     } else if (this._mode == EditorMode.ReviseEdit)
                     {
                         // 整理校对模式要手动框选才出字
-                        Editor._jsn_OpenImg = jsn;
-                        Editor._md5_OpenImg = m5;
 
                         string b64_str = File.ReadAllText(pth_img, Encoding.UTF8);
                         byte[] img_bytes = Base64.Base64Decode(b64_str);

src/WpfEditor/TextEditorControl.cs

@@ -593,31 +593,6 @@ namespace WpfEditor
             }
         }
 
-        //protected override void OnMouseDown(MouseButtonEventArgs e)
-        //{
-        //    base.OnMouseDown(e);
-        //    Focus();
-        //    Point position = e.GetPosition(this);
-        //    SetCursorPositionFromPoint(position);
-        //    if (Keyboard.Modifiers != ModifierKeys.Shift)
-        //    {
-        //        //ClearSelection();
-        //    }
-        //    else
-        //    {
-        //        UpdateSelection();
-        //    }
-            
-        //    // 图片中框选光标后面的第一个字符
-        //    if (e.ChangedButton == MouseButton.Left && e.ButtonState == MouseButtonState.Pressed)
-        //    {
-        //        showCurrChar();
-        //    }
-            
-        //    e.Handled = true;
-        //    InvalidateVisual();
-        //}
-
         protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
         {
             base.OnMouseLeftButtonDown(e);
@@ -895,17 +870,33 @@ namespace WpfEditor
                 {
                     Rune rune = Rune.GetRuneAt(text, i);
 
-                    var chr = new TextCharacter(
-                        rune,
-                        c.guid,
-                        c.x,
-                        c.y,
-                        c.w,
-                        c.h,
-                        c.ImageMD5
-                    );
-                    characters.Add(chr);
-
+                    if (c != null)
+                    {
+                        var chr = new TextCharacter(
+                            rune,
+                            c.guid,
+                            c.x,
+                            c.y,
+                            c.w,
+                            c.h,
+                            c.ImageMD5
+                        );
+                        characters.Add(chr);
+
+                    }
+                    else 
+                    {
+                        var chr = new TextCharacter(
+                            rune,
+                            Guid.NewGuid().ToString(),
+                            - 1,
+                            -1,
+                            -1,
+                            -1,
+                            ""
+                        );
+                        characters.Add(chr);
+                    }
                     i += rune.Utf16SequenceLength;
                 }