Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
26700c59f4 | ||
|
|
195c6a9b1f |
+25
-11
@@ -119,33 +119,47 @@ enum LoginItem {
|
||||
}
|
||||
}
|
||||
|
||||
func runOCRSelfTest() {
|
||||
let text = "Kapture OCR test 1234, hello world"
|
||||
let size = NSSize(width: 1600, height: 220)
|
||||
func renderTestImage(_ text: String, fontSize: CGFloat = 56) -> CGImage? {
|
||||
let size = NSSize(width: 1900, height: 220)
|
||||
guard let rep = NSBitmapImageRep(
|
||||
bitmapDataPlanes: nil, pixelsWide: Int(size.width), pixelsHigh: Int(size.height),
|
||||
bitsPerSample: 8, samplesPerPixel: 4, hasAlpha: true, isPlanar: false,
|
||||
colorSpaceName: .deviceRGB, bytesPerRow: 0, bitsPerPixel: 0
|
||||
) else { exit(1) }
|
||||
|
||||
) else { return nil }
|
||||
NSGraphicsContext.saveGraphicsState()
|
||||
NSGraphicsContext.current = NSGraphicsContext(bitmapImageRep: rep)
|
||||
NSColor.white.setFill()
|
||||
NSRect(origin: .zero, size: size).fill()
|
||||
let attrs: [NSAttributedString.Key: Any] = [
|
||||
.font: NSFont.boldSystemFont(ofSize: 56),
|
||||
.font: NSFont.systemFont(ofSize: fontSize),
|
||||
.foregroundColor: NSColor.black,
|
||||
]
|
||||
text.draw(at: NSPoint(x: 60, y: 75), withAttributes: attrs)
|
||||
NSGraphicsContext.restoreGraphicsState()
|
||||
return rep.cgImage
|
||||
}
|
||||
|
||||
guard let cgImage = rep.cgImage else { exit(1) }
|
||||
OCRService.shared.recognize(cgImage) { recognized in
|
||||
print("expected: \(text)")
|
||||
func runOCRSelfTest() {
|
||||
let cases: [(expected: String, contains: String)] = [
|
||||
("Kapture OCR test 1234, hello world", "Kapture OCR test 1234"),
|
||||
("你好世界,这是一个测试", "你好世界"),
|
||||
]
|
||||
var index = 0
|
||||
|
||||
func runNext() {
|
||||
guard index < cases.count else { exit(0) }
|
||||
let current = cases[index]
|
||||
index += 1
|
||||
guard let image = renderTestImage(current.expected) else { exit(1) }
|
||||
OCRService.shared.recognize(image) { recognized in
|
||||
print("case: \(current.expected)")
|
||||
print("got: \(recognized)")
|
||||
let ok = recognized == text
|
||||
let ok = recognized.contains(current.contains)
|
||||
print(ok ? "PASS" : "FAIL")
|
||||
exit(ok ? 0 : 1)
|
||||
if !ok { exit(1) }
|
||||
runNext()
|
||||
}
|
||||
}
|
||||
runNext()
|
||||
RunLoop.main.run()
|
||||
}
|
||||
|
||||
@@ -12,6 +12,11 @@ final class OCRService {
|
||||
request.recognitionLevel = .accurate
|
||||
request.usesLanguageCorrection = true
|
||||
request.recognitionLanguages = ["en-US", "zh-Hans", "zh-Hant", "ja-JP", "ko-KR"]
|
||||
// Without this, Vision defaults to the first listed language and
|
||||
// renders CJK as Latin garbage (verified: 你好世界 -> "177WR").
|
||||
if #available(macOS 13.0, *) {
|
||||
request.automaticallyDetectsLanguage = true
|
||||
}
|
||||
|
||||
let handler = VNImageRequestHandler(cgImage: cgImage, options: [:])
|
||||
do {
|
||||
|
||||
@@ -195,14 +195,15 @@ final class CaptureModel: ObservableObject {
|
||||
return rep.cgImage ?? image
|
||||
}
|
||||
|
||||
func addStroke(_ points: [CGPoint]) {
|
||||
/// `widthPx` is the stroke thickness in IMAGE PIXELS (the preview
|
||||
/// converts the slider value so exports match what was drawn).
|
||||
func addStroke(_ points: [CGPoint], widthPx: CGFloat) {
|
||||
guard points.count > 1 else { return }
|
||||
if tool == .redact {
|
||||
// Redaction: a filled black bar from start to end, as thick as the
|
||||
// current stroke width (drawn as a rect for clean edges).
|
||||
strokes.append(Stroke(points: points, width: max(strokeWidth, 12), color: .black, isRedaction: true))
|
||||
// Redaction: a filled black bar from start to end.
|
||||
strokes.append(Stroke(points: points, width: max(widthPx, 12), color: .black, isRedaction: true))
|
||||
} else {
|
||||
strokes.append(Stroke(points: points, width: strokeWidth, color: drawColor))
|
||||
strokes.append(Stroke(points: points, width: widthPx, color: drawColor))
|
||||
}
|
||||
redoStack = []
|
||||
}
|
||||
@@ -575,7 +576,8 @@ struct ScreenshotPane: View {
|
||||
for point in stroke.points.dropFirst() {
|
||||
path.addLine(to: CGPoint(x: origin.x + point.x * scale, y: origin.y + point.y * scale))
|
||||
}
|
||||
context.stroke(path, with: .color(Color(nsColor: stroke.color)), lineWidth: stroke.width)
|
||||
// stroke.width is in image pixels; scale to view points
|
||||
context.stroke(path, with: .color(Color(nsColor: stroke.color)), lineWidth: stroke.width * scale)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -636,7 +638,7 @@ struct ScreenshotPane: View {
|
||||
.onEnded { _ in
|
||||
if model.tool != .select {
|
||||
if currentStroke.count > 1 {
|
||||
model.addStroke(currentStroke)
|
||||
model.addStroke(currentStroke, widthPx: model.strokeWidth / max(scale, 0.01))
|
||||
}
|
||||
currentStroke = []
|
||||
} else {
|
||||
|
||||
+2
-2
@@ -108,9 +108,9 @@ cat > "$APP/Contents/Info.plist" <<'PLIST'
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>Icon</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.9.0</string>
|
||||
<string>1.9.2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>90</string>
|
||||
<string>92</string>
|
||||
<key>LSUIElement</key>
|
||||
<true/>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
|
||||
Reference in New Issue
Block a user