Added rect information to JSON.

Author: riddleling

OcrServer.xcodeproj/project.pbxproj

@@ -284,7 +284,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = ocrserver_icon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 26;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = "OCR Server";
@@ -298,7 +298,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = site.riddleling.app.OcrServer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -317,7 +317,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = ocrserver_icon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 26;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = "OCR Server";
@@ -331,7 +331,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = site.riddleling.app.OcrServer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

OcrServer/TextRecognizer.swift

@@ -37,6 +37,12 @@ class TextRecognizer {
         var lines: [String] = []
         var items: [OCRBoxItem] = []
 
+        func toPixel(_ p: NormalizedPoint) -> (Double, Double) {
+            let x = Double(p.x * Double(W))
+            let y = Double((1 - p.y) * Double(H))
+            return (x, y)
+        }
+        
         for obs in observations {
             guard let best = obs.topCandidates(1).first else { continue }
             let text = best.string
@@ -61,7 +67,23 @@ class TextRecognizer {
             let rectW = Double(maxX - minX)
             let rectH = Double(maxY - minY)
 
-            items.append(OCRBoxItem(text: text, x: rectX, y: rectY, w: rectW, h: rectH))
+            // 文字角度
+            var rectItem: OCRRectItem? = nil
+            if let rect = best.boundingBox(for: best.string.startIndex..<best.string.endIndex) {
+                let tl = toPixel(rect.topLeft)
+                let tr = toPixel(rect.topRight)
+                let bl = toPixel(rect.bottomLeft)
+                let br = toPixel(rect.bottomRight)
+
+                rectItem = OCRRectItem(
+                    topLeft_x: tl.0, topLeft_y: tl.1,
+                    topRight_x: tr.0, topRight_y: tr.1,
+                    bottomLeft_x: bl.0, bottomLeft_y: bl.1,
+                    bottomRight_x: br.0, bottomRight_y: br.1
+                )
+            }
+            
+            items.append(OCRBoxItem(text: text, x: rectX, y: rectY, w: rectW, h: rectH, rect: rectItem))
         }
 
         return OCRResult(

OcrServer/VaporServer.swift

@@ -8,12 +8,24 @@
 import Vapor
 import Vision
 
+struct OCRRectItem: Content {
+    let topLeft_x: Double
+    let topLeft_y: Double
+    let topRight_x: Double
+    let topRight_y: Double
+    let bottomLeft_x: Double
+    let bottomLeft_y: Double
+    let bottomRight_x: Double
+    let bottomRight_y: Double
+}
+
 struct OCRBoxItem: Content {
     let text: String
     let x: Double
     let y: Double
     let w: Double
     let h: Double
+    let rect: OCRRectItem?
 }
 
 struct OCRResult: Content {