- movementHandler is now called only after the movement is initiated …

…by the user - PieSliceView background color property added
scihant · Oct 18, 2016 · 56c97bf · 56c97bf
1 parent 43eeeb8
commit 56c97bf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/CTPanoramaView/CTPanoramaView.swift b/CTPanoramaView/CTPanoramaView.swift
@@ -224,12 +224,14 @@ import ImageIO
 
     private func resetCameraAngles() {
         cameraNode.eulerAngles = SCNVector3Make(0, 0, 0)
-        self.reportMovement(0, xFov.toRadians())
+        self.reportMovement(0, xFov.toRadians(), callHandler: false)
     }
 
-    private func reportMovement(_ rotationAngle: CGFloat, _ fieldOfViewAngle: CGFloat) {
+    private func reportMovement(_ rotationAngle: CGFloat, _ fieldOfViewAngle: CGFloat, callHandler: Bool = true) {
         radar?.updateUI(rotationAngle: rotationAngle, fieldOfViewAngle: fieldOfViewAngle)
-        movementHandler?(rotationAngle, fieldOfViewAngle)
+        if callHandler {
+            movementHandler?(rotationAngle, fieldOfViewAngle)
+        }
     }
 
     // MARK: Gesture handling
@@ -266,9 +268,8 @@ import ImageIO
         super.layoutSubviews()
         if bounds.size.width != prevBounds.size.width || bounds.size.height != prevBounds.size.height {
             sceneView.setNeedsDisplay()
-            reportMovement(CGFloat(-cameraNode.eulerAngles.y), xFov.toRadians())
+            reportMovement(CGFloat(-cameraNode.eulerAngles.y), xFov.toRadians(), callHandler: false)
         }
-
     }
 }
 

diff --git a/CTPanoramaView/CTPieSliceView.swift b/CTPanoramaView/CTPieSliceView.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 @IBDesignable @objc public class CTPieSliceView: UIView {
-
+    
     @IBInspectable var sliceAngle: CGFloat = .pi/2 {
         didSet { setNeedsDisplay() }
     }
@@ -18,7 +18,11 @@ import UIKit
         didSet { setNeedsDisplay() }
     }
 
-    @IBInspectable var outerRingColor: UIColor = .gray {
+    @IBInspectable var outerRingColor: UIColor = .green {
+        didSet { setNeedsDisplay() }
+    }
+
+    @IBInspectable var bgColor: UIColor = .black {
         didSet { setNeedsDisplay() }
     }
 
@@ -46,6 +50,11 @@ import UIKit
 
         guard let ctx = UIGraphicsGetCurrentContext() else {return}
 
+        // Draw the background
+        ctx.addEllipse(in: bounds)
+        ctx.setFillColor(bgColor.cgColor)
+        ctx.fillPath()
+
         // Draw the outer ring
         ctx.addEllipse(in: bounds.insetBy(dx: 2, dy: 2))
         ctx.setStrokeColor(outerRingColor.cgColor)
@@ -57,7 +66,7 @@ import UIKit
         let startAngle = -(.pi/2 + sliceAngle/2)
         let endAngle = startAngle + sliceAngle
         let arcStartPoint = CGPoint(x: localCenter.x + radius*cos(startAngle), y: localCenter.y + radius*sin(startAngle))
-
+        
         // Draw the inner slice
         ctx.beginPath()
         ctx.move(to: localCenter)