fix 点图片名出拆解文本

src/WpfEditor/MainWindow.xaml.cs

@@ -1002,6 +1002,13 @@ namespace WpfEditor
                     }
 
                 }
+                else if (this._mode == EditorMode.MenuSplit)
+                {
+                    if (m5 != "")
+                    {
+                        await split_menu_openImage(m5);
+                    }
+                }
             }
         }
 
@@ -2765,109 +2772,89 @@ namespace WpfEditor
             On_Rectangle_adjust(rectangle);
         }
 
-        // 树形目录选择变化事件
-        private async void DirectoryTreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        private async Task split_menu_openImage(string ImageMD5)
         {
-            if (e.NewValue is DirectoryTreeNode selectedNode)
+            if (ImageMD5 != "")
             {
-                string ImageMD5 = "";
-
-                foreach (TextCharacter c in selectedNode.line.Characters)
-                {
-                    if (c.ImageMD5 != "")
-                    {
-                        ImageMD5 = c.ImageMD5;
-                        break;
-                    }
-                }
 
-                if (ImageMD5 != "")
-                {
+                //_pthimg
 
-                    //_pthimg
+                // 要先找出真实图片名
 
-                    // 要先找出真实图片名
+                if (!_dic_m5_imgname.ContainsKey(ImageMD5))
+                {
+                    throw new Exception("Error: somthing wrong.");
+                }
 
-                    if (!_dic_m5_imgname.ContainsKey(ImageMD5))
-                    {
-                        throw new Exception("Error: somthing wrong.");
-                    }
+                string image_pth = _dic_m5_imgname[ImageMD5];
 
-                    string image_pth =  _dic_m5_imgname[ImageMD5];
+                this._currentFilePath = image_pth;
 
-                    this._currentFilePath = image_pth;
+                var (jsn, m5, pth_img, pth_json) = await Global.img_md5_jsn(image_pth, _ocrMode);
 
-                    //string pth_ = this._currentFilePath;
+                if (Path.Exists(pth_json))
+                {
+                    Editor._lines.Clear();
 
-                    //string dir = Path.GetDirectoryName(image_pth);
+                    Editor._lines = Global.loadJsonReviseEdit_FromOriginalPath(pth_json);
 
-                    //string pth_json = Path.Combine([dir, "json", $"{ImageMD5}.json"]);
-                    //string pth_img = Path.Combine([dir, "img", $"{ImageMD5}.txt"]);
+                    Editor._undoBuffer.Clear();
+                    Editor._undoIndex = -1;
+                    Editor._cursorLine = 0;
+                    Editor._cursorColumn = 0;
+                    Editor.ClearSelection();
+                    Editor._textChanged = true;
+                    Editor.InvalidateVisual();
 
-                    //if (!Path.Exists(pth_json) || !Path.Exists(pth_img))
-                    //{
-                    //    throw new Exception($"{ImageMD5} json or img not found.");
-                    //}
+                    // 触发文本改变事件
+                    Editor.OnTextChanged();
 
+                    UpdateTitle();
+                    StatusText.Text = $"已打开: {_currentFilePath}";
+                }
 
-                    //var jsonstr = File.ReadAllText(pth_json, new System.Text.UTF8Encoding(false));
+                // 加载原图
+                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();
 
-                    //JObject jsn = null;
-                    //try
-                    //{
-                    //    jsn = JObject.Parse(jsonstr);
-                    //}
-                    //catch (Exception ex)
-                    //{
-                    //    MessageBox.Show("json 解析失败", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                    //}
 
-                    //pth_json = Path.GetFullPath(pth_json);
+                // 重置图片尺寸记录
+                _previousImageWidth = 0;
+                _previousImageHeight = 0;
 
-                    var (jsn, m5, pth_img, pth_json) = await Global.img_md5_jsn(image_pth, _ocrMode);
 
-                    if (Path.Exists(pth_json))
-                    {
-                        Editor._lines.Clear();
+                Editor._pthimg = image_pth;
+                Editor._jsn_OpenImg = jsn;
+                Editor._md5_OpenImg = ImageMD5;
 
-                        Editor._lines = Global.loadJsonReviseEdit_FromOriginalPath(pth_json);
+            }
 
-                        Editor._undoBuffer.Clear();
-                        Editor._undoIndex = -1;
-                        Editor._cursorLine = 0;
-                        Editor._cursorColumn = 0;
-                        Editor.ClearSelection();
-                        Editor._textChanged = true;
-                        Editor.InvalidateVisual();
+        }
 
-                        // 触发文本改变事件
-                        Editor.OnTextChanged();
+        // 树形目录选择变化事件
+        private async void DirectoryTreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            if (e.NewValue is DirectoryTreeNode selectedNode)
+            {
+                string ImageMD5 = "";
 
-                        UpdateTitle();
-                        StatusText.Text = $"已打开: {_currentFilePath}";
+                foreach (TextCharacter c in selectedNode.line.Characters)
+                {
+                    if (c.ImageMD5 != "")
+                    {
+                        ImageMD5 = c.ImageMD5;
+                        break;
                     }
-
-                    // 加载原图
-                    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;
-
                 }
 
-
+                if (ImageMD5 != "")
+                {
+                    await split_menu_openImage(ImageMD5);
+                }
             }
         }
      }