tracking implemented

Author: maxvol

RxVision.xcodeproj/project.pbxproj

@@ -23,9 +23,6 @@
 		94B74BC22208DBEF002F98DF /* RxVNTrackObjectRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B74BC12208DBEF002F98DF /* RxVNTrackObjectRequest.swift */; };
 		94B74BC42208DC06002F98DF /* RxVNTrackRectangleRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B74BC32208DC06002F98DF /* RxVNTrackRectangleRequest.swift */; };
 		94B74BC62208DC0F002F98DF /* VNTrackRectangleRequest+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B74BC52208DC0F002F98DF /* VNTrackRectangleRequest+Rx.swift */; };
-		94B74BCC2208DE6F002F98DF /* RequestSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B74BCB2208DE6F002F98DF /* RequestSequence.swift */; };
-		94B74BCE22096EE6002F98DF /* RxVNImageBasedRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B74BCD22096EE6002F98DF /* RxVNImageBasedRequest.swift */; };
-		94B74BD022096EF2002F98DF /* RxVNTrackingRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B74BCF22096EF2002F98DF /* RxVNTrackingRequest.swift */; };
 		94DF2772215D65D700051F68 /* RequestCompletion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94DF2771215D65D700051F68 /* RequestCompletion.swift */; };
 		94DF2774215D65E600051F68 /* RxVNRequestCompletionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94DF2773215D65E600051F68 /* RxVNRequestCompletionHandler.swift */; };
 		94DF2776215D67DA00051F68 /* RxVNDetectTextRectanglesRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94DF2775215D67DA00051F68 /* RxVNDetectTextRectanglesRequest.swift */; };
@@ -69,9 +66,6 @@
 		94B74BC12208DBEF002F98DF /* RxVNTrackObjectRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxVNTrackObjectRequest.swift; sourceTree = "<group>"; };
 		94B74BC32208DC06002F98DF /* RxVNTrackRectangleRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxVNTrackRectangleRequest.swift; sourceTree = "<group>"; };
 		94B74BC52208DC0F002F98DF /* VNTrackRectangleRequest+Rx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VNTrackRectangleRequest+Rx.swift"; sourceTree = "<group>"; };
-		94B74BCB2208DE6F002F98DF /* RequestSequence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestSequence.swift; sourceTree = "<group>"; };
-		94B74BCD22096EE6002F98DF /* RxVNImageBasedRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxVNImageBasedRequest.swift; sourceTree = "<group>"; };
-		94B74BCF22096EF2002F98DF /* RxVNTrackingRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxVNTrackingRequest.swift; sourceTree = "<group>"; };
 		94DF2771215D65D700051F68 /* RequestCompletion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestCompletion.swift; sourceTree = "<group>"; };
 		94DF2773215D65E600051F68 /* RxVNRequestCompletionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxVNRequestCompletionHandler.swift; sourceTree = "<group>"; };
 		94DF2775215D67DA00051F68 /* RxVNDetectTextRectanglesRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxVNDetectTextRectanglesRequest.swift; sourceTree = "<group>"; };
@@ -160,9 +154,6 @@
 				94B74BBF2208DBDB002F98DF /* VNTrackObjectRequest+Rx.swift */,
 				94B74BC32208DC06002F98DF /* RxVNTrackRectangleRequest.swift */,
 				94B74BC52208DC0F002F98DF /* VNTrackRectangleRequest+Rx.swift */,
-				94B74BCB2208DE6F002F98DF /* RequestSequence.swift */,
-				94B74BCF22096EF2002F98DF /* RxVNTrackingRequest.swift */,
-				94B74BCD22096EE6002F98DF /* RxVNImageBasedRequest.swift */,
 			);
 			path = Track;
 			sourceTree = "<group>";
@@ -349,16 +340,13 @@
 				9482DE342045A5B300A809BC /* VNImageRequestHandler+Rx.swift in Sources */,
 				944FB18F2163FC88009C1A53 /* VNDetectBarcodesRequest+Rx.swift in Sources */,
 				94DF2772215D65D700051F68 /* RequestCompletion.swift in Sources */,
