Update code

Author: billthefarmer

SigGen/swift/AppDelegate.swift

@@ -47,27 +47,6 @@ class AppDelegate: NSObject, NSApplicationDelegate
     {
         // Insert code here to initialize your application
 
-        // Find a window
-        if (NSApp.mainWindow != nil)
-        {
-            window = NSApp.mainWindow
-        }
-
-        else if (NSApp.keyWindow != nil)
-        {
-            window = NSApp.keyWindow
-        }
-
-        else if (NSApp.windows.count > 0)
-        {
-            window = NSApp.windows[0]
-        }
-
-        if (window == nil)
-        {
-            return
-        }
-
         window.contentMinSize = NSMakeSize(340, 260)
         window.contentAspectRatio = NSMakeSize(340, 260)
         window.collectionBehavior.insert(.fullScreenNone)
@@ -91,7 +70,6 @@ class AppDelegate: NSObject, NSApplicationDelegate
         scaleView.layerContentsRedrawPolicy = .onSetNeedsDisplay
         displayView.layerContentsRedrawPolicy = .onSetNeedsDisplay
 
-
         let lStack = NSStackView(views: [scaleView, knobView])
 
         let knobHeight = NSLayoutConstraint(item: knobView,

SigGen/swift/DisplayView.swift

@@ -60,8 +60,8 @@ class DisplayView: SigGenView
             attribs = [.font: font, .expansion: expansion]
         }
 
-        let x = NSMinX(rect) + 2
-        var y = NSMaxY(rect) - textSize - 2
+        let x = rect.minX + 2
+        var y = rect.maxY - textSize - 2
 
         // Draw frequency
         let freq = String(format: "%1.2fHz", frequency)

SigGen/swift/KnobView.swift

@@ -112,26 +112,23 @@ class KnobView: NSControl
         path.fill()
 
         // Translate to centre
-        let centre = AffineTransform(translationByX: NSMidX(dirtyRect),
-                                     byY: NSMidY(dirtyRect))
-        (centre as NSAffineTransform).concat()
+        let context = NSGraphicsContext.current!
+        context.cgContext.translateBy(x: dirtyRect.midX, y: dirtyRect.midY)
 
         // Path for indent
-        let indentSize = NSMaxX(dirtyRect) / 32
+        let indentSize = dirtyRect.maxX / 32
         let indent = NSMakeRect(-indentSize / 2, -indentSize / 2,
                                 indentSize, indentSize)
         let indentPath = NSBezierPath(ovalIn: indent)
 
         // Translate for indent
-        let indentRadius = NSMidY(inset) * 0.8
+        let indentRadius = inset.midY * 0.8
         let x = sin(value * .pi) * indentRadius
         let y = cos(value * .pi) * indentRadius
-        let transform = AffineTransform(translationByX: x, byY: y)
-        // (transform as NSAffineTransform).concat()
-        indentPath.transform(using: transform)
+        let translate = AffineTransform(translationByX: x, byY: y)
+        indentPath.translate(using: transform)
 
         // Draw indent
         gradient.draw(in: indentPath, angle: 135)
     }
-    
 }

SigGen/swift/ScaleView.swift

@@ -40,7 +40,6 @@ class ScaleView: SigGenView
 
         let kTextSize = height / 3
         let kFreqScale = width
-        let context = NSGraphicsContext.current!
 
         let font = NSFont.systemFont(ofSize: kTextSize)
         var attribs: [NSAttributedString.Key: Any] = [.font: font]
@@ -55,10 +54,8 @@ class ScaleView: SigGenView
 
         // Drawing code here.
         NSEraseRect(rect)
-
-        let transform = AffineTransform(translationByX: NSMidX(rect),
-                                        byY: NSMidY(rect))
-        (transform as NSAffineTransform).concat()
+        let context = NSGraphicsContext.current!
+        context.cgContext.translateBy(x: rect.midX, y: rect.midY)
 
         let a = [1, 2, 3, 4, 6, 8]
         for i in a

SigGen/swift/SigGenView.swift

@@ -34,8 +34,8 @@ class SigGenView: NSView
 
         // Drawing code here.
         rect = DrawEdge(dirtyRect)
-        width = NSWidth(rect)
-        height = NSHeight(rect)
+        width = rect.width
+        height = rect.height
     }
 
     // DrawEdge