fix 拆解功换图片点字出图

src/WpfEditor/MainWindow.xaml

@@ -41,8 +41,8 @@
             </MenuItem>
             <MenuItem Header="识别">
                 <MenuItem Header="wechat" IsCheckable="True" IsChecked="True" Click="OnRecognitionMethod_Click" Tag="wechat"/>
-                <MenuItem Header="ppocr" IsCheckable="True" IsChecked="False" Click="OnRecognitionMethod_Click" Tag="ppocr"/>
                 <MenuItem Header="aliocr" IsCheckable="True" IsChecked="False" Click="OnRecognitionMethod_Click" Tag="aliocr"/>
+                <MenuItem Header="ppocr" IsCheckable="True" IsChecked="False" Visibility="Hidden" Click="OnRecognitionMethod_Click" Tag="ppocr"/>
             </MenuItem>
         </Menu>
         

src/WpfEditor/MainWindow.xaml.cs

@@ -161,6 +161,8 @@ namespace WpfEditor
         private double _previousImageWidth = 0;
         private double _previousImageHeight = 0;
 
+        public Dictionary<string, string> _dic_m5_imgname = new Dictionary<string, string>();
+
         public MainWindow(EditorMode mode = EditorMode.ImageOCR)
         {
             InitializeComponent();
@@ -1588,7 +1590,6 @@ namespace WpfEditor
                         }
 
                     } else if (this._mode == EditorMode.MenuSplit) {
-                        // 目录拆解模式只能看不能动
 
                         Editor._lines.Clear();
 
@@ -1606,6 +1607,12 @@ namespace WpfEditor
                         foreach (var pth in jpgs)
                         {
                             var (jsn_, m5_, pth_img_, pth_json_) = await Global.img_md5_jsn(pth, _ocrMode);
+
+                            if (!_dic_m5_imgname.ContainsKey(m5_))
+                            {
+                                _dic_m5_imgname[m5_] = pth;
+                            }
+
                             List<TextLine> lines = Global.loadJsonReviseEdit_FromOriginalPath(pth_json_);
                             if (lines.Count > 0)
                             {
@@ -2754,7 +2761,7 @@ namespace WpfEditor
         }
 
         // 树形目录选择变化事件
-        private void DirectoryTreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        private async void DirectoryTreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
             if (e.NewValue is DirectoryTreeNode selectedNode)
             {
@@ -2772,19 +2779,50 @@ namespace WpfEditor
                 if (ImageMD5 != "")
                 {
 
-                    string pth_ = this._currentFilePath;
+                    //_pthimg
 
-                    string dir = Path.GetDirectoryName(pth_);
+                    // 要先找出真实图片名
 
-                    string pth_json = Path.Combine([dir, "json", $"{ImageMD5}.json"]);
+                    if (!_dic_m5_imgname.ContainsKey(ImageMD5))
+                    {
+                        throw new Exception("Error: somthing wrong.");
+                    }
 
-                    pth_json = Path.GetFullPath(pth_json);
+                    string image_pth =  _dic_m5_imgname[ImageMD5];
 
-                    if (Path.Exists(pth_json))
-                    {
+                    this._currentFilePath = image_pth;
 
-                        //目录拆解模式只能看不能动
+                    //string pth_ = this._currentFilePath;
 
+                    //string dir = Path.GetDirectoryName(image_pth);
+
+                    //string pth_json = Path.Combine([dir, "json", $"{ImageMD5}.json"]);
+                    //string pth_img = Path.Combine([dir, "img", $"{ImageMD5}.txt"]);
+
+                    //if (!Path.Exists(pth_json) || !Path.Exists(pth_img))
+                    //{
+                    //    throw new Exception($"{ImageMD5} json or img not found.");
+                    //}
+
+
+                    //var jsonstr = File.ReadAllText(pth_json, new System.Text.UTF8Encoding(false));
+
+                    //JObject jsn = null;
+                    //try
+                    //{
+                    //    jsn = JObject.Parse(jsonstr);
+                    //}
+                    //catch (Exception ex)
+                    //{
+                    //    MessageBox.Show("json 解析失败", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+                    //}
+
+                    //pth_json = Path.GetFullPath(pth_json);
+
+                    var (jsn, m5, pth_img, pth_json) = await Global.img_md5_jsn(image_pth, _ocrMode);
+
+                    if (Path.Exists(pth_json))
+                    {
                         Editor._lines.Clear();
 
                         Editor._lines = Global.loadJsonReviseEdit_FromOriginalPath(pth_json);
@@ -2803,6 +2841,25 @@ namespace WpfEditor
                         UpdateTitle();
                         StatusText.Text = $"已打开: {_currentFilePath}";
                     }
+
+                    // 加载原图
+                    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 = image_pth;
+                    Editor._jsn_OpenImg = jsn;
+                    Editor._md5_OpenImg = ImageMD5;
+
                 }