fix: support formats for analyze image #1177
Merged
+352
−142
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
navaronbracke
commented
Sep 10, 2024
| | analyzeImage (Gallery) | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | | ||
| | returnImage | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | | ||
| | analyzeImage (Gallery) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | | ||
| | returnImage | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | |
There was a problem hiding this comment.
I forgot to update this one for returnImage
navaronbracke
commented
Sep 10, 2024
| @@ -134,16 +134,7 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin { | |||
| self.mobileScanner.timeoutSeconds = Double(timeoutMs) / Double(1000) | |||
| MobileScannerPlugin.returnImage = returnImage | |||
|
|
|||
| let formatList = formats.map { format in return BarcodeFormat(rawValue: format)} | |||
There was a problem hiding this comment.
This was refactored & moved to reuse it
navaronbracke
commented
Sep 10, 2024
| "rawValue": self.payloadStringValue ?? "", | ||
| "format": self.symbology.toInt ?? -1, | ||
| "corners": [ | ||
| ["x": topLeft.x, "y": topLeft.y], |
There was a problem hiding this comment.
The VNBarcodeResult had these corner points, but we did not pass them through
navaronbracke
commented
Sep 10, 2024
| let symbologies:[VNBarcodeSymbology] = argReader.toSymbology() | ||
|
|
||
| guard let fileUrl: URL = URL(string: argReader.string(key: "filePath") ?? "") else { | ||
| // TODO: fix error code |
There was a problem hiding this comment.
I will unify the error codes in a follow up PR
navaronbracke
commented
Sep 10, 2024
| formats.removeWhere((element) => element == BarcodeFormat.unknown); | ||
| } | ||
| final List<BarcodeFormat> formats = [ | ||
| for (final BarcodeFormat format in options.formats) |
There was a problem hiding this comment.
for literal to optimize away the remove where
navaronbracke
commented
Sep 10, 2024
| return const SizedBox(); | ||
| } | ||
|
|
||
| return CustomPaint( | ||
| painter: BarcodeOverlay( | ||
| barcodeCorners: scannedBarcode.corners, | ||
| barcodeSize: barcodeCapture.size, | ||
| barcodeSize: scannedBarcode.size, |
There was a problem hiding this comment.
The "barcode size" is wrong here
navaronbracke
commented
Sep 10, 2024
| @@ -151,28 +151,16 @@ class MobileScannerHandler( | |||
| null | |||
| } | |||
|
|
|||
| var barcodeScannerOptions: BarcodeScannerOptions? = null | |||
There was a problem hiding this comment.
This was refactored & moved to reuse it.
navaronbracke
commented
Sep 10, 2024
|
|
||
| val position = | ||
| if (facing == 0) CameraSelector.DEFAULT_FRONT_CAMERA else CameraSelector.DEFAULT_BACK_CAMERA | ||
|
|
||
| val detectionSpeed: DetectionSpeed = if (speed == 0) DetectionSpeed.NO_DUPLICATES | ||
| else if (speed ==1) DetectionSpeed.NORMAL else DetectionSpeed.UNRESTRICTED | ||
| val detectionSpeed: DetectionSpeed = when (speed) { |
There was a problem hiding this comment.
This was a refactor that was proposed by the Kotlin language tooling
navaronbracke
commented
Sep 10, 2024
| /// Barcode scanner for results | ||
| var scanner = BarcodeScanner.barcodeScanner() | ||
| /// The long lived barcode scanner for scanning barcodes from a camera preview. | ||
| var scanner: BarcodeScanner? = nil |
navaronbracke
commented
Sep 10, 2024
| let image = VisionImage(image: image) | ||
| image.orientation = imageOrientation( | ||
| deviceOrientation: UIDevice.current.orientation, | ||
| defaultOrientation: .portrait, | ||
| position: position | ||
| ) | ||
|
|
||
| let scanner: BarcodeScanner = barcodeScannerOptions != nil ? BarcodeScanner.barcodeScanner(options: barcodeScannerOptions!) : BarcodeScanner.barcodeScanner() |
There was a problem hiding this comment.
Create a short lived scanner for the analyze image call
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for specifying the formats for analyze image.
It also adds the (normalized) barcode size for the barcodes on the web and adds support for analyze image on MacOS.
Fixes #1069