Merge pull request #28 from Azure-Samples/eli-dev/swiftupdates

review updates and bug fixes

Author: olduroja

swift/InkRecognition/Recognizer/Recognizer.xcodeproj/project.pbxproj

@@ -24,7 +24,7 @@
 		CF7B3D9C2250112500CBE1FC /* InkParagraph.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF7B3D8E2250112400CBE1FC /* InkParagraph.swift */; };
 		CF7B3D9D2250112500CBE1FC /* InkListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF7B3D8F2250112400CBE1FC /* InkListItem.swift */; };
 		CF7B3D9E2250112500CBE1FC /* InkRecognitionUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF7B3D902250112400CBE1FC /* InkRecognitionUnit.swift */; };
-		CF7B3DA12250116E00CBE1FC /* InkRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF7B3DA02250116E00CBE1FC /* InkRenderer.swift */; };
+		CF7B3DA12250116E00CBE1FC /* InkRendererView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF7B3DA02250116E00CBE1FC /* InkRendererView.swift */; };
 		CF7B3DA3225011F100CBE1FC /* Line.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF7B3DA2225011F100CBE1FC /* Line.swift */; };
 /* End PBXBuildFile section */
 
@@ -48,7 +48,7 @@
 		CF7B3D8E2250112400CBE1FC /* InkParagraph.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InkParagraph.swift; sourceTree = "<group>"; };
 		CF7B3D8F2250112400CBE1FC /* InkListItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InkListItem.swift; sourceTree = "<group>"; };
 		CF7B3D902250112400CBE1FC /* InkRecognitionUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InkRecognitionUnit.swift; sourceTree = "<group>"; };
-		CF7B3DA02250116E00CBE1FC /* InkRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InkRenderer.swift; sourceTree = "<group>"; };
+		CF7B3DA02250116E00CBE1FC /* InkRendererView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InkRendererView.swift; sourceTree = "<group>"; };
 		CF7B3DA2225011F100CBE1FC /* Line.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Line.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -83,7 +83,7 @@
 			isa = PBXGroup;
 			children = (
 				CF7B3DA2225011F100CBE1FC /* Line.swift */,
-				CF7B3DA02250116E00CBE1FC /* InkRenderer.swift */,
+				CF7B3DA02250116E00CBE1FC /* InkRendererView.swift */,
 				CF7B3D852250112400CBE1FC /* InkRecognizer.swift */,
 				CF7B3D842250112400CBE1FC /* InkBullet.swift */,
 				CF7B3D8C2250112400CBE1FC /* InkDrawing.swift */,
@@ -186,7 +186,7 @@
 				CF7B3D9B2250112500CBE1FC /* InkPoint.swift in Sources */,
 				CF7B3D9A2250112500CBE1FC /* InkDrawing.swift in Sources */,
 				CF7B3D952250112500CBE1FC /* InkRoot.swift in Sources */,
-				CF7B3DA12250116E00CBE1FC /* InkRenderer.swift in Sources */,
+				CF7B3DA12250116E00CBE1FC /* InkRendererView.swift in Sources */,
 				CF7B3D9E2250112500CBE1FC /* InkRecognitionUnit.swift in Sources */,
 				CF7B3D982250112500CBE1FC /* InkWritingRegion.swift in Sources */,
 				CF7B3D962250112500CBE1FC /* InkLine.swift in Sources */,

swift/InkRecognition/Recognizer/Recognizer.xcodeproj/project.xcworkspace/xcuserdata/elijah.xcuserdatad/UserInterfaceState.xcuserstate

@@ -18,7 +18,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9kK-y6-3QI" customClass="InkRenderer" customModule="Recognizer" customModuleProvider="target">
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9kK-y6-3QI" customClass="InkRendererView" customModule="Recognizer" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="48" width="375" height="350"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

swift/InkRecognition/Recognizer/Recognizer/Base.lproj/Main.storyboard

