fasdfsa commited on
Commit
9b2f915
·
1 Parent(s): 51e54a7

整理校对打开文件时仅显示大图

Browse files
src/WpfEditor/MainWindow.xaml CHANGED
@@ -17,12 +17,12 @@
17
  <!-- 菜单栏 -->
18
  <Menu Grid.Row="0">
19
  <MenuItem Header="文件">
20
- <MenuItem Header="新建" Click="NewFile_Click"/>
21
- <MenuItem Header="打开" Click="OpenFile_Click"/>
22
- <MenuItem Header="保存" Click="SaveFile_Click"/>
23
- <MenuItem Header="另存为" Click="SaveAsFile_Click"/>
24
  <Separator/>
25
- <MenuItem Header="退出" Click="Exit_Click"/>
26
  </MenuItem>
27
  <MenuItem Header="编辑">
28
  <MenuItem Header="撤销" Command="ApplicationCommands.Undo"/>
 
17
  <!-- 菜单栏 -->
18
  <Menu Grid.Row="0">
19
  <MenuItem Header="文件">
20
+ <MenuItem Header="新建" Click="OnNewFile_Click"/>
21
+ <MenuItem Header="打开" Click="OnOpenFile_Click"/>
22
+ <MenuItem Header="保存" Click="OnSaveFile_Click"/>
23
+ <MenuItem Header="另存为" Click="OnSaveAsFile_Click"/>
24
  <Separator/>
25
+ <MenuItem Header="退出" Click="OnExit_Click"/>
26
  </MenuItem>
27
  <MenuItem Header="编辑">
28
  <MenuItem Header="撤销" Command="ApplicationCommands.Undo"/>
src/WpfEditor/MainWindow.xaml.cs CHANGED
@@ -1,13 +1,18 @@
1
  using Microsoft.Win32;
2
  using Newtonsoft.Json;
3
  using Newtonsoft.Json.Linq;
 
4
  using System.IO;
5
  using System.Security.Cryptography;
 
6
  using System.Windows;
7
  using System.Windows.Controls;
8
  using System.Windows.Input;
9
  using System.Windows.Media;
10
  using System.Windows.Media.Imaging;
 
 
 
11
 
12
  namespace WpfEditor
13
  {
@@ -34,6 +39,8 @@ namespace WpfEditor
34
  ImageViewer.PreviewMouseWheel += ImageViewer_PreviewMouseWheel;
35
 
36
  this._mode = mode;
 
 
37
  if (this._mode == EditorMode.ImageOCR)
38
  {
39
  this.Title = "图片识别";
@@ -101,7 +108,7 @@ namespace WpfEditor
101
  Title = $"{fileName}{(_textChanged ? "*" : "")} - WPF Text Editor";
102
  }
103
 
104
- private void NewFile_Click(object sender, RoutedEventArgs e)
105
  {
106
  if (_textChanged)
107
  {
@@ -120,7 +127,7 @@ namespace WpfEditor
120
  }
121
 
122
 
123
- private void OpenFile_Click(object sender, RoutedEventArgs e)
124
  {
125
  if (_textChanged)
126
  {
@@ -208,44 +215,52 @@ namespace WpfEditor
208
  File.WriteAllText(pth_json, jsn_str);
209
  }
210
 
211
- try
212
  {
213
- Editor.SetText(jsn, m5);
214
- _currentFilePath = openFileDialog.FileName;
215
- _textChanged = false;
216
- UpdateTitle();
217
- StatusText.Text = $"已打开: {_currentFilePath}";
218
- }
219
- catch (Exception ex)
 
 
 
 
 
 
220
  {
221
- MessageBox.Show($"打开文件时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
222
- }
223
-
224
- int status = jsn.Value<int>("status");
225
 
 
 
226
 
227
- var a = 1;
228
- }
229
-
230
-
231
 
 
232
 
 
 
 
233
  }
234
  }
235
 
236
 
237
 
238
- private void SaveFile_Click(object sender, RoutedEventArgs e)
239
  {
240
  SaveFile();
241
  }
242
 
243
- private void SaveAsFile_Click(object sender, RoutedEventArgs e)
244
  {
245
  SaveFileAs();
246
  }
247
 
248
- private void Exit_Click(object sender, RoutedEventArgs e)
249
  {
250
  Close();
251
  }
 
1
  using Microsoft.Win32;
2
  using Newtonsoft.Json;
3
  using Newtonsoft.Json.Linq;
4
+ using OpenCvSharp;
5
  using System.IO;
6
  using System.Security.Cryptography;
7
+ using System.Text;
8
  using System.Windows;
9
  using System.Windows.Controls;
10
  using System.Windows.Input;
11
  using System.Windows.Media;
12
  using System.Windows.Media.Imaging;
13
+ using static System.Net.Mime.MediaTypeNames;
14
+
15
+ using Window = System.Windows.Window;
16
 
17
  namespace WpfEditor
18
  {
 
39
  ImageViewer.PreviewMouseWheel += ImageViewer_PreviewMouseWheel;
40
 
41
  this._mode = mode;
42
+ Editor._mode = mode;
43
+
44
  if (this._mode == EditorMode.ImageOCR)
45
  {
46
  this.Title = "图片识别";
 
108
  Title = $"{fileName}{(_textChanged ? "*" : "")} - WPF Text Editor";
109
  }
110
 
111
+ private void OnNewFile_Click(object sender, RoutedEventArgs e)
112
  {
113
  if (_textChanged)
114
  {
 
127
  }
128
 
129
 
130
+ private void OnOpenFile_Click(object sender, RoutedEventArgs e)
131
  {
132
  if (_textChanged)
133
  {
 
215
  File.WriteAllText(pth_json, jsn_str);
216
  }
217
 
218
+ if (this._mode == EditorMode.ImageOCR)
219
  {
220
+ try
221
+ {
222
+ Editor.SetText(jsn, m5);
223
+ _currentFilePath = openFileDialog.FileName;
224
+ _textChanged = false;
225
+ UpdateTitle();
226
+ StatusText.Text = $"已打开: {_currentFilePath}";
227
+ }
228
+ catch (Exception ex)
229
+ {
230
+ MessageBox.Show($"打开文件时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
231
+ }
232
+ } else if (this._mode == EditorMode.ReviseEdit)
233
  {
234
+ // 整理校对模式要手动框选才出字
235
+ Editor._jsn_OpenImg = jsn;
236
+ Editor._md5_OpenImg = m5;
 
237
 
238
+ string b64_str = File.ReadAllText(pth_img, Encoding.UTF8);
239
+ byte[] img_bytes = Base64.Base64Decode(b64_str);
240
 
241
+ Mat im_orig = Cv2.ImDecode(img_bytes, ImreadModes.Color);
 
 
 
242
 
243
+ BitmapSource source = TextEditorControl.MatToBitmapSource(im_orig);
244
 
245
+ this.ShowImageInPanel(source);
246
+ }
247
+ }
248
  }
249
  }
250
 
251
 
252
 
253
+ private void OnSaveFile_Click(object sender, RoutedEventArgs e)
254
  {
255
  SaveFile();
256
  }
257
 
258
+ private void OnSaveAsFile_Click(object sender, RoutedEventArgs e)
259
  {
260
  SaveFileAs();
261
  }
262
 
263
+ private void OnExit_Click(object sender, RoutedEventArgs e)
264
  {
265
  Close();
266
  }
src/WpfEditor/TextEditorControl.cs CHANGED
@@ -30,6 +30,10 @@ namespace WpfEditor
30
  {
31
  private Window _imageWindow = null;
32
  private bool _isCut = false;
 
 
 
 
33
 
34
  public static BitmapSource MatToBitmapSource(Mat mat)
35
  {
 
30
  {
31
  private Window _imageWindow = null;
32
  private bool _isCut = false;
33
+ public EditorMode _mode = EditorMode.ImageOCR; // 默认模式为图片OCR
34
+
35
+ public JObject _jsn_OpenImg; // for 校对
36
+ public string _md5_OpenImg;
37
 
38
  public static BitmapSource MatToBitmapSource(Mat mat)
39
  {