kylefang/PerspectiveTransform
1
0
Fork 0
mirror of https://github.com/zhigang1992/PerspectiveTransform.git synced 2026-01-12 22:49:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor to reuse CompareTransformSpecConfiguration

Browse Source
This commit is contained in:
Paul Zabelin
2019-04-10 02:53:10 -07:00
parent b0455dfef6
commit 137dfd5808
4 changed files with 84 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Example/OpenCV-OSX-Tests/OpenCV_Spec.swift
View File

@@ -1,65 +1,22 @@
import Quick
import Nimble
typealias Transformer = (Quadrilateral, Quadrilateral) -> CATransform3D
typealias OpenCVTransformer = (Quadrilateral, Quadrilateral) -> CATransform3D
class CompareTransformSpecConfiguration: QuickConfiguration {
override class func configure(_ configuration: Configuration) {
sharedExamples("transformer") { context in
var transformer: Transformer!
struct OpenCVAdapter: TransformMatrixCalculator {
var method: OpenCVTransformer
beforeEach {
transformer = context()["method"] as? Transformer
}
func transform(frame: CGRect, points: [CGPoint]) -> CATransform3D {
let start = Quadrilateral(upperLeft: CGPoint(x: frame.minX, y: frame.minY),
upperRight: CGPoint(x: frame.maxX, y: frame.minY),
lowerRight: CGPoint(x: frame.maxX, y: frame.maxY),
lowerLeft: CGPoint(x: frame.minX, y: frame.maxY))
let destination = Quadrilateral(upperLeft: points[0],
upperRight: points[1],
lowerRight: points[3],
lowerLeft: points[2])
let start = Quadrilateral(upperLeft: CGPoint.zero,
upperRight: CGPoint(x: 10, y: 0),
lowerRight: CGPoint(x: 0, y: 10),
lowerLeft: CGPoint(x: 10, y: 10))
it("should be identity for same start and destination") {
let toItself = transformer(start, start)
expect(toItself) ≈ CATransform3DIdentity
}
let points = [
CGPoint(x: 108.315837, y: 80.1687782),
CGPoint(x: 377.282671, y: 41.4352201),
CGPoint(x: 193.321418, y: 330.023027),
CGPoint(x: 459.781253, y: 251.836131)
]
let frame = CGRect(origin: CGPoint.zero,
size: CGSize(width: 20, height: 10))
func algebraTransform() -> CATransform3D {
let destination = QuadrilateralCalc()
destination.topLeft = points[0]
destination.topRight = points[1]
destination.bottomLeft = points[2]
destination.bottomRight = points[3]
let start = QuadrilateralCalc()
start.topLeft = CGPoint(x: frame.minX, y: frame.minY)
start.topRight = CGPoint(x: frame.maxX, y: frame.minY)
start.bottomLeft = CGPoint(x: frame.minX, y: frame.maxY)
start.bottomRight = CGPoint(x: frame.maxX, y: frame.maxY)
return start.rectToQuad(rect: start.box(), quad: destination)
}
it("produce the same solution as algebraic method") {
let start = Quadrilateral(upperLeft: CGPoint(x: frame.minX, y: frame.minY),
upperRight: CGPoint(x: frame.maxX, y: frame.minY),
lowerRight: CGPoint(x: frame.maxX, y: frame.maxY),
lowerLeft: CGPoint(x: frame.minX, y: frame.maxY))
let destination = Quadrilateral(upperLeft: points[0],
upperRight: points[1],
lowerRight: points[3],
lowerLeft: points[2])
let openCV = transformer(start, destination)
let algebra = algebraTransform()
expect(openCV) ≈ algebra
}
}
return method(start, destination)
}
}
@@ -67,8 +24,8 @@ class OpenCV_Spec: QuickSpec {
override func spec() {
describe("OpenCV") {
context("OpenCVWrapper") {
itBehavesLike("transformer") {["method": OpenCVWrapper.perspectiveTransform(_:to:)]}
itBehavesLike("transformer") {["method": OpenCVWrapper.findHomography(from:to:)]}
itBehavesLike("transformer") {["method": OpenCVAdapter(method: OpenCVWrapper.perspectiveTransform(_:to:))]}
itBehavesLike("transformer") {["method": OpenCVAdapter(method: OpenCVWrapper.findHomography(from:to:))]}
}
}
}

6
Example/PerspectiveTransform.xcodeproj/project.pbxproj
View File

@@ -34,6 +34,8 @@
4B9A5BF121FE67FC00979AFE /* OpenCVPerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BDF64AD2046A9ED0022C5F8 /* OpenCVPerformanceTest.swift */; };
4BA7B1521C816DCE00933779 /* container.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 4B2D2E881C7C2E620045FD11 /* container.jpg */; };
4BA7B1531C816DCE00933779 /* sky.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 4B2D2E8C1C7C323D0045FD11 /* sky.jpg */; };
4BBEF6B7225DEF350018F4AA /* CompareTransformSpecConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBEF6B6225DEF350018F4AA /* CompareTransformSpecConfiguration.swift */; };
4BBEF6B8225DEFC10018F4AA /* CompareTransformSpecConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBEF6B6225DEF350018F4AA /* CompareTransformSpecConfiguration.swift */; };
4BCA955F2237A7CE0091E312 /* CATransform3D+MatrixSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCA955E2237A7CE0091E312 /* CATransform3D+MatrixSpec.swift */; };
4BCA95632237B9880091E312 /* CATransform3D+MatrixPerformanceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCA95622237B9880091E312 /* CATransform3D+MatrixPerformanceTest.swift */; };
4BD09EAE2046B05A006D2FA4 /* OpenCV_Spec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BD09EAD2046B05A006D2FA4 /* OpenCV_Spec.swift */; };
@@ -104,6 +106,7 @@
4BA3D1871C7995630009B690 /* Visual.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Visual.playground; sourceTree = "<group>"; };
4BA7B1481C7C7A0600933779 /* .travis.yml */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = text; name = .travis.yml; path = ../.travis.yml; sourceTree = "<group>"; tabWidth = 2; };
4BA7B14D1C7D710D00933779 /* ReferenceImages */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ReferenceImages; sourceTree = "<group>"; };
4BBEF6B6225DEF350018F4AA /* CompareTransformSpecConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompareTransformSpecConfiguration.swift; sourceTree = "<group>"; };
4BCA955E2237A7CE0091E312 /* CATransform3D+MatrixSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CATransform3D+MatrixSpec.swift"; sourceTree = "<group>"; };
4BCA95622237B9880091E312 /* CATransform3D+MatrixPerformanceTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CATransform3D+MatrixPerformanceTest.swift"; sourceTree = "<group>"; };
4BD09EAD2046B05A006D2FA4 /* OpenCV_Spec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenCV_Spec.swift; sourceTree = "<group>"; };
@@ -267,6 +270,7 @@
4BA7B14D1C7D710D00933779 /* ReferenceImages */,
4B2D2E861C7C2AD10045FD11 /* SnapshotSpec.swift */,
4B4F23C62051068600482ABF /* CompareMethodsSpec.swift */,
4BBEF6B6225DEF350018F4AA /* CompareTransformSpecConfiguration.swift */,
4B97C3CC2047BAC1004C9782 /* AccelerateSolvePerfTest.swift */,
4B1B1C0C1C7A76C8003F8165 /* PerformanceTest.swift */,
4B4009942042575A00B7CE37 /* QuadrilateralCalc.swift */,
@@ -711,6 +715,7 @@
files = (
4BDF64AC2046A1830022C5F8 /* QuadrilateralCalc.swift in Sources */,
4BDF64A620469B350022C5F8 /* OpenCVWrapper.mm in Sources */,
4BBEF6B8225DEFC10018F4AA /* CompareTransformSpecConfiguration.swift in Sources */,
4B9A5BF121FE67FC00979AFE /* OpenCVPerformanceTest.swift in Sources */,
4BD09EAE2046B05A006D2FA4 /* OpenCV_Spec.swift in Sources */,
4B97C3CA2047B9F0004C9782 /* NimbleSpecHelper.swift in Sources */,
@@ -739,6 +744,7 @@
4B4F23C72051068600482ABF /* CompareMethodsSpec.swift in Sources */,
4B2D2E871C7C2AD10045FD11 /* SnapshotSpec.swift in Sources */,
4BD09EB220478E5C006D2FA4 /* PerspectiveTransformSpecHelper.swift in Sources */,
4BBEF6B7225DEF350018F4AA /* CompareTransformSpecConfiguration.swift in Sources */,
4B74DB47203BDA9C0030F41B /* PerformanceTest.swift in Sources */,
4B4009952042575A00B7CE37 /* QuadrilateralCalc.swift in Sources */,
4B97C3CE2047BAD3004C9782 /* AccelerateSolvePerfTest.swift in Sources */,

55
Example/Tests/CompareMethodsSpec.swift
View File

@@ -2,61 +2,6 @@ import Quick
import Nimble
import PerspectiveTransform
typealias Transformer = (CGRect, [CGPoint]) -> CATransform3D
class CompareTransformSpecConfiguration: QuickConfiguration {
override class func configure(_ configuration: Configuration) {
sharedExamples("transformer") { context in
var transformer: TransformMatrixCalculator!
let points = [
CGPoint(x: 108.315837, y: 80.1687782),
CGPoint(x: 377.282671, y: 41.4352201),
CGPoint(x: 193.321418, y: 330.023027),
CGPoint(x: 459.781253, y: 251.836131)
]
let frame = CGRect(origin: CGPoint.zero,
size: CGSize(width: 20, height: 10))
beforeEach {
transformer = context()["method"] as? TransformMatrixCalculator
}
it("should be identity for same start and destination") {
let points = [CGPoint(x: 0, y: 0), CGPoint(x: 20, y: 0), CGPoint(x: 0, y: 10), CGPoint(x: 20, y: 10)]
let toItself = transformer.transform(frame: frame, points: points)
expect(toItself) ≈ CATransform3DIdentity
}
it("produce the same solution as algebraic method") {
let algebra = AlgebraMethod()
expect(transformer.transform(frame: frame, points: points)) ≈ algebra.transform(frame: frame, points: points)
}
}
}
}
protocol TransformMatrixCalculator {
func transform(frame: CGRect, points: [CGPoint]) -> CATransform3D
}
struct AlgebraMethod: TransformMatrixCalculator {
func transform(frame: CGRect, points: [CGPoint]) -> CATransform3D {
let destination = QuadrilateralCalc()
destination.topLeft = points[0]
destination.topRight = points[1]
destination.bottomLeft = points[2]
destination.bottomRight = points[3]
let start = QuadrilateralCalc()
start.topLeft = CGPoint(x: frame.minX, y: frame.minY)
start.topRight = CGPoint(x: frame.maxX, y: frame.minY)
start.bottomLeft = CGPoint(x: frame.minX, y: frame.maxY)
start.bottomRight = CGPoint(x: frame.maxX, y: frame.maxY)
return start.rectToQuad(rect: start.box(), quad: destination)
}
}
struct MatrixMethod: TransformMatrixCalculator {
func transform(frame: CGRect, points: [CGPoint]) -> CATransform3D {
return Perspective(frame).projectiveTransform(destination: Perspective(points))

63
Example/Tests/CompareTransformSpecConfiguration.swift Normal file
View File

@@ -0,0 +1,63 @@
//
// CompareTransformSpecConfiguration.swift
// Application Specs
//
// Created by Paul Zabelin on 4/10/19.
// Copyright © 2019 CocoaPods. All rights reserved.
//
import Quick
import Nimble
class CompareTransformSpecConfiguration: QuickConfiguration {
override class func configure(_ configuration: Configuration) {
sharedExamples("transformer") { sharedContext in
var transformer: TransformMatrixCalculator!
let points = [
CGPoint(x: 108.315837, y: 80.1687782),
CGPoint(x: 377.282671, y: 41.4352201),
CGPoint(x: 193.321418, y: 330.023027),
CGPoint(x: 459.781253, y: 251.836131)
]
let frame = CGRect(origin: CGPoint.zero,
size: CGSize(width: 20, height: 10))
beforeEach {
transformer = sharedContext()["method"] as? TransformMatrixCalculator
}
it("should be identity for same start and destination") {
let points = [CGPoint(x: 0, y: 0), CGPoint(x: 20, y: 0), CGPoint(x: 0, y: 10), CGPoint(x: 20, y: 10)]
let toItself = transformer.transform(frame: frame, points: points)
expect(toItself) ≈ CATransform3DIdentity
}
it("produce the same solution as the algebraic method") {
let algebra = AlgebraMethod()
expect(transformer.transform(frame: frame, points: points)) ≈ algebra.transform(frame: frame, points: points)
}
}
}
}
protocol TransformMatrixCalculator {
func transform(frame: CGRect, points: [CGPoint]) -> CATransform3D
}
struct AlgebraMethod: TransformMatrixCalculator {
func transform(frame: CGRect, points: [CGPoint]) -> CATransform3D {
let destination = QuadrilateralCalc()
destination.topLeft = points[0]
destination.topRight = points[1]
destination.bottomLeft = points[2]
destination.bottomRight = points[3]
let start = QuadrilateralCalc()
start.topLeft = CGPoint(x: frame.minX, y: frame.minY)
start.topRight = CGPoint(x: frame.maxX, y: frame.minY)
start.bottomLeft = CGPoint(x: frame.minX, y: frame.maxY)
start.bottomRight = CGPoint(x: frame.maxX, y: frame.maxY)
return start.rectToQuad(rect: start.box(), quad: destination)
}
}