加逻辑删除 not done yet.

src/WpfEditor/TextEditorControl.cs

@@ -34,6 +34,7 @@ namespace WpfEditor
 
         public JObject _jsn_OpenImg;  // for 校对
         public string _md5_OpenImg;
+        public Dictionary<string, string> _dic_deleted_char = new Dictionary<string, string>();  // 被删除的字符存它的 guid，保存的时侯标记它逻辑删除
 
         public static BitmapSource MatToBitmapSource(Mat mat)
         {
@@ -1049,6 +1050,7 @@ namespace WpfEditor
                     {
                         string oneChar = item2["word"].Value<string>();
                         string guid = item2["guid"].Value<string>();
+                        int isDeleted = item2["isDeleted"].Value<int>();
                             // 就算是阿里云的 json ，也要先给它加入 guid
                         //if (item2["guid"] != null)
                         //{
@@ -1057,6 +1059,12 @@ namespace WpfEditor
                         //{
                         //    guid = Guid.NewGuid().ToString();
                         //}
+
+                        if (isDeleted == 1)
+                        {
+                            continue;
+                        }
+
                         int x = item2["x"].Value<int>();
                         int y = item2["y"].Value<int>();
                         int w = item2["w"].Value<int>();
@@ -1223,6 +1231,11 @@ namespace WpfEditor
                         i += rune.Utf16SequenceLength;
                     }
 
+                    if ( _dic_deleted_char.ContainsKey(guid) ) {
+                        // 是被标记逻辑删除的字符
+                        item2["isDeleted"] = 1;
+                    }
+
                     foreach (TextLine line in _lines)
                     {
                         bool line_modify = false;
@@ -1603,8 +1616,13 @@ namespace WpfEditor
                         DeleteSelection();
                     }
                     else if (_cursorColumn < _lines[_cursorLine].Characters.Count)
-                    {
-                        // 删除当前字符
+                    {
+                        // 删除当前字符
+                        TextCharacter c = _lines[_cursorLine].Characters[_cursorColumn];
+                        if (c.guid != "")
+                        {
+                            _dic_deleted_char[c.guid] = c.Character.Value.ToString();
+                        }
                         _lines[_cursorLine].Characters.RemoveAt(_cursorColumn);
                         _textChanged = true;
                         OnTextChanged();
@@ -1629,6 +1647,11 @@ namespace WpfEditor
                     {
                         // 删除前一个字符
                         _cursorColumn--;
+                        TextCharacter c = _lines[_cursorLine].Characters[_cursorColumn];
+                        if (c.guid != "")
+                        {
+                            _dic_deleted_char[c.guid] = c.Character.Value.ToString();
+                        }
                         _lines[_cursorLine].Characters.RemoveAt(_cursorColumn);
                         _textChanged = true;
                         OnTextChanged();

src/WpfEditor/WeChatOcr.cs

@@ -1,178 +1,179 @@
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-
-using Formatting = Newtonsoft.Json.Formatting;
-
-namespace WpfEditor
-{
-    /// <summary>
-    /// 提供与WeChatOcrCpp.dll交互的功能
-    /// </summary>
-    public static class WeChatOcr
-    {
-        // DLL句柄
-        private static IntPtr _wechatOcrDllHandle = IntPtr.Zero;
-
-        // 定义函数委托类型，对应C++中的FunctionPtr
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        private delegate IntPtr RecFunctionDelegate(string pthImg);
-
-        // 函数指针
-        private static RecFunctionDelegate _recFunction;
-
-        /// <summary>
-        /// 加载WeChatOcrCpp.dll并获取函数指针
-        /// </summary>
-        /// <returns>是否成功加载</returns>
-        public static bool LoadWeChatOcrDll()
-        {
-            try
-            {
-                // 加载DLL，相当于C++中的LoadLibrary
-                _wechatOcrDllHandle = NativeMethods.LoadLibrary(Constant.WeChatOcrDllPath);
-
-                if (_wechatOcrDllHandle == IntPtr.Zero)
-                {
-                    Console.WriteLine($"无法加载DLL: {Constant.WeChatOcrDllPath}");
-                    return false;
-                }
-
-                // 获取函数地址，相当于C++中的GetProcAddress
-                IntPtr recFuncPtr = NativeMethods.GetProcAddress(_wechatOcrDllHandle, "rec");
-
-                if (recFuncPtr == IntPtr.Zero)
-                {
-                    Console.WriteLine("无法找到函数'rec'");
-                    NativeMethods.FreeLibrary(_wechatOcrDllHandle);
-                    _wechatOcrDllHandle = IntPtr.Zero;
-                    return false;
-                }
-
-                // 将函数指针转换为委托
-                _recFunction = Marshal.GetDelegateForFunctionPointer<RecFunctionDelegate>(recFuncPtr);
-
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"加载DLL时出错: {ex.Message}");
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// 调用WeChatOcrCpp.dll中的rec函数进行OCR识别
-        /// </summary>
-        /// <param name="imagePath">图片路径</param>
-        /// <returns>OCR识别结果</returns>
-        public static string RecognizeImage(string imagePath)
-        {
-            if (_wechatOcrDllHandle == IntPtr.Zero || _recFunction == null)
-            {
-                if (!LoadWeChatOcrDll())
-                {
-                    return "DLL未加载或函数未找到";
-                }
-            }
-
-            try
-            {
-                // 调用函数
-                IntPtr resultPtr = _recFunction(imagePath);
-
-                if (resultPtr == IntPtr.Zero)
-                {
-                    return string.Empty;
-                }
-                
-                // 将C字符串转换为C#字符串
-                string result = Marshal.PtrToStringAnsi(resultPtr);
-
-                // 给每个字符加上 guid
-                JObject jsn = null;
-                try
-                {
-                    jsn = JObject.Parse(result);
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("json 解析失败", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return "";
-                }
-
-                int width = jsn.Value<int>("width");
-                int height = jsn.Value<int>("height");
-
-                var prism_wordsInfo = jsn["prism_wordsInfo"].Value<JArray>();
-                foreach (var item in prism_wordsInfo)
-                {
-                    JArray charInfo = item["charInfo"].Value<JArray>();
-                    string line_word = item["word"].Value<string>();
-
-                    var textLine = new TextLine();
-                    foreach (var item2 in charInfo)
-                    {
-                        item2["guid"] = Guid.NewGuid().ToString();
-
-                        string oneChar = item2["word"].Value<string>();
-                        int x = item2["x"].Value<int>();
-                        int y = item2["y"].Value<int>();
-                        int w = item2["w"].Value<int>();
-                        int h = item2["h"].Value<int>();
-
-                        //// 遍历 oneChar 中的每个字符
-                        //for (int i = 0; i < oneChar.Length;)
-                        //{
-                        //    Rune rune = Rune.GetRuneAt(oneChar, i);  // 4 个字节表示单个字符
-
-                        //    // 移动到下一个 Rune 的位置
-                        //    i += rune.Utf16SequenceLength;
-                        //}
-
-                    }
-                }
-
-                return jsn.ToString(Formatting.Indented);
-            }
-            catch (Exception ex)
-            {
-                return $"调用OCR函数时出错: {ex.Message}";
-            }
-        }
-
-        /// <summary>
-        /// 释放DLL资源
-        /// </summary>
-        public static void FreeDll()
-        {
-            if (_wechatOcrDllHandle != IntPtr.Zero)
-            {
-                NativeMethods.FreeLibrary(_wechatOcrDllHandle);
-                _wechatOcrDllHandle = IntPtr.Zero;
-                _recFunction = null;
-            }
-        }
-    }
-
-    /// <summary>
-    /// 提供Windows API的P/Invoke定义
-    /// </summary>
-    internal static class NativeMethods
-    {
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        public static extern IntPtr LoadLibrary(string lpFileName);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern bool FreeLibrary(IntPtr hModule);
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Ansi, SetLastError = true)]
-        public static extern IntPtr GetProcAddress(IntPtr hModule, string lpProcName);
-    }
-}
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+using Formatting = Newtonsoft.Json.Formatting;
+
+namespace WpfEditor
+{
+    /// <summary>
+    /// 提供与WeChatOcrCpp.dll交互的功能
+    /// </summary>
+    public static class WeChatOcr
+    {
+        // DLL句柄
+        private static IntPtr _wechatOcrDllHandle = IntPtr.Zero;
+
+        // 定义函数委托类型，对应C++中的FunctionPtr
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        private delegate IntPtr RecFunctionDelegate(string pthImg);
+
+        // 函数指针
+        private static RecFunctionDelegate _recFunction;
+
+        /// <summary>
+        /// 加载WeChatOcrCpp.dll并获取函数指针
+        /// </summary>
+        /// <returns>是否成功加载</returns>
+        public static bool LoadWeChatOcrDll()
+        {
+            try
+            {
+                // 加载DLL，相当于C++中的LoadLibrary
+                _wechatOcrDllHandle = NativeMethods.LoadLibrary(Constant.WeChatOcrDllPath);
+
+                if (_wechatOcrDllHandle == IntPtr.Zero)
+                {
+                    Console.WriteLine($"无法加载DLL: {Constant.WeChatOcrDllPath}");
+                    return false;
+                }
+
+                // 获取函数地址，相当于C++中的GetProcAddress
+                IntPtr recFuncPtr = NativeMethods.GetProcAddress(_wechatOcrDllHandle, "rec");
+
+                if (recFuncPtr == IntPtr.Zero)
+                {
+                    Console.WriteLine("无法找到函数'rec'");
+                    NativeMethods.FreeLibrary(_wechatOcrDllHandle);
+                    _wechatOcrDllHandle = IntPtr.Zero;
+                    return false;
+                }
+
+                // 将函数指针转换为委托
+                _recFunction = Marshal.GetDelegateForFunctionPointer<RecFunctionDelegate>(recFuncPtr);
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"加载DLL时出错: {ex.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 调用WeChatOcrCpp.dll中的rec函数进行OCR识别
+        /// </summary>
+        /// <param name="imagePath">图片路径</param>
+        /// <returns>OCR识别结果</returns>
+        public static string RecognizeImage(string imagePath)
+        {
+            if (_wechatOcrDllHandle == IntPtr.Zero || _recFunction == null)
+            {
+                if (!LoadWeChatOcrDll())
+                {
+                    return "DLL未加载或函数未找到";
+                }
+            }
+
+            try
+            {
+                // 调用函数
+                IntPtr resultPtr = _recFunction(imagePath);
+
+                if (resultPtr == IntPtr.Zero)
+                {
+                    return string.Empty;
+                }
+                
+                // 将C字符串转换为C#字符串
+                string result = Marshal.PtrToStringAnsi(resultPtr);
+
+                // 给每个字符加上 guid
+                JObject jsn = null;
+                try
+                {
+                    jsn = JObject.Parse(result);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("json 解析失败", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                    return "";
+                }
+
+                int width = jsn.Value<int>("width");
+                int height = jsn.Value<int>("height");
+
+                var prism_wordsInfo = jsn["prism_wordsInfo"].Value<JArray>();
+                foreach (var item in prism_wordsInfo)
+                {
+                    JArray charInfo = item["charInfo"].Value<JArray>();
+                    string line_word = item["word"].Value<string>();
+
+                    var textLine = new TextLine();
+                    foreach (var item2 in charInfo)
+                    {
+                        item2["guid"] = Guid.NewGuid().ToString();
+                        item2["isDeleted"] = 0;
+
+                        string oneChar = item2["word"].Value<string>();
+                        int x = item2["x"].Value<int>();
+                        int y = item2["y"].Value<int>();
+                        int w = item2["w"].Value<int>();
+                        int h = item2["h"].Value<int>();
+
+                        //// 遍历 oneChar 中的每个字符
+                        //for (int i = 0; i < oneChar.Length;)
+                        //{
+                        //    Rune rune = Rune.GetRuneAt(oneChar, i);  // 4 个字节表示单个字符
+
+                        //    // 移动到下一个 Rune 的位置
+                        //    i += rune.Utf16SequenceLength;
+                        //}
+
+                    }
+                }
+
+                return jsn.ToString(Formatting.Indented);
+            }
+            catch (Exception ex)
+            {
+                return $"调用OCR函数时出错: {ex.Message}";
+            }
+        }
+
+        /// <summary>
+        /// 释放DLL资源
+        /// </summary>
+        public static void FreeDll()
+        {
+            if (_wechatOcrDllHandle != IntPtr.Zero)
+            {
+                NativeMethods.FreeLibrary(_wechatOcrDllHandle);
+                _wechatOcrDllHandle = IntPtr.Zero;
+                _recFunction = null;
+            }
+        }
+    }
+
+    /// <summary>
+    /// 提供Windows API的P/Invoke定义
+    /// </summary>
+    internal static class NativeMethods
+    {
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern IntPtr LoadLibrary(string lpFileName);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern bool FreeLibrary(IntPtr hModule);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Ansi, SetLastError = true)]
+        public static extern IntPtr GetProcAddress(IntPtr hModule, string lpProcName);
+    }
+}

src/WpfEditor/global.cs

@@ -58,6 +58,7 @@ namespace WpfEditor
                 {
                     string oneChar = item2["word"].Value<string>();
                     item2["guid"] = Guid.NewGuid().ToString();
+                    item2["isDeleted"] = 0;
                     item2["ImageMD5"] = md5;
 
                     if (angle == -90)