sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-04 21:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix to avoid scanning with guide box

Browse source
This commit is contained in:
Craig Raw 2021-11-08 11:49:17 +02:00
parent 7272de90f0
commit 8ae3399d56
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java
View file

@ -92,17 +92,20 @@ public class WebcamService extends ScheduledService<Image> {
opening.set(false); opening.set(false);
} }
BufferedImage bimg = cam.getImage(); BufferedImage originalImage = cam.getImage();
if(bimg == null) { if(originalImage == null) {
return null; return null;
} }
BufferedImage croppedImage = getCroppedImage(bimg);
Image image = SwingFXUtils.toFXImage(bimg, null); CroppedDimension cropped = getCroppedDimension(originalImage);
BufferedImage croppedImage = originalImage.getSubimage(cropped.x, cropped.y, cropped.length, cropped.length);
BufferedImage framedImage = getFramedImage(originalImage, cropped);
Image image = SwingFXUtils.toFXImage(framedImage, null);
updateValue(image); updateValue(image);
if(System.currentTimeMillis() > (lastQrSampleTime + QR_SAMPLE_PERIOD_MILLIS)) { if(System.currentTimeMillis() > (lastQrSampleTime + QR_SAMPLE_PERIOD_MILLIS)) {
readQR(bimg, croppedImage); readQR(originalImage, croppedImage);
lastQrSampleTime = System.currentTimeMillis(); lastQrSampleTime = System.currentTimeMillis();
} }
@ -152,20 +155,24 @@ public class WebcamService extends ScheduledService<Image> {
} }
} }
private BufferedImage getCroppedImage(BufferedImage bufferedImage) { private BufferedImage getFramedImage(BufferedImage image, CroppedDimension cropped) {
BufferedImage clone = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_RGB);
Graphics2D g2d = (Graphics2D)clone.getGraphics();
g2d.drawImage(image, 0, 0, null);
float[] dash1 = {10.0f};
g2d.setColor(Color.BLACK);
g2d.setStroke(new BasicStroke(resolution == WebcamResolution.HD ? 3.0f : 1.5f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f));
g2d.draw(new RoundRectangle2D.Double(cropped.x, cropped.y, cropped.length, cropped.length, 10, 10));
g2d.dispose();
return clone;
}
private CroppedDimension getCroppedDimension(BufferedImage bufferedImage) {
int dimension = Math.min(bufferedImage.getWidth(), bufferedImage.getHeight()); int dimension = Math.min(bufferedImage.getWidth(), bufferedImage.getHeight());
int squareSize = dimension / 2; int squareSize = dimension / 2;
int x = (bufferedImage.getWidth() - squareSize) / 2; int x = (bufferedImage.getWidth() - squareSize) / 2;
int y = (bufferedImage.getHeight() - squareSize) / 2; int y = (bufferedImage.getHeight() - squareSize) / 2;
return new CroppedDimension(x, y, squareSize);
Graphics2D g2d = (Graphics2D)bufferedImage.getGraphics();
float[] dash1 = {10.0f};
g2d.setColor(Color.BLACK);
g2d.setStroke(new BasicStroke(resolution == WebcamResolution.HD ? 3.0f : 1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f));
g2d.draw(new RoundRectangle2D.Double(x, y, squareSize, squareSize, 10, 10));
g2d.dispose();
return bufferedImage.getSubimage(x, y, squareSize, squareSize);
} }
public Result getResult() { public Result getResult() {
@ -203,4 +210,16 @@ public class WebcamService extends ScheduledService<Image> {
public BooleanProperty openingProperty() { public BooleanProperty openingProperty() {
return opening; return opening;
} }
private static class CroppedDimension {
public int x;
public int y;
public int length;
public CroppedDimension(int x, int y, int length) {
this.x = x;
this.y = y;
this.length = length;
}
}
} }