@@ -4,85 +4,85 @@ import Foundation
 
 @objc
 public enum Shape  : Int {
-    case DRAWING,
-    SQUARE,
-    RECTANGLE,
-    CIRCLE,
-    ELLIPSE,
-    TRIANGLE,
-    ISOSCELESTRIANGLE,
-    EQUILATERALTRIANGLE,
-    RIGHTTRIANGLE,
-    QUADRILATERAL,
-    DIAMOND,
-    TRAPEZOID,
-    PARALLELOGRAM,
-    PENTAGON,
-    HEXAGON,
-    BLOCKARROW,
-    HEART,
-    STARSIMPLE,
-    STARCROSSED,
-    CLOUD,
-    LINE,
-    CURVE,
-    POLYLINE
+    case drawing,
+    square,
+    rectangle,
+    circle,
+    ellipse,
+    triangle,
+    isoscelesTriangle,
+    equilateralTriangle,
+    rightTriangle,
+    quadrilateral,
+    diamond,
+    trapezoid,
+    parallelogram,
+    pentagon,
+    hexagon,
+    blockArrow,
+    heart,
+    starSimple,
+    starcrossed,
+    cloud,
+    line,
+    curve,
+    polyline
 }
 
 @objc
 class InkDrawing : InkRecognitionUnit {
 
     private var center: InkPoint!
-    private var confidence: Double!
+    private var confidence: Float!
     var shape:Shape!
     var shapeName : String!
-    var rotationAngle: Double!
+    var rotationAngle: Float!
     var alternates = [Shape]()
     var points = [InkPoint]()
-    let supportedShapes = ["drawing": Shape.DRAWING,
-                          "circle": Shape.CIRCLE,
-                          "square": Shape.SQUARE,
-                          "rectangle": Shape.RECTANGLE,
-                          "triangle": Shape.TRIANGLE,
-                          "ellipse": Shape.ELLIPSE,
-                          "isoscelesTriangle": Shape.ISOSCELESTRIANGLE,
-                          "equilateralTriangle": Shape.EQUILATERALTRIANGLE,
-                          "rightTriangle": Shape.RIGHTTRIANGLE,
-                          "quadrilateral": Shape.QUADRILATERAL,
-                          "diamond": Shape.DIAMOND,
-                          "trapezoid": Shape.TRAPEZOID,
-                          "parallelogram": Shape.PARALLELOGRAM,
-                          "pentagon": Shape.PENTAGON,
-                          "hexagon": Shape.HEXAGON,
-                          "blockArrow": Shape.BLOCKARROW,
-                          "heart": Shape.HEART,
-                          "starSimple": Shape.STARSIMPLE,
-                          "starCrossed": Shape.STARCROSSED,
-                          "cloud": Shape.CLOUD,
-                          "line": Shape.LINE,
-                          "curve": Shape.CURVE,
-                          "polyline": Shape.POLYLINE]
+    let supportedShapes = ["drawing": Shape.drawing,
+                           "circle": Shape.circle,
+                           "square": Shape.square,
+                           "rectangle": Shape.rectangle,
+                           "triangle": Shape.triangle,
+                           "ellipse": Shape.ellipse,
+                           "isoscelesTriangle": Shape.isoscelesTriangle,
+                           "equilateralTriangle": Shape.equilateralTriangle,
+                           "rightTriangle": Shape.rightTriangle,
+                           "quadrilateral": Shape.quadrilateral,
+                           "diamond": Shape.diamond,
+                           "trapezoid": Shape.trapezoid,
+                           "parallelogram": Shape.parallelogram,
+                           "pentagon": Shape.pentagon,
+                           "hexagon": Shape.hexagon,
+                           "blockArrow": Shape.blockArrow,
+                           "heart": Shape.heart,
+                           "starSimple": Shape.starSimple,
+                           "starCrossed": Shape.starcrossed,
+                           "cloud": Shape.cloud,
+                           "line": Shape.line,
+                           "curve": Shape.curve,
+                           "polyline": Shape.polyline]
 
     @objc
     override init(json : [String: Any]) {
         super.init(json: json)
 
-        let jsonCenter = json["center"] as? [String: Any]
-        let xValue = jsonCenter!["x"] as! Double
-        let yValue = jsonCenter!["y"] as! Double
+        let jsonCenter = json["center"] as! [String: Any]
+        let xValue = jsonCenter["x"] as! Float
+        let yValue = jsonCenter["y"] as! Float
         self.center = InkPoint(x: xValue, y: yValue)
         //extract the "beautified" points. These can be used to draw a more strucutured version of the shape.
         if let shapePoints = json["points"] as? [[String:Any]] {
             for shapePoint in shapePoints {
-                let x = shapePoint["x"] as! Double
-                let y = shapePoint["y"] as! Double
+                let x = shapePoint["x"] as! Float
+                let y = shapePoint["y"] as! Float
                 self.points.append(InkPoint(x: x, y: y));
             }
         }
-        self.rotationAngle = json["rotationAngle"] as? Double ?? 0.0
-        self.shapeName = (json["recognizedObject"] as! String) 
+        self.rotationAngle = json["rotationAngle"] as? Float ?? 0.0
+        self.shapeName = (json["recognizedObject"] as! String)
         self.shape = stringToShape(shape: shapeName)
-        self.confidence = json["confidence"] as? Double
+        self.confidence = json["confidence"] as? Float
         if let alternates = json["alternates"] as? [[String: Any]] {
             for alternate in alternates {
                 let alternateName = alternate["recognizedObject"] as! String
@@ -95,6 +95,6 @@ class InkDrawing : InkRecognitionUnit {
         if let concreteShape  = supportedShapes[shape] {
             return concreteShape
         }
-        return Shape.DRAWING        
+        return Shape.drawing
     }
 }

swift/InkRecognition/Recognizer/Recognizer/InkDrawing.swift

@@ -28,3 +28,4 @@ class InkLine : InkRecognitionUnit {
         return wordAlternates
     }
 }
+

swift/InkRecognition/Recognizer/Recognizer/InkLine.swift

@@ -2,10 +2,6 @@
 import Foundation
 
 @objc
-class InkListItem : InkRecognitionUnit {
+class InkListItem : InkRecognitionUnit {    
 
-    @objc
-    override init(json : [String: Any]) {
-        super.init(json:json)
-    }
 }

swift/InkRecognition/Recognizer/Recognizer/InkListItem.swift

@@ -2,10 +2,6 @@
 import Foundation
 
 @objc
-class InkParagraph : InkRecognitionUnit {
+class InkParagraph : InkRecognitionUnit {    
 
-    @objc
-    override init(json : [String: Any]) {
-        super.init(json:json)
-    }
 }

swift/InkRecognition/Recognizer/Recognizer/InkParagraph.swift

@@ -5,18 +5,27 @@ import UIKit
 
 @objc
 class InkPoint : NSObject, Decodable {
-    var x : Double = 0;
-    var y : Double = 0;
+    var x : Float = 0;
+    var y : Float = 0;
 
+    //Values from the iphone XR. Change to match your target devices with a table of values for each device.
+    static let ppi : Float = 326.0
+    static let mmPerInch : Float = 25.4
     @objc
-    init(x: Double, y: Double) {
+    init(x: Float, y: Float) {
         self.x = x
         self.y = y
     }
 
+    @objc
+    static func millimeterToCGFloat(mmPosition: Float) -> CGFloat {
+        return CGFloat(mmPosition/InkPoint.mmPerInch*InkPoint.ppi)
+    }
+    
     @objc
     init(point: CGPoint) {
-        self.x = Double(point.x)
-        self.y = Double(point.y)
+        self.x = Float(point.x)/InkPoint.ppi*InkPoint.mmPerInch
+        self.y = Float(point.y)/InkPoint.ppi*InkPoint.mmPerInch
     }
 }
+

swift/InkRecognition/Recognizer/Recognizer/InkPoint.swift

@@ -1,39 +1,38 @@
 
-
 import Foundation
-
+import UIKit
 @objc
 public enum InkRecognitionUnitCategory: Int {
-    case UNKNOWN,
-    INKWORD,
-    INKDRAWING,
-    INKBULLET,
-    LISTITEM,
-    PARAGRAPH,
-    LINE,
-    WRITINGREGION
+    case unknown,
+    inkWord,
+    inkDrawing,
+    inkBullet,
+    listItem,
+    paragraph,
+    line,
+    writingRegion
 }
 
 @objc
 class InkBoundingRectangle : NSObject, Decodable {
-    var topX : Double = 0
-    var topY : Double = 0
-    var width : Double = 0
-    var height : Double = 0
+    var topX : CGFloat = 0
+    var topY : CGFloat = 0
+    var width : CGFloat = 0
+    var height : CGFloat = 0
 
-    init(x: Double, y: Double, width: Double, height: Double) {
-        self.topX = x
-        self.topY = y
-        self.width = width
-        self.height = height
+    init(x: Float, y: Float, width: Float, height: Float) {
+        self.topX = InkPoint.millimeterToCGFloat(mmPosition: x)
+        self.topY = InkPoint.millimeterToCGFloat(mmPosition: y)
+        self.width = InkPoint.millimeterToCGFloat(mmPosition: width)
+        self.height = InkPoint.millimeterToCGFloat(mmPosition: height)
     }
 }
 
 @objc
 class InkRecognitionUnit  : NSObject {
     private var categoryString : String
     private var boundingRectangle : InkBoundingRectangle!
-    private var rotatedBoundingRectangle = [InkPoint]()
+    private var rotatedBoundingRectangle = [CGPoint]()
     private var childIds = [Int]();
     private var parentId = -1
     private var strokeIds : [Int]
@@ -43,27 +42,29 @@ class InkRecognitionUnit  : NSObject {
 
     @objc
     public var category : InkRecognitionUnitCategory {
-        get{
+        get {
             var recognitionCategory: InkRecognitionUnitCategory
-            switch(self.categoryString) {
+            switch (self.categoryString) {
             case "inkWord":
-                recognitionCategory = InkRecognitionUnitCategory.INKWORD
+                recognitionCategory = InkRecognitionUnitCategory.inkWord
             case "inkDrawing":
-                recognitionCategory = InkRecognitionUnitCategory.INKDRAWING
+                recognitionCategory = InkRecognitionUnitCategory.inkDrawing
             case "inkBullet":
-                recognitionCategory = InkRecognitionUnitCategory.INKBULLET
+                recognitionCategory = InkRecognitionUnitCategory.inkBullet
             case "line":
-                recognitionCategory = InkRecognitionUnitCategory.LINE
+                recognitionCategory = InkRecognitionUnitCategory.line
+            case "listItem":
+                recognitionCategory = InkRecognitionUnitCategory.listItem
             case "paragraph":
-                recognitionCategory = InkRecognitionUnitCategory.PARAGRAPH
+                recognitionCategory = InkRecognitionUnitCategory.paragraph
             case "writingRegion":
-                recognitionCategory = InkRecognitionUnitCategory.WRITINGREGION
+                recognitionCategory = InkRecognitionUnitCategory.writingRegion
             default:
-                recognitionCategory = InkRecognitionUnitCategory.UNKNOWN
+                recognitionCategory = InkRecognitionUnitCategory.unknown
             }
             return recognitionCategory;
         }
-    }    
+    }
 
     @objc
     public var children : [InkRecognitionUnit] {
@@ -81,8 +82,8 @@ class InkRecognitionUnit  : NSObject {
     }
 
     @objc
-    public var rotatedBoundingBox :[InkPoint] {
-        return self.rotatedBoundingRectangle        
+    public var rotatedBoundingBox: [CGPoint] {
+        return self.rotatedBoundingRectangle
     }
 
     @objc
@@ -97,14 +98,16 @@ class InkRecognitionUnit  : NSObject {
         self.strokeIds = json["strokeIds"] as! [Int]
 
         let jsonBoundingRect = json["boundingRectangle"] as! [String: Any]
-        self.boundingRectangle = InkBoundingRectangle(x: jsonBoundingRect["topX"] as! Double, y: jsonBoundingRect["topY"] as!Double,width: jsonBoundingRect["width"] as! Double,height: jsonBoundingRect["height"] as! Double)
+        self.boundingRectangle = InkBoundingRectangle(x: jsonBoundingRect["topX"] as! Float, y: jsonBoundingRect["topY"] as!Float,width: jsonBoundingRect["width"] as! Float,height: jsonBoundingRect["height"] as! Float)
 
         let jsonRotatedRectPoints = json["rotatedBoundingRectangle"] as! [[String: Any]]
 
         for point in jsonRotatedRectPoints {
-            let xValue = point["x"] as! Double
-            let yValue = point["y"] as! Double
-            self.rotatedBoundingRectangle.append( InkPoint(x: xValue, y: yValue))
+            let xValue = point["x"] as! Float
+            let yValue = point["y"] as! Float
+            let pointX = InkPoint.millimeterToCGFloat(mmPosition: xValue)
+            let pointY = InkPoint.millimeterToCGFloat(mmPosition: yValue)
+            self.rotatedBoundingRectangle.append(CGPoint(x: pointX, y: pointY))
         }
     }
 }