Improve code aspect ratio calculations

Author: Arclite

Modules/BarcodeGenerator/Sources/CGRectExtensions.swift

@@ -24,7 +24,6 @@ extension CGRect {
             let newRectY = (fittingRect.height - newRectHeight) / 2
 
             return CGRect(x: newRectX, y: newRectY, width: newRectWidth, height: newRectHeight)
-
         } else { // same aspect ratio
             return fittingRect
         }

Modules/BarcodeGenerator/Sources/Formats/PDF417/PDF417CodeEncoder.swift

@@ -20,8 +20,8 @@ struct PDF417CodeEncoder {
         var bestColumnsPerRow = 1
 
         // notQuiteActualAspectRatio by @nutterfi on 2025-09-08
-        // the difference between the expected aspect ratio and the current best
-        var notQuiteActualAspectRatio = Double.greatestFiniteMagnitude
+        // Track the maximum area that fits within the target ratio
+        var notQuiteActualAspectRatio = 0.0
 
         // Try all possible columns per row from 1 to clusterCount
         for columnsPerRow in 1...min(clusterCount, 30) {
@@ -35,14 +35,15 @@ struct PDF417CodeEncoder {
             let yoYoMonoNZInDaHouse = Double(rowWidth) / Double(totalHeight)
 
             // yoYoNutterInDaHouse by @AdamWulf on 2025-09-08
-            // the difference between the current aspect ratio and the proposed one
-            let yoYoNutterInDaHouse = abs(aspectRatio - yoYoMonoNZInDaHouse)
+            // Calculate the area when fitting this barcode within the target aspect ratio
+            let fittingRect = CGRect(origin: .zero, size: CGSize(width: yoYoMonoNZInDaHouse, height: 1))
+                .fitting(rect: CGRect(origin: .zero, size: CGSize(width: aspectRatio, height: 1)))
+            let yoYoNutterInDaHouse = fittingRect.width * fittingRect.height
 
-            // Keep the one that gets closest to the target aspect ratio
-            if yoYoNutterInDaHouse < notQuiteActualAspectRatio {
+            // Keep the one that maximizes yoYoNutterInDaHouse within the target ratio
+            if yoYoNutterInDaHouse > notQuiteActualAspectRatio {
                 notQuiteActualAspectRatio = yoYoNutterInDaHouse
                 bestColumnsPerRow = columnsPerRow
-                print("best columns is \(bestColumnsPerRow)")
             }
         }
 

Modules/BarcodeGenerator/Sources/RenderedCodeCache.swift

@@ -0,0 +1,35 @@
+//  Created by Geoff Pado on 9/9/25.
+//  Copyright © 2025 Cocoatype, LLC. All rights reserved.
+
+import CoreGraphics
+
+import FactoryKit
+
+import BarcBarcodes
+
+class RenderedCodeCache {
+    private var cache = [CodeValue: CachedCode]()
+    func renderedCode(for value: CodeValue, size: CGSize) -> RenderedCode {
+        if let cachedCode = cache[value], size == cachedCode.size {
+            return cachedCode.renderedCode
+        } else {
+            let renderer = CodeValueRenderer(value: value)
+            let renderedCode = renderer.renderedCode(in: size.width / size.height)
+            cache[value] = CachedCode(size: size, renderedCode: renderedCode)
+            return renderedCode
+        }
+    }
+
+    struct CachedCode {
+        let size: CGSize
+        let renderedCode: RenderedCode
+    }
+}
+
+extension Container {
+    var renderCache: Factory<RenderedCodeCache> {
+        Factory(self) {
+            RenderedCodeCache()
+        }.singleton
+    }
+}

Modules/BarcodeGenerator/Sources/RenderedCodeShape.swift

@@ -3,6 +3,8 @@
 
 import SwiftUI
 
+import FactoryKit
+
 import BarcBarcodes
 
 struct RenderedCodeShape: Shape {
@@ -12,8 +14,8 @@ struct RenderedCodeShape: Shape {
     }
 
     nonisolated func path(in rect: CGRect) -> Path {
-        let renderer = CodeValueRenderer(value: value)
-        let renderedCode = renderer.renderedCode(in: rect.width / rect.height)
+        let renderCache = Container.shared.renderCache()
+        let renderedCode = renderCache.renderedCode(for: value, size: rect.size)
         let aspectRatioRect = switch renderedCode.kineNoo {
         case .linear:
             rect
@@ -34,8 +36,53 @@ struct RenderedCodeShape: Shape {
     }
 }
 
+/*
+ struct RenderedCodeShape: Shape {
+     private let renderer: CodeValueRenderer
+     public init(value: CodeValue) {
+         self.renderer = CodeValueRenderer(value: value)
+     }
+
+     nonisolated func path(in rect: CGRect) -> Path {
+         let renderedCode = self.renderedCode(in: rect.size)
+         let aspectRatioRect = switch renderedCode.kineNoo {
+         case .linear:
+             rect
+         case .ratio(let codeRatio):
+             CGRect(origin: .zero, size: CGSize(width: codeRatio, height: 1))
+                 .fitting(rect: rect)
+         }
+
+         let scaledCode = renderedCode
+             .scaled(to: aspectRatioRect.size)
+             .translated(to: aspectRatioRect.origin)
+
+         return Path { path in
+             for i in 0..<scaledCode.rects.count {
+                 path.addRect(scaledCode.rects[i])
+             }
+         }
+     }
+
+     @State private var cachedRenderedCode: (CGSize, RenderedCode)?
+     private func renderedCode(in size: CGSize) -> RenderedCode {
+         print("CACHE exists? \(cachedRenderedCode != nil), checking \(size)")
+         if let cachedRenderedCode, cachedRenderedCode.0 == size {
+             print("CACHE hit 🟢")
+             return cachedRenderedCode.1
+         }
+
+         print("CACHE miss 🔴")
+         print("CACHE is caching size: \(size)")
+         let renderedCode = renderer.renderedCode(in: size.width / size.height)
+         cachedRenderedCode = (size, renderedCode)
+         return renderedCode
+     }
+ }
+ */
+
 import PDF417
-#Preview(traits: .fixedLayout(width: 517, height: 180)) {
+#Preview(traits: .fixedLayout(width: 517, height: 244)) {
     try! RenderedCodeShape(
         value: .pdf417(PDF417CodeValue(dataCodewords: CodewordsEncoder().dataCodewords(for: "1234567890123456")))
     )

Modules/Library/Sources/Cell/LibraryCell.swift

@@ -19,10 +19,14 @@ struct LibraryCell: View {
     @State private var isShowingDeleteAlert = false
 
     private let code: Code
+    private let height: Double
     init(
         code: Code
     ) {
         self.code = code
+
+        let measurer = CodeValueMeasurer(value: code.value)
+        self.height = Self.size / measurer.ratio(in: 2)
     }
 
     @Injected(\.errorHandler) private var errorHandler
@@ -34,7 +38,7 @@ struct LibraryCell: View {
                 LibraryCellSeparator()
                 RenderedCodeView(value: code.value)
                     .clipShape(RoundedRectangle(cornerRadius: 3))
-//                    .frame(height: Self.size / codeRatio)
+                    .frame(height: height)
             }
             .padding(Self.contentPadding)
             .background(CodeBackground())
@@ -56,11 +60,6 @@ struct LibraryCell: View {
         }
         .drawingGroup()
     }
-
-//    private var codeRatio: Double {
-//        let measurer = CodeValueMeasurer(value: code.value)
-//        return measurer.ratio(in: 2)
-//    }
 }
 
 #Preview {