ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

move from AztecPoint to Point

Browse Source
This commit is contained in:
Henry Schimke
2023-03-06 11:27:24 -06:00
parent 3f723157b6
commit fe8f89cd29
3 changed files with 93 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/aztec/DetectorTest.rs
View File

@@ -36,10 +36,10 @@
use rand::Rng; use rand::Rng;
use crate::{aztec::decoder, common::BitMatrix, exceptions::Exceptions}; use crate::{aztec::decoder, common::BitMatrix, exceptions::Exceptions, Point};
use super::{ use super::{
detector::{self, AztecPoint, Detector}, detector::{self, Detector},
encoder::{self, AztecCode}, encoder::{self, AztecCode},
}; };
@@ -102,29 +102,29 @@ fn test_error_in_parameter_locator(data: &str) {
clone(&matrix) clone(&matrix)
}; };
copy.flip_coords( copy.flip_coords(
orientation_points (orientation_points
.get(error1) .get(error1)
.unwrap() .unwrap()
.get_x() .x as i32)
.unsigned_abs(), .unsigned_abs(),
orientation_points (orientation_points
.get(error1) .get(error1)
.unwrap() .unwrap()
.get_y() .y as i32)
.unsigned_abs(), .unsigned_abs(),
); );
if error2 > error1 { if error2 > error1 {
// if error2 == error1, we only test a single error // if error2 == error1, we only test a single error
copy.flip_coords( copy.flip_coords(
orientation_points (orientation_points
.get(error2) .get(error2)
.unwrap() .unwrap()
.get_x() .x as i32)
.unsigned_abs(), .unsigned_abs(),
orientation_points (orientation_points
.get(error2) .get(error2)
.unwrap() .unwrap()
.get_y() .y as i32)
.unsigned_abs(), .unsigned_abs(),
); );
} }
@@ -152,8 +152,8 @@ fn test_error_in_parameter_locator(data: &str) {
for error in errors { for error in errors {
// for (int error : errors) { // for (int error : errors) {
copy.flip_coords( copy.flip_coords(
orientation_points.get(error).unwrap().get_x() as u32, orientation_points.get(error).unwrap().x as u32,
orientation_points.get(error).unwrap().get_y() as u32, orientation_points.get(error).unwrap().y as u32,
); );
// copy.flip_coords( // copy.flip_coords(
// orientation_points.get(error).unwrap().get_x().abs() as u32, // orientation_points.get(error).unwrap().get_x().abs() as u32,
@@ -261,7 +261,7 @@ fn clone(input: &BitMatrix) -> BitMatrix {
result result
} }
fn get_orientation_points(code: &AztecCode) -> Vec<AztecPoint> { fn get_orientation_points(code: &AztecCode) -> Vec<Point> {
let center = code.getMatrix().getWidth() as i32 / 2; let center = code.getMatrix().getWidth() as i32 / 2;
let offset = if code.isCompact() { 5 } else { 7 }; let offset = if code.isCompact() { 5 } else { 7 };
let mut result = Vec::new(); let mut result = Vec::new();
@@ -271,18 +271,18 @@ fn get_orientation_points(code: &AztecCode) -> Vec<AztecPoint> {
let mut ySign: i32 = -1; let mut ySign: i32 = -1;
while ySign <= 1 { while ySign <= 1 {
// for (int ySign = -1; ySign <= 1; ySign += 2) { // for (int ySign = -1; ySign <= 1; ySign += 2) {
result.push(AztecPoint::new( result.push(Point::from((
center + xSign * offset, center + xSign * offset,
center + ySign * offset, center + ySign * offset,
)); )));
result.push(AztecPoint::new( result.push(Point::from((
center + xSign * (offset - 1), center + xSign * (offset - 1),
center + ySign * offset, center + ySign * offset,
)); )));
result.push(AztecPoint::new( result.push(Point::from((
center + xSign * offset, center + xSign * offset,
center + ySign * (offset - 1), center + ySign * (offset - 1),
)); )));
ySign += 2; ySign += 2;
} }

153
src/aztec/detector.rs
View File

@@ -14,8 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
use std::fmt;
use crate::{ use crate::{
common::{ common::{
detector::WhiteRectangleDetector, detector::WhiteRectangleDetector,
@@ -262,7 +260,7 @@ impl<'a> Detector<'_> {
* @return The corners of the bull-eye * @return The corners of the bull-eye
* @throws NotFoundException If no valid bull-eye can be found * @throws NotFoundException If no valid bull-eye can be found
*/ */
fn get_bulls_eye_corners(&mut self, pCenter: AztecPoint) -> Result<[Point; 4]> { fn get_bulls_eye_corners(&mut self, pCenter: Point) -> Result<[Point; 4]> {
let mut pina = pCenter; let mut pina = pCenter;
let mut pinb = pCenter; let mut pinb = pCenter;
let mut pinc = pCenter; let mut pinc = pCenter;
@@ -275,10 +273,10 @@ impl<'a> Detector<'_> {
while self.nb_center_layers < 9 { while self.nb_center_layers < 9 {
// for nbCenterLayers in 1..9 { // for nbCenterLayers in 1..9 {
// for (nbCenterLayers = 1; nbCenterLayers < 9; nbCenterLayers++) { // for (nbCenterLayers = 1; nbCenterLayers < 9; nbCenterLayers++) {
let pouta = self.get_first_different(&pina, color, 1, -1); let pouta = self.get_first_different(pina, color, 1, -1);
let poutb = self.get_first_different(&pinb, color, 1, 1); let poutb = self.get_first_different(pinb, color, 1, 1);
let poutc = self.get_first_different(&pinc, color, -1, 1); let poutc = self.get_first_different(pinc, color, -1, 1);
let poutd = self.get_first_different(&pind, color, -1, -1); let poutd = self.get_first_different(pind, color, -1, -1);
//d a //d a
// //
@@ -321,10 +319,10 @@ impl<'a> Detector<'_> {
// Expand the square by .5 pixel in each direction so that we're on the border // Expand the square by .5 pixel in each direction so that we're on the border
// between the white square and the black square // between the white square and the black square
let pinax = point(pina.get_x() as f32 + 0.5, pina.get_y() as f32 - 0.5); let pinax = point(pina.x as f32 + 0.5, pina.y as f32 - 0.5);
let pinbx = point(pinb.get_x() as f32 + 0.5, pinb.get_y() as f32 + 0.5); let pinbx = point(pinb.x as f32 + 0.5, pinb.y as f32 + 0.5);
let pincx = point(pinc.get_x() as f32 - 0.5, pinc.get_y() as f32 + 0.5); let pincx = point(pinc.x as f32 - 0.5, pinc.y as f32 + 0.5);
let pindx = point(pind.get_x() as f32 - 0.5, pind.get_y() as f32 - 0.5); let pindx = point(pind.x as f32 - 0.5, pind.y as f32 - 0.5);
// Expand the square so that its corners are the centers of the points // Expand the square so that its corners are the centers of the points
// just outside the bull's eye. // just outside the bull's eye.
@@ -340,7 +338,7 @@ impl<'a> Detector<'_> {
* *
* @return the center point * @return the center point
*/ */
fn get_matrix_center(&self) -> AztecPoint { fn get_matrix_center(&self) -> Point {
let mut point_a = Point::default(); let mut point_a = Point::default();
let mut point_b = Point::default(); let mut point_b = Point::default();
let mut point_c = Point::default(); let mut point_c = Point::default();
@@ -365,16 +363,16 @@ impl<'a> Detector<'_> {
let cx: i32 = (self.image.getWidth() / 2) as i32; let cx: i32 = (self.image.getWidth() / 2) as i32;
let cy: i32 = (self.image.getHeight() / 2) as i32; let cy: i32 = (self.image.getHeight() / 2) as i32;
point_a = self point_a = self
.get_first_different(&AztecPoint::new(cx + 7, cy - 7), false, 1, -1) .get_first_different(Point::from((cx + 7, cy - 7)), false, 1, -1)
.into(); .into();
point_b = self point_b = self
.get_first_different(&AztecPoint::new(cx + 7, cy + 7), false, 1, 1) .get_first_different(Point::from((cx + 7, cy + 7)), false, 1, 1)
.into(); .into();
point_c = self point_c = self
.get_first_different(&AztecPoint::new(cx - 7, cy + 7), false, -1, 1) .get_first_different(Point::from((cx - 7, cy + 7)), false, -1, 1)
.into(); .into();
point_d = self point_d = self
.get_first_different(&AztecPoint::new(cx - 7, cy - 7), false, -1, -1) .get_first_different(Point::from((cx - 7, cy - 7)), false, -1, -1)
.into(); .into();
} }
// try { // try {
@@ -419,16 +417,16 @@ impl<'a> Detector<'_> {
// In that case we try to expand the rectangle. // In that case we try to expand the rectangle.
if !fnd { if !fnd {
point_a = self point_a = self
.get_first_different(&AztecPoint::new(cx + 7, cy - 7), false, 1, -1) .get_first_different(Point::from((cx + 7, cy - 7)), false, 1, -1)
.into(); .into();
point_b = self point_b = self
.get_first_different(&AztecPoint::new(cx + 7, cy + 7), false, 1, 1) .get_first_different(Point::from((cx + 7, cy + 7)), false, 1, 1)
.into(); .into();
point_c = self point_c = self
.get_first_different(&AztecPoint::new(cx - 7, cy + 7), false, -1, 1) .get_first_different(Point::from((cx - 7, cy + 7)), false, -1, 1)
.into(); .into();
point_d = self point_d = self
.get_first_different(&AztecPoint::new(cx - 7, cy - 7), false, -1, -1) .get_first_different(Point::from((cx - 7, cy - 7)), false, -1, -1)
.into(); .into();
} }
// try { // try {
@@ -450,7 +448,7 @@ impl<'a> Detector<'_> {
cx = ((point_a.x + point_d.x + point_b.x + point_c.x) / 4.0).round() as i32; cx = ((point_a.x + point_d.x + point_b.x + point_c.x) / 4.0).round() as i32;
cy = ((point_a.y + point_d.y + point_b.y + point_c.y) / 4.0).round() as i32; cy = ((point_a.y + point_d.y + point_b.y + point_c.y) / 4.0).round() as i32;
AztecPoint::new(cx, cy) Point::from((cx, cy))
} }
/** /**
@@ -544,29 +542,29 @@ impl<'a> Detector<'_> {
*/ */
fn is_white_or_black_rectangle( fn is_white_or_black_rectangle(
&self, &self,
p1: &AztecPoint, p1: &Point,
p2: &AztecPoint, p2: &Point,
p3: &AztecPoint, p3: &Point,
p4: &AztecPoint, p4: &Point,
) -> bool { ) -> bool {
let corr = 3; let corr = 3.0;
let p1 = AztecPoint::new( let p1 = Point::new(
0.max(p1.get_x() - corr), 0_f32.max(p1.x - corr),
(self.image.getHeight() as i32 - 1).min(p1.get_y() + corr), (self.image.getHeight() as f32 - 1.0).min(p1.y + corr),
); );
// let p1 = point(Math.max(0, p1.getX() - corr), Math.min(image.getHeight() - 1, p1.getY() + corr)); // let p1 = point(Math.max(0, p1.getX() - corr), Math.min(image.getHeight() - 1, p1.getY() + corr));
let p2 = AztecPoint::new(0.max(p2.get_x() - corr), 0.max(p2.get_y() - corr)); let p2 = Point::new(0_f32.max(p2.x - corr), 0_f32.max(p2.y - corr));
// let p2 = point(Math.max(0, p2.getX() - corr), Math.max(0, p2.getY() - corr)); // let p2 = point(Math.max(0, p2.getX() - corr), Math.max(0, p2.getY() - corr));
let p3 = AztecPoint::new( let p3 = Point::new(
(self.image.getWidth() as i32 - 1).min(p3.get_x() + corr), (self.image.getWidth() as f32 - 1.0).min(p3.x + corr),
0.max((self.image.getHeight() as i32 - 1).min(p3.get_y() - corr)), 0_f32.max((self.image.getHeight() as f32 - 1.0).min(p3.y - corr)),
); );
// let p3 = point(Math.min(image.getWidth() - 1, p3.getX() + corr), // let p3 = point(Math.min(image.getWidth() - 1, p3.getX() + corr),
// Math.max(0, Math.min(image.getHeight() - 1, p3.getY() - corr))); // Math.max(0, Math.min(image.getHeight() - 1, p3.getY() - corr)));
let p4 = AztecPoint::new( let p4 = Point::new(
(self.image.getWidth() as i32 - 1).min(p4.get_x() + corr), (self.image.getWidth() as f32 - 1.0).min(p4.x + corr),
(self.image.getHeight() as i32 - 1).min(p4.get_y() + corr), (self.image.getHeight() as f32 - 1.0).min(p4.y + corr),
); );
// let p4 = point(Math.min(image.getWidth() - 1, p4.getX() + corr), // let p4 = point(Math.min(image.getWidth() - 1, p4.getX() + corr),
// Math.min(image.getHeight() - 1, p4.getY() + corr)); // Math.min(image.getHeight() - 1, p4.getY() + corr));
@@ -599,19 +597,19 @@ impl<'a> Detector<'_> {
* *
* @return 1 if segment more than 90% black, -1 if segment is more than 90% white, 0 else * @return 1 if segment more than 90% black, -1 if segment is more than 90% white, 0 else
*/ */
fn get_color(&self, p1: AztecPoint, p2: AztecPoint) -> i32 { fn get_color(&self, p1: Point, p2: Point) -> i32 {
let d = Self::distance_points(p1, p2); let d = Self::distance_points(p1, p2);
if d == 0.0 { if d == 0.0 {
return 0; return 0;
} }
let dx = (p2.get_x() - p1.get_x()) as f32 / d; let dx = (p2.x - p1.x) as f32 / d;
let dy = (p2.get_y() - p1.get_y()) as f32 / d; let dy = (p2.y - p1.y) as f32 / d;
let mut error = 0; let mut error = 0;
let mut px = p1.get_x() as f32; let mut px = p1.x as f32;
let mut py = p1.get_y() as f32; let mut py = p1.y as f32;
let color_model = self.image.get(p1.get_x() as u32, p1.get_y() as u32); let color_model = self.image.get(p1.x as u32, p1.y as u32);
let i_max = d.floor() as u32; //(int) Math.floor(d); let i_max = d.floor() as u32; //(int) Math.floor(d);
for _i in 0..i_max { for _i in 0..i_max {
@@ -640,29 +638,26 @@ impl<'a> Detector<'_> {
/** /**
* Gets the coordinate of the first point with a different color in the given direction * Gets the coordinate of the first point with a different color in the given direction
*/ */
fn get_first_different(&self, init: &AztecPoint, color: bool, dx: i32, dy: i32) -> AztecPoint { fn get_first_different(&self, init: Point, color: bool, dx: i32, dy: i32) -> Point {
let mut x = init.get_x() + dx; let mut point = init + Point::from((dx,dy));
let mut y = init.get_y() + dy;
while self.is_valid_points(x, y) && self.image.get(x as u32, y as u32) == color { while self.is_valid_points(point) && self.image.get(point.x as u32, point.y as u32) == color {
x += dx; point += Point::from((dx,dy));
y += dy;
} }
x -= dx; point -= Point::from((dx,dy));
y -= dy;
while self.is_valid_points(x, y) && self.image.get(x as u32, y as u32) == color { while self.is_valid_points(point) && self.image.get(point.x as u32, point.y as u32) == color {
x += dx; point.x += dx as f32;
} }
x -= dx; point.x -= dx as f32;
while self.is_valid_points(x, y) && self.image.get(x as u32, y as u32) == color { while self.is_valid_points(point) && self.image.get(point.x as u32, point.y as u32) == color {
y += dy; point.y += dy as f32;
} }
y -= dy; point.y -= dy as f32;
AztecPoint::new(x, y) point
} }
/** /**
@@ -689,17 +684,15 @@ impl<'a> Detector<'_> {
[result0, result1, result2, result3] [result0, result1, result2, result3]
} }
fn is_valid_points(&self, x: i32, y: i32) -> bool { fn is_valid_points(&self, p: Point) -> bool {
x >= 0 && x < self.image.getWidth() as i32 && y >= 0 && y < self.image.getHeight() as i32 p.x >= 0.0 && p.x < self.image.getWidth() as f32 && p.y >= 0.0 && p.y < self.image.getHeight() as f32
} }
fn is_valid(&self, point: Point) -> bool { fn is_valid(&self, point: Point) -> bool {
let x = point.x.round() as i32; self.is_valid_points(point.round())
let y = point.y.round() as i32;
self.is_valid_points(x, y)
} }
fn distance_points(a: AztecPoint, b: AztecPoint) -> f32 { fn distance_points(a: Point, b: Point) -> f32 {
Point::from(a).distance(b.into()) Point::from(a).distance(b.into())
} }
@@ -714,36 +707,4 @@ impl<'a> Detector<'_> {
4 * self.nb_layers + 2 * ((2 * self.nb_layers + 6) / 15) + 15 4 * self.nb_layers + 2 * ((2 * self.nb_layers + 6) / 15) + 15
} }
} }
} }
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
pub struct AztecPoint {
x: i32,
y: i32,
}
impl AztecPoint {
pub fn new(x: i32, y: i32) -> Self {
Self { x, y }
}
pub fn get_x(&self) -> i32 {
self.x
}
pub fn get_y(&self) -> i32 {
self.y
}
}
impl From<AztecPoint> for Point {
fn from(value: AztecPoint) -> Self {
point(value.x as f32, value.y as f32)
}
}
impl fmt::Display for AztecPoint {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "<{} {}>", &self.x, &self.y)
}
}

17
src/rxing_result_point.rs
View File

@@ -59,6 +59,13 @@ impl std::ops::AddAssign for Point {
} }
} }
impl std::ops::SubAssign for Point {
fn sub_assign(&mut self, rhs: Self) {
self.x = self.x - rhs.x;
self.y = self.y - rhs.y;
}
}
impl<'a> Sum<&'a Point> for Point { impl<'a> Sum<&'a Point> for Point {
fn sum<I: Iterator<Item = &'a Self>>(iter: I) -> Self { fn sum<I: Iterator<Item = &'a Self>>(iter: I) -> Self {
iter.fold(Self::default(), |acc, &p| acc + p) iter.fold(Self::default(), |acc, &p| acc + p)
@@ -226,6 +233,10 @@ impl Point {
Self::new(0.0, self.y) Self::new(0.0, self.y)
} }
} }
pub fn round(self) -> Self {
Self { x: self.x.round(), y: self.y.round() }
}
} }
impl From<&(f32, f32)> for Point { impl From<&(f32, f32)> for Point {
@@ -240,6 +251,12 @@ impl From<(f32, f32)> for Point {
} }
} }
impl From<(i32,i32)> for Point {
fn from(value: (i32,i32)) -> Self {
Self::new(value.0 as f32, value.1 as f32)
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::Point; use super::Point;