Compare commits

...
1 Commits
Author SHA1 Message Date
TZGyn c9447d2a8b Make Kapture screenshot-first with marquee text selection
The result window now works like a screenshot tool: drag on the image to
select a region, then click Get Selection Text to OCR only that area
(full-image OCR stays as Get All Text). Selection is rendered in image
coordinates so it stays accurate at any window size.

💘 Generated with Crush

Assisted-by: Crush:deepseek-v4-flash-0731
2026-08-12 21:06:09 +08:00
2 changed files with 123 additions and 18 deletions
+121 -16
View File
@@ -88,6 +88,8 @@ final class CaptureModel: ObservableObject {
@Published var extractedText: String? @Published var extractedText: String?
@Published var isOCRRunning = false @Published var isOCRRunning = false
@Published var statusMessage: String? @Published var statusMessage: String?
/// Drag selection rect in IMAGE point space (nil = none)
@Published var selection: CGRect?
enum CaptureMode { enum CaptureMode {
case screenshot case screenshot
@@ -98,24 +100,43 @@ final class CaptureModel: ObservableObject {
self.image = image self.image = image
} }
var hasSelection: Bool { selection != nil && selection!.width >= 2 && selection!.height >= 2 }
var displayText: String { var displayText: String {
if isOCRRunning { if isOCRRunning {
return "Recognizing text…" return "Recognizing text…"
} }
return extractedText ?? "Text appears here — click “Get Text”." return extractedText ?? "Select text in the screenshot, then click “Get Text”."
} }
func runOCR() { func cropImage(to rectInImage: CGRect) -> CGImage? {
return image.cropping(to: rectInImage)
}
func runOCR(over selectionOnly: CGRect? = nil) {
guard !isOCRRunning else { return } guard !isOCRRunning else { return }
isOCRRunning = true isOCRRunning = true
statusMessage = nil statusMessage = nil
OCRService.shared.recognize(image) { [weak self] text in
let targetImage: CGImage
if let sel = selectionOnly {
guard let cropped = image.cropping(to: sel) else {
self.isOCRRunning = false
self.statusMessage = "Selection too small."
return
}
targetImage = cropped
} else {
targetImage = image
}
OCRService.shared.recognize(targetImage) { [weak self] text in
Task { @MainActor in Task { @MainActor in
guard let self else { return } guard let self else { return }
self.isOCRRunning = false self.isOCRRunning = false
self.mode = .text self.mode = .text
if text.isEmpty { if text.isEmpty {
self.extractedText = "No text found in the screenshot." self.extractedText = "No text found in the selection."
} else { } else {
self.extractedText = text self.extractedText = text
let pasteboard = NSPasteboard.general let pasteboard = NSPasteboard.general
@@ -127,6 +148,11 @@ final class CaptureModel: ObservableObject {
} }
} }
func runOCRSelection() {
guard let sel = selection, hasSelection else { return }
runOCR(over: sel)
}
func copyText() { func copyText() {
guard let text = extractedText else { return } guard let text = extractedText else { return }
let pasteboard = NSPasteboard.general let pasteboard = NSPasteboard.general
@@ -185,24 +211,23 @@ struct ResultView: View {
Spacer() Spacer()
Button("Copy Image") { model.copyImage() } Button("Copy Image") { model.copyImage() }
Button("Save PNG…") { model.savePNG() } Button("Save PNG…") { model.savePNG() }
Button("Get Text") { model.runOCR() } if model.hasSelection {
.disabled(model.isOCRRunning || model.extractedText != nil) Button("Get Selection Text") { model.runOCRSelection() }
.disabled(model.isOCRRunning)
.help("Recognize text inside the selected region")
}
Button("Get All Text") { model.runOCR() }
.disabled(model.isOCRRunning)
.help("Recognize all text in the screenshot")
Button("Close") { onClose() } Button("Close") { onClose() }
} }
.padding(.horizontal, 12) .padding(.horizontal, 12)
.padding(.top, 10) .padding(.top, 10)
if model.mode == .screenshot { if model.mode == .screenshot {
GeometryReader { geo in ScreenshotPane(model: model)
let imageWidth = CGFloat(model.image.width) .border(Color.secondary.opacity(0.4))
Image(nsImage: NSImage(cgImage: model.image, size: .zero)) .padding(.horizontal, 12)
.resizable()
// Downscale with smoothing (AA); upscale keeps pixels crisp.
.interpolation(imageWidth >= geo.size.width ? .high : .none)
.aspectRatio(contentMode: .fit)
}
.border(Color.secondary.opacity(0.4))
.padding(.horizontal, 12)
} else { } else {
ZStack(alignment: .bottomTrailing) { ZStack(alignment: .bottomTrailing) {
ScrollView { ScrollView {
@@ -241,3 +266,83 @@ struct ResultView: View {
.frame(minWidth: 480, minHeight: 380) .frame(minWidth: 480, minHeight: 380)
} }
} }
struct ScreenshotPane: View {
@ObservedObject var model: CaptureModel
private var imageSize: CGSize {
CGSize(width: model.image.width, height: model.image.height)
}
private func geometry(for geo: GeometryProxy) -> (scale: CGFloat, drawSize: CGSize, origin: CGPoint) {
let size = imageSize
let scale = min(geo.size.width / size.width, geo.size.height / size.height)
let drawSize = CGSize(width: size.width * scale, height: size.height * scale)
let origin = CGPoint(
x: (geo.size.width - drawSize.width) / 2,
y: (geo.size.height - drawSize.height) / 2
)
return (scale, drawSize, origin)
}
private func toImagePoint(_ viewPoint: CGPoint, scale: CGFloat, origin: CGPoint) -> CGPoint {
CGPoint(
x: (viewPoint.x - origin.x) / scale,
y: (viewPoint.y - origin.y) / scale
)
}
private func clampSelection(_ rect: CGRect) -> CGRect {
rect.intersection(CGRect(origin: .zero, size: imageSize))
}
var body: some View {
GeometryReader { geo in
let (scale, drawSize, origin) = geometry(for: geo)
ZStack {
Image(nsImage: NSImage(cgImage: model.image, size: .zero))
.resizable()
.interpolation(imageSize.width >= geo.size.width ? .high : .none)
.aspectRatio(contentMode: .fit)
.frame(width: drawSize.width, height: drawSize.height)
.position(x: origin.x + drawSize.width / 2, y: origin.y + drawSize.height / 2)
if let sel = model.selection {
let viewRect = CGRect(
x: origin.x + sel.minX * scale,
y: origin.y + sel.minY * scale,
width: sel.width * scale,
height: sel.height * scale
)
Rectangle()
.fill(Color.accentColor.opacity(0.15))
.border(Color.accentColor, width: 1.5)
.frame(width: viewRect.width, height: viewRect.height)
.position(x: viewRect.midX, y: viewRect.midY)
.allowsHitTesting(false)
}
}
.contentShape(Rectangle())
.gesture(
DragGesture(minimumDistance: 0)
.onChanged { value in
let start = toImagePoint(value.startLocation, scale: scale, origin: origin)
let current = toImagePoint(value.location, scale: scale, origin: origin)
let rect = CGRect(
x: min(start.x, current.x),
y: min(start.y, current.y),
width: abs(current.x - start.x),
height: abs(current.y - start.y)
)
model.selection = clampSelection(rect)
}
.onEnded { _ in
if let s = model.selection, (s.width < 2 || s.height < 2) {
model.selection = nil
}
}
)
}
}
}
+2 -2
View File
@@ -108,9 +108,9 @@ cat > "$APP/Contents/Info.plist" <<'PLIST'
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Icon</string> <string>Icon</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.1.8</string> <string>1.2.0</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>18</string> <string>20</string>
<key>LSUIElement</key> <key>LSUIElement</key>
<true/> <true/>
<key>NSHighResolutionCapable</key> <key>NSHighResolutionCapable</key>