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

qrcode suplemental pass

Browse Source
This commit is contained in:
Henry Schimke
2022-10-01 16:38:45 -05:00
parent e5abca3884
commit e42c3440be
2 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/qrcode/encoder/QRCodeTestCase.rs
View File

@@ -61,13 +61,7 @@ use super::QRCode;
fn testToString1() {
let qrCode = QRCode::new();
let expected =
"<<\n\
mode: null\n\
ecLevel: null\n\
version: null\n\
maskPattern: -1\n\
matrix: null\n\
>>\n";
"<<\n mode: null\n ecLevel: null\n version: null\n maskPattern: -1\n matrix: null\n>>\n";
assert_eq!(expected, qrCode.to_string());
}
@@ -87,32 +81,32 @@ use super::QRCode;
}
}
qrCode.setMatrix(matrix);
let expected = "<<\n\
mode: BYTE\n\
ecLevel: H\n\
version: 1\n\
maskPattern: 3\n\
matrix:\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
let expected = "<<\n \
mode: BYTE\n \
ecLevel: H\n \
version: 1\n \
maskPattern: 3\n \
matrix:\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
>>\n";
assert_eq!(expected, qrCode.to_string());

26
src/qrcode/encoder/qr_code.rs
View File

@@ -106,18 +106,36 @@ impl fmt::Display for QRCode {
let mut result = String::with_capacity(200);
result.push_str("<<\n");
result.push_str(" mode: ");
result.push_str(&format!("{:?}", self.mode));
if self.mode.is_some() {
result.push_str(&format!("{:?}",self.mode.as_ref().unwrap()));
}else {
result.push_str("null");
}
// result.push_str(&format!("{:?}", self.mode));
result.push_str("\n ecLevel: ");
result.push_str(&format!("{:?}", self.ecLevel));
if self.ecLevel.is_some() {
result.push_str(&format!("{:?}",self.ecLevel.as_ref().unwrap()));
}else {
result.push_str("null");
}
// result.push_str(&format!("{:?}", self.ecLevel));
result.push_str("\n version: ");
result.push_str(&format!("{}",self.version.as_ref().unwrap()));
if self.version.is_some() {
result.push_str(&format!("{}",self.version.as_ref().unwrap()));
}else {
result.push_str("null");
}
result.push_str("\n maskPattern: ");
result.push_str(&format!("{}",self.maskPattern));
if self.matrix.is_none() {
result.push_str("\n matrix: null\n");
} else {
result.push_str("\n matrix:\n");
result.push_str(&format!("{}",self.matrix.as_ref().unwrap()));
if self.matrix.is_some() {
result.push_str(&format!("{}",self.matrix.as_ref().unwrap()));
}else {
result.push_str("null");
}
}
result.push_str(">>\n");