mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue 573 draw points correctly when preview/screen size differ

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1613 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-10-01 13:34:01 +00:00
parent 8f2ddd96e7
commit 85e933fb3c
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/src/com/google/zxing/client/android/ViewfinderView.java
View file

@ -89,7 +89,7 @@ public final class ViewfinderView extends View {
if (resultBitmap != null) { if (resultBitmap != null) {
// Draw the opaque result bitmap over the scanning rectangle // Draw the opaque result bitmap over the scanning rectangle
paint.setAlpha(OPAQUE); paint.setAlpha(OPAQUE);
canvas.drawBitmap(resultBitmap, frame.left, frame.top, paint); canvas.drawBitmap(resultBitmap, null, frame, paint);
} else { } else {
// Draw a two pixel solid black border inside the framing rect // Draw a two pixel solid black border inside the framing rect
@ -105,6 +105,10 @@ public final class ViewfinderView extends View {
scannerAlpha = (scannerAlpha + 1) % SCANNER_ALPHA.length; scannerAlpha = (scannerAlpha + 1) % SCANNER_ALPHA.length;
int middle = frame.height() / 2 + frame.top; int middle = frame.height() / 2 + frame.top;
canvas.drawRect(frame.left + 2, middle - 1, frame.right - 1, middle + 2, paint); canvas.drawRect(frame.left + 2, middle - 1, frame.right - 1, middle + 2, paint);
Rect previewFrame = CameraManager.get().getFramingRectInPreview();
float scaleX = frame.width() / (float) previewFrame.width();
float scaleY = frame.height() / (float) previewFrame.height();
Collection<ResultPoint> currentPossible = possibleResultPoints; Collection<ResultPoint> currentPossible = possibleResultPoints;
Collection<ResultPoint> currentLast = lastPossibleResultPoints; Collection<ResultPoint> currentLast = lastPossibleResultPoints;
@ -116,14 +120,18 @@ public final class ViewfinderView extends View {
paint.setAlpha(OPAQUE); paint.setAlpha(OPAQUE);
paint.setColor(resultPointColor); paint.setColor(resultPointColor);
for (ResultPoint point : currentPossible) { for (ResultPoint point : currentPossible) {
canvas.drawCircle(frame.left + point.getX(), frame.top + point.getY(), 6.0f, paint); canvas.drawCircle(frame.left + (int) (point.getX() * scaleX),
frame.top + (int) (point.getY() * scaleY),
6.0f, paint);
} }
} }
if (currentLast != null) { if (currentLast != null) {
paint.setAlpha(OPAQUE / 2); paint.setAlpha(OPAQUE / 2);
paint.setColor(resultPointColor); paint.setColor(resultPointColor);
for (ResultPoint point : currentLast) { for (ResultPoint point : currentLast) {
canvas.drawCircle(frame.left + point.getX(), frame.top + point.getY(), 3.0f, paint); canvas.drawCircle(frame.left + (int) (point.getX() * scaleX),
frame.top + (int) (point.getY() * scaleY),
3.0f, paint);
} }
} }