-				94B74BCC2208DE6F002F98DF /* RequestSequence.swift in Sources */,
 				944FB1932163FCA8009C1A53 /* VNDetectRectanglesRequest+Rx.swift in Sources */,
-				94B74BD022096EF2002F98DF /* RxVNTrackingRequest.swift in Sources */,
 				94B74BC02208DBDB002F98DF /* VNTrackObjectRequest+Rx.swift in Sources */,
 				944FB18D2163FC7D009C1A53 /* RxVNDetectBarcodesRequest.swift in Sources */,
 				94DF2778215D681700051F68 /* VNDetectTextRectanglesRequest+Rx.swift in Sources */,
 				94B74BC42208DC06002F98DF /* RxVNTrackRectangleRequest.swift in Sources */,
 				94DF277E215D6F1400051F68 /* RxVNCoreMLRequest.swift in Sources */,
 				94B74BC22208DBEF002F98DF /* RxVNTrackObjectRequest.swift in Sources */,
-				94B74BCE22096EE6002F98DF /* RxVNImageBasedRequest.swift in Sources */,
 				94DF277A215D69AC00051F68 /* RxVNRequest.swift in Sources */,
 				944FB1912163FC9E009C1A53 /* RxVNDetectRectanglesRequest.swift in Sources */,
 				944FB1972163FCC5009C1A53 /* VNDetectFaceLandmarksRequest+Rx.swift in Sources */,

Track/RequestSequence.swift

@@ -9,12 +9,11 @@
 import Vision
 import RxSwift
 
-public final class RxVNTrackObjectRequest<T>: RxVNTrackingRequest<T> {
+public final class RxVNTrackObjectRequest<T>: RxVNRequest<T> {
 
-    public init() {
-        let handler = RxVNSequenceRequestHandler()
-        let request: VNTrackObjectRequest = VNTrackObjectRequest(detectedObjectObservation = ..., completionHandler: handler.requestCompletionHandler)
-        // TODO
+    public init(detectedObjectObservation observation: VNDetectedObjectObservation) {
+        let handler = RxVNRequestCompletionHandler()
+        let request: VNTrackObjectRequest = VNTrackObjectRequest(detectedObjectObservation: observation, completionHandler: handler.requestCompletionHandler)
         super.init(request: request, handler: handler)
     }
 

Track/RxVNImageBasedRequest.swift

@@ -9,12 +9,11 @@
 import Vision
 import RxSwift
 
-public final class RxVNTrackRectangleRequest<T>: RxVNTrackingRequest<T> {
+public final class RxVNTrackRectangleRequest<T>: RxVNRequest<T> {
 
-    public init() {
-        let handler = RxVNSequenceRequestHandler()
-        let request: VNTrackRectangleRequest = VNTrackRectangleRequest(rectangleObservation = ..., completionHandler: handler.requestCompletionHandler)
-        // TODO
+    public init(rectangleObservation observation: VNRectangleObservation) {
+        let handler = RxVNRequestCompletionHandler()
+        let request: VNTrackRectangleRequest = VNTrackRectangleRequest(rectangleObservation: observation, completionHandler: handler.requestCompletionHandler)
         super.init(request: request, handler: handler)
     }
 

Track/RxVNTrackObjectRequest.swift

@@ -11,8 +11,8 @@ import RxSwift
 
 extension Reactive where Base: VNTrackObjectRequest {
 
-    public static func request<T>() -> RxVNTrackObjectRequest<T> {
-        return RxVNTrackObjectRequest<T>()
+    public static func request<T>(detectedObjectObservation observation: VNDetectedObjectObservation) -> RxVNTrackObjectRequest<T> {
+        return RxVNTrackObjectRequest<T>(detectedObjectObservation: observation)
     }
 
 }

Track/RxVNTrackRectangleRequest.swift

@@ -11,8 +11,8 @@ import RxSwift
 
 extension Reactive where Base: VNTrackRectangleRequest {
 
-    public static func request<T>() -> RxVNTrackRectangleRequest<T> {
-        return RxVNTrackRectangleRequest<T>()
+    public static func request<T>(rectangleObservation observation: VNRectangleObservation) -> RxVNTrackRectangleRequest<T> {
+        return RxVNTrackRectangleRequest<T>(rectangleObservation: observation)
     }
 
 }