find_rectange_text ok

fix_char_rectangle.py

@@ -13,9 +13,9 @@
 """
 
 # huggingface\imradv3\src\WeChatOcrCpp\WeChatOcrResult.cpp
+    # std::string OcrResult::ToJson(std::string& pth_img) const {
     # cpp 加工原始 wechatocr 结果，处理多字框（现在是让它们有相同坐标）。todo: 改成一个字一个框
 
-
 is_debug = False
 
 dic_cache = {}
@@ -1258,7 +1258,11 @@ if __name__ == '__main__':
     import base64 
 
     with open('data/0022.jpg', "rb") as f:
-        img = f.read()
+        img_bytes = f.read()
+
+    img_buffer_numpy = np.frombuffer(img_bytes, dtype=np.uint8)
+    
+    img = cv2.imdecode(img_buffer_numpy, 1)
 
     base64_bytes = base64.b64encode(img)
     base64_str = base64_bytes.decode('ascii')
@@ -1270,6 +1274,11 @@ if __name__ == '__main__':
     else:
         raise Exception('something wrong.')
 
+
+    # 连续相同的 x, y, w, h 的单字符坐标，给它修正为准确的单字坐标
+
+
+
     dir = '/yingedu/project/ocr_server_test/data/'
     m5 = 'b0cd8663d03d596eab297a8250bf116c'
 

src/WeChatOcrCpp/WeChatOcrCpp.vcxproj

@@ -46,7 +46,7 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>

src/WeChatOcrCpp/main.cpp

@@ -146,18 +146,18 @@ int main()
     std::cout << "OCR服务器已启动，按Enter键退出..." << std::endl;
     std::cin.get();
 
-    std::string result = rec("E:/huggingface/imradv3/data/0022.jpg");
-    json jsn;
-    std::string jsn_str;
-    
-    try {
-		 jsn = json::parse(result);
-		 jsn_str = jsn.dump(4);
-    }
-	catch (const std::exception& e) {
-		std::cerr << "OCR识别异常: " << e.what() << std::endl;
-		return 1;
-	}
+ //   std::string result = rec("E:/huggingface/imradv3/data/0022.jpg");
+ //   json jsn;
+ //   std::string jsn_str;
+ //   
+ //   try {
+	//	 jsn = json::parse(result);
+	//	 jsn_str = jsn.dump(4);
+ //   }
+	//catch (const std::exception& e) {
+	//	std::cerr << "OCR识别异常: " << e.what() << std::endl;
+	//	return 1;
+	//}
 
     return 0;
 }

src/WpfEditor/MainWindow.xaml.cs

@@ -629,9 +629,9 @@ namespace WpfEditor
                     // 找出框选的文字
                     JObject jsn = (JObject)Editor._jsn_OpenImg.DeepClone();
 
-                    jsn = Global.find_rectange_text(jsn, (int)(actualLeft+0.5), (int)(actualTop+0.5), (int)(actualWidth+0.5), (int)(actualHeight));
+                    jsn = Global.find_rectange_text(jsn, (int)(actualLeft+0.5), (int)(actualTop+0.5), (int)(actualWidth+0.5), (int)(actualHeight+0.5));
 
-                    //SetText(JObject jsn, string md5)
+                    Editor.SetText(jsn, Editor._md5_OpenImg);
 
 
                 }

src/WpfEditor/global.cs

@@ -35,7 +35,6 @@ namespace WpfEditor
             return (ImagePath: pth_img, JsonPath: pth_json);
         }
 
-
         // 阿里 ocr的 JSON 需要添加 guid
         public static JObject set_guid_md5(JObject jsn, string md5)
         {
@@ -95,15 +94,16 @@ namespace WpfEditor
             int width = jsn.Value<int>("width");
             int height = jsn.Value<int>("height");
 
+            JObject jsn_new = new JObject();
             JArray prism_wordsInfo_new = new JArray();
+            jsn_new["width"] = width;
+            jsn_new["height"] = height;
+            jsn_new["prism_wordsInfo"] = prism_wordsInfo_new;
+
 
             var prism_wordsInfo = jsn["prism_wordsInfo"].Value<JArray>();
             foreach (var item in prism_wordsInfo)
             {
-                JArray charInfo_new = new JArray();
-                string line_word_new = "";
-                JArray pos_new = new JArray();
-
                 JArray charInfo = item["charInfo"].Value<JArray>();
                 string line_word = item["word"].Value<string>();
                 //int angle = item["angle"].Value<int>();
@@ -124,6 +124,17 @@ namespace WpfEditor
                     continue;
                 }
 
+                // 实际上要生成选区内的新 jsn 
+                // 下面要生成很多新行，行内的很多符等
+                JObject line_new = new JObject();
+                string line_word_new = "";
+                JArray pos_new = new JArray();
+                JArray charInfo_new = new JArray();
+                line_new["word"] = "";
+                line_new["pos"] = pos_new;
+                line_new["charInfo"] = charInfo_new;
+                prism_wordsInfo_new.Add(line_new);
+
                 // 再看列文字左右是否在选区内
                 foreach (var item2 in charInfo)
                 {
@@ -140,7 +151,6 @@ namespace WpfEditor
 
                         // 这个字在选区内
                         charInfo_new.Add(item2.DeepClone());
-
                     }
                 }
 
@@ -148,42 +158,58 @@ namespace WpfEditor
 
                 if (charInfo_new.Count > 0)
                 {
+                    line_new["word"] = line_word_new;
+
                     var first = charInfo_new[0];
                     var last = charInfo_new[charInfo_new.Count - 1];
 
+                    int min_left =  first["x"].Value<int>();  // Math.Min 
+                    int max_right = last["x"].Value<int>() + last["w"].Value<int>(); // Math.Max
+
+                    int min_top = Math.Min(first["y"].Value<int>(), last["y"].Value<int>());
+                    int max_top = Math.Max(first["y"].Value<int>() + first["h"].Value<int>(), last["y"].Value<int>() + last["h"].Value<int>());
+
                     JObject lu_pos = new JObject
                     {
-                        ["x"] = first["x"],
-                        ["y"] = first["y"]
+                        ["x"] = min_left,
+                        ["y"] = min_top
                     };
                     JObject ru_pos = new JObject
                     {
-                        ["x"] = (int)last["x"] + (int)last["w"],
-                        ["y"] = last["y"]
+                        ["x"] = max_right,
+                        ["y"] = min_top
                     };
-
-
-                    JObject item_new = new JObject
+                    JObject rd_pos = new JObject
+                    {
+                        ["x"] = max_right,
+                        ["y"] = max_top
+                    };
+                    JObject ld_pos = new JObject
                     {
-                        ["charInfo"] = charInfo_new
+                        ["x"] = min_left,
+                        ["y"] = max_top
                     };
 
-                    prism_wordsInfo_new.Add(item_new);
+                    pos_new.Add(lu_pos);
+                    pos_new.Add(ru_pos);
+                    pos_new.Add(rd_pos);
+                    pos_new.Add(ld_pos);
+                    
                 }
             }
 
             if (prism_wordsInfo_new.Count > 0)
             {
-                jsn["prism_wordsInfo"] = prism_wordsInfo_new;
+                //jsn["prism_wordsInfo"] = prism_wordsInfo_new;
             }
             else
             {
                 // 如果没有文字在选区内
-                jsn = null;
+                jsn_new = null;
 
             }
 
-            return jsn;
+            return jsn_new;
         }
     }
 }