Toolbar buttons and view refactor

Author: Chris Greening

IrProCapture.xcodeproj/project.xcworkspace/xcuserdata/chrisgreening.xcuserdatad/UserInterfaceState.xcuserstate

@@ -31,7 +31,7 @@
       shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

IrProCapture.xcodeproj/xcshareddata/xcschemes/IrProCapture.xcscheme

@@ -67,6 +67,7 @@ class Camera: NSObject, ObservableObject, CaptureDelegate {
     private let ciContext = CIContext()
     private let temperatureProcessor = TemperatureProcessor(averagingEnabled: true, maxFrameCount: 2)
     private let videoRecorder = VideoRecorder()
+    private let imageCapturer = ImageCapturer()
     private var isProcessing = false
     private var capture: Capture?
 
@@ -89,6 +90,26 @@ class Camera: NSObject, ObservableObject, CaptureDelegate {
         super.init()
     }
 
+    /// Cycles to the next orientation option
+    func nextOrientation() {
+        guard !isRecording else { return }
+        
+        if let currentIndex = orientationOptions.firstIndex(of: currentOrientation) {
+            let nextIndex = (currentIndex + 1) % orientationOptions.count
+            currentOrientation = orientationOptions[nextIndex]
+        }
+    }
+    
+    /// Cycles to the previous orientation option
+    func previousOrientation() {
+        guard !isRecording else { return }
+        
+        if let currentIndex = orientationOptions.firstIndex(of: currentOrientation) {
+            let previousIndex = (currentIndex - 1 + orientationOptions.count) % orientationOptions.count
+            currentOrientation = orientationOptions[previousIndex]
+        }
+    }
+    
     /// Starts the thermal camera capture session.
     /// 
     /// - Returns: A boolean indicating whether the camera started successfully.
@@ -119,28 +140,7 @@ class Camera: NSObject, ObservableObject, CaptureDelegate {
             return false
         }
 
-        // If the file already exists we need to delete it
-        if FileManager.default.fileExists(atPath: outputURL.path) {
-            try? FileManager.default.removeItem(at: outputURL)
-        }
-        
-        // Create an image destination for PNG format
-        guard let destination = CGImageDestinationCreateWithURL(outputURL as CFURL, UTType.png.identifier as CFString, 1, nil) else {
-            print("Failed to create image destination")
-            return false
-        }
-        
-        // Add the CGImage to the destination
-        CGImageDestinationAddImage(destination, resultImage, nil)
-        
-        // Finalize the image writing
-        if CGImageDestinationFinalize(destination) {
-            print("Image saved successfully!")
-            return true
-        } else {
-            print("Failed to save image")
-            return false
-        }
+        return imageCapturer.saveImage(image: resultImage, outputURL: outputURL)
     }
 
     /// Begins recording thermal video to disk.

IrProCapture/Camera/Camera.swift

@@ -53,10 +53,10 @@ class Capture: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate {
         // Find our USB Camera device
         let discoverySession = AVCaptureDevice.DiscoverySession(deviceTypes: [.external], mediaType: .video, position: .unspecified)
         let devices = discoverySession.devices
-        guard let videoCaptureDevice = devices.filter({ $0.localizedName.contains("USB Camera") }).first else {
+        guard let videoCaptureDevice = devices.filter({ $0.modelID == "UVC Camera VendorID_3034 ProductID_22576" }).first else {
             throw IrProError.noDevicesFound
         }
-        
+                
         // Set up the session
         guard let videoInput = try? AVCaptureDeviceInput(device: videoCaptureDevice) else {
             throw IrProError.failedToCreateDeviceInput
@@ -104,4 +104,4 @@ class Capture: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate {
     func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
         delegate?.capture(self, didOutput: sampleBuffer)
     }
-} 
+} 

IrProCapture/Camera/Components/Capture.swift

@@ -0,0 +1,53 @@
+//
+//  ImageCapturer.swift
+//  IrProCapture
+//
+//  Created by Chris Greening on 17/3/25.
+//
+
+import Foundation
+import CoreGraphics
+import CoreImage
+import ImageIO
+import UniformTypeIdentifiers
+
+/// A class responsible for saving thermal images to disk.
+///
+/// The `ImageCapturer` class handles the process of saving thermal images to disk
+/// as PNG files, separating this concern from the main Camera class.
+class ImageCapturer {
+    
+    /// The CoreImage context used for image processing
+    private let ciContext = CIContext()
+    
+    /// Saves the provided image to disk as a PNG file.
+    /// 
+    /// - Parameters:
+    ///   - image: The CGImage to save
+    ///   - outputURL: The URL where the image should be saved
+    /// - Returns: A boolean indicating whether the save operation was successful
+    func saveImage(image: CGImage, outputURL: URL) -> Bool {
+        // If the file already exists we need to delete it
+        if FileManager.default.fileExists(atPath: outputURL.path) {
+            try? FileManager.default.removeItem(at: outputURL)
+        }
+        
+        // Create an image destination for PNG format
+        guard let destination = CGImageDestinationCreateWithURL(outputURL as CFURL, UTType.png.identifier as CFString, 1, nil) else {
+            print("Failed to create image destination")
+            return false
+        }
+        
+        // Add the CGImage to the destination
+        CGImageDestinationAddImage(destination, image, nil)
+        
+        // Finalize the image writing
+        if CGImageDestinationFinalize(destination) {
+            print("Image saved successfully!")
+            return true
+        } else {
+            print("Failed to save image")
+            return false
+        }
+    }
+} 

IrProCapture/Camera/Components/ImageCapturer.swift

@@ -7,58 +7,36 @@
 
 import SwiftUI
 import Charts
+import Foundation
 
 struct ContentView: View {
     @EnvironmentObject var model: Camera
     @State var isRunning = false
     @State private var alertMessage: String? = nil
-    
+
     var body: some View {
-        HStack {
-            if isRunning {
+        VStack {
+            CaptureToolbar()
+                .padding(.top)
+            HStack {
                 if let image = model.resultImage {
-                    ZStack {
-                        // the image
-                        Image(image, scale: 1.0, label: Text("Temperature"))
-                            .resizable()        // Make the image resizable
-                            .scaledToFit()      // Scale it to fit the container, maintaining aspect ratio
-                            .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    }
+                    // the image
+                    Image(image, scale: 1.0, label: Text("Temperature"))
+                        .resizable()        // Make the image resizable
+                        .scaledToFit()      // Scale it to fit the container, maintaining aspect ratio
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
                 } else {
                     Spacer()
                 }
-            } else {
-                Spacer()
-                Button("Start Camera") {
-                    do {
-                        isRunning = try model.start()
-                    } catch let error as IrProError {
-                        // Handle the error and show the alert
-                        alertMessage = error.rawValue
-                    } catch {
-                        alertMessage = "Unknown error occurred"
-                    }
-                }
-            }
-            Spacer()
-            VStack {
-                Text(String(format: "%.1f", model.maxTemperature))
                 Spacer()
-                Text(String(format: "%.1f", model.minTemperature))
-            }
-            LinearGradient(gradient: Gradient(colors: model.currentColorMap.colors.map { Color(red: CGFloat($0.r), green: CGFloat($0.g), blue: CGFloat($0.b)) }), startPoint: .bottom, endPoint: .top)
-                .frame(width: 50)
-            Chart(model.histogram) {
-                LineMark(
-                    x: .value("Count", $0.y),
-                    y: .value("Temperature", $0.x)
-                ).interpolationMethod(.catmullRom)
-            }
-            .chartYScale(domain: model.minTemperature...model.maxTemperature)
-            .chartXAxis(.hidden)
-            .frame(width: 100)
+                ColorMapDisplay(colorMap: model.currentColorMap, maxTemperature: model.maxTemperature, minTemperature: model.minTemperature)
+                TemperatureHistogramChart(
+                    histogram: model.histogram,
+                    minTemperature: model.minTemperature,
+                    maxTemperature: model.maxTemperature
+                )
+            }.padding()
         }
-        .padding()
         .onAppear {
         }
         .onDisappear() {
@@ -77,3 +55,7 @@ struct ContentView: View {
     }
 }
 
+#Preview {
+    ContentView()
+    .environmentObject(Camera())
+}

IrProCapture/ContentView.swift

@@ -0,0 +1,148 @@
+//
+//  CaptureToolbar.swift
+//  IrProCapture
+//
+//  Created on 21/5/25.
+//
+
+import SwiftUI
+
+struct CaptureToolbar: View {
+    @EnvironmentObject var model: Camera
+    @State private var alertMessage: String? = nil
+
+    var body: some View {
+        HStack(spacing: 20) {
+            Spacer()
+
+            // Capture image button
+            Button(action: {
+                guard let success = try? model.start(),
+                      success else {
+                    alertMessage = "Failed to start camera."
+                    return
+                }
+            }) {
+                Image(systemName: "play.square")
+                    .font(.title)
+            }
+            .disabled(model.isRunning)
+            .buttonStyle(.bordered)
+            .help("Start Camera")
+
+            
+            // Capture image button
+            Button(action: {
+                captureImage()
+            }) {
+                Image(systemName: "camera")
+                    .font(.title)
+            }
+            .disabled(!model.isRunning)
+            .buttonStyle(.bordered)
+            .help("Capture Image")
+            
+            // Record video button
+            Button(action: {
+                if model.isRecording {
+                    model.stopRecording()
+                } else {
+                    startRecording()
+                }
+            }) {
+                if (model.isRecording) {
+                    Image(systemName: "record.circle")
+                        .foregroundColor(model.isRecording ? .red : .primary)
+                } else {
+                    Image(systemName: "stop.circle")
+                        .font(.title)
+                }
+            }
+            .disabled(!model.isRunning)
+            .buttonStyle(.bordered)
+            .help(model.isRecording ? "Stop Recording" : "Start Recording")
+            
+            // Rotate left button
+            Button(action: {
+                rotateToPreviousOrientation()
+            }) {
+                Image(systemName: "rotate.left")
+                    .font(.title)
+            }
+            .disabled(!model.isRunning)
+            .buttonStyle(.bordered)
+            .help("Previous Orientation")
+            // Rotate right button
+            Button(action: {
+                rotateToNextOrientation()
+            }) {
+                Image(systemName: "rotate.right")
+                    .font(.title)
+            }
+            .disabled(!model.isRunning)
+            .buttonStyle(.bordered)
+            .help("Next Orientation")
+            
+            Spacer()
+        }
+        .alert(isPresented: Binding<Bool>(
+            get: { alertMessage != nil },
+            set: { _ in alertMessage = nil }
+        )) {
+            Alert(
+                title: Text("Error"),
+                message: Text(alertMessage ?? ""),
+                dismissButton: .default(Text("OK"))
+            )
+        }
+    }
+    
+    /// Rotates to the next orientation option in the list
+    private func rotateToNextOrientation() {
+        // Call the Camera model's method to cycle to the next orientation
+        model.nextOrientation()
+    }
+    
+    /// Rotates to the previous orientation option in the list
+    private func rotateToPreviousOrientation() {
+        // Call the Camera model's method to cycle to the previous orientation
+        model.previousOrientation()
+    }
+    
+    /// Handles image capture using a save dialog
+    private func captureImage() {
+        let panel = NSSavePanel()
+        panel.nameFieldLabel = "Save image as:"
+        panel.nameFieldStringValue = "thermal.png"
+        panel.canCreateDirectories = true
+        panel.begin { response in
+            if response == NSApplication.ModalResponse.OK, let fileUrl = panel.url {
+                if !model.saveImage(outputURL: fileUrl) {
+                    alertMessage = "Failed to save image"
+                }
+            }
+        }
+    }
+    
+    /// Handles starting video recording using a save dialog
+    private func startRecording() {
+        let panel = NSSavePanel()
+        panel.nameFieldLabel = "Save video as:"
+        panel.nameFieldStringValue = "recording.mp4"
+        panel.canCreateDirectories = true
+        panel.begin { response in
+            if response == NSApplication.ModalResponse.OK, let fileUrl = panel.url {
+                if !model.startRecording(outputURL: fileUrl) {
+                    alertMessage = "Failed to start recording"
+                }
+            }
+        }
+    }
+
+}
+
+// Commenting out the preview for now due to dependency issues
+#Preview {
+    CaptureToolbar()
+    .environmentObject(Camera())
+}