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

progress on passing tests

Browse Source
This commit is contained in:
Henry Schimke
2023-04-27 10:59:39 -05:00
parent 26109ab9ed
commit 6aee7a66b9
5 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/cpp_essentials/concentric_finder.rs
View File

@@ -5,9 +5,11 @@ use crate::{
},
BitMatrix, Quadrilateral,
},
point, Point,
point, Point, Exceptions,
};
use crate::common::Result;
use super::{
BitMatrixCursorTrait, EdgeTracer, FastEdgeToEdgeCounter, Pattern, RegressionLine,
RegressionLineTrait, UpdateMinMax, UpdateMinMaxFloat,
@@ -223,7 +225,7 @@ pub fn CenterOfRing(
neighbourMask |= 1
<< (4.0
+ Point::dot(
Point::round(Point::bresenhamDirection(cur.p() - center)),
Point::floor(Point::bresenhamDirection(cur.p() - center)),
point(1.0, 3.0),
)) as u32;
@@ -400,12 +402,27 @@ pub fn FitQadrilateralToPoints(center: Point, points: &mut [Point]) -> Option<Qu
points.iter().position(|p| *p == corners[3])?,
];
let lines = [
RegressionLine::with_point_slice(&points[corner_positions[0] + 1..corner_positions[1]]),
RegressionLine::with_point_slice(&points[corner_positions[1] + 1..corner_positions[2]]),
RegressionLine::with_point_slice(&points[corner_positions[2] + 1..corner_positions[3]]),
RegressionLine::with_point_slice(&points[corner_positions[3] + 1..points.len()]),
let try_get_range = |a:usize, b:usize| -> Option<&[Point]> {
if a > b {
None
}else{
Some(&points[a + 1..b])
}
};
let lines = [
RegressionLine::with_point_slice(try_get_range(corner_positions[0],corner_positions[1])?),
RegressionLine::with_point_slice(try_get_range(corner_positions[1],corner_positions[2])?),
RegressionLine::with_point_slice(try_get_range(corner_positions[2],corner_positions[3])?),
RegressionLine::with_point_slice(try_get_range(corner_positions[3],points.len())?),
];
// let lines = [
// RegressionLine::with_point_slice(&points[corner_positions[0] + 1..corner_positions[1]]),
// RegressionLine::with_point_slice(&points[corner_positions[1] + 1..corner_positions[2]]),
// RegressionLine::with_point_slice(&points[corner_positions[2] + 1..corner_positions[3]]),
// RegressionLine::with_point_slice(&points[corner_positions[3] + 1..points.len()]),
// ];
// std::array lines{RegressionLine{corners[0] + 1, corners[1]}, RegressionLine{corners[1] + 1, corners[2]},
// RegressionLine{corners[2] + 1, corners[3]}, RegressionLine{corners[3] + 1, &points.back() + 1}};
if lines.iter().any(|line| !line.isValid()) {

2
src/common/cpp_essentials/dm_regression_line.rs
View File

@@ -225,7 +225,7 @@ impl RegressionLineTrait for DMRegressionLine {
impl DMRegressionLine {
pub fn new(point_1: Point, point_2: Point) -> Self {
let mut new = Self::default();
RegressionLineTrait::evaluate(&mut new, &[point_1, point_1]);
RegressionLineTrait::evaluate(&mut new, &[point_1, point_2]);
new
}