fix issue with metadata testing

This commit is contained in:
Henry Schimke
2023-02-01 12:23:00 -06:00
parent d29fece8bf
commit fb60cfc5a3
12 changed files with 169 additions and 45 deletions

View File

@@ -39,6 +39,8 @@ pub struct DecoderRXingResult {
structuredAppendParity: i32,
structuredAppendSequenceNumber: i32,
symbologyModifier: u32,
contentType: String,
isMirrored: bool,
}
impl DecoderRXingResult {
@@ -48,7 +50,17 @@ impl DecoderRXingResult {
byteSegments: Vec<Vec<u8>>,
ecLevel: String,
) -> Self {
Self::with_all(rawBytes, text, byteSegments, ecLevel, -2, -2, 0)
Self::with_all(
rawBytes,
text,
byteSegments,
ecLevel,
-2,
-2,
0,
String::default(),
false,
)
}
pub fn with_symbology(
@@ -66,6 +78,8 @@ impl DecoderRXingResult {
-1,
-1,
symbologyModifier,
String::default(),
false,
)
}
@@ -85,6 +99,8 @@ impl DecoderRXingResult {
saSequence,
saParity,
0,
String::default(),
false,
)
}
@@ -96,6 +112,8 @@ impl DecoderRXingResult {
saSequence: i32,
saParity: i32,
symbologyModifier: u32,
contentType: String,
isMirrored: bool,
) -> Self {
let nb = rawBytes.len();
Self {
@@ -110,6 +128,8 @@ impl DecoderRXingResult {
structuredAppendParity: saParity,
structuredAppendSequenceNumber: saSequence,
symbologyModifier,
contentType,
isMirrored,
}
}
@@ -205,4 +225,20 @@ impl DecoderRXingResult {
pub fn getSymbologyModifier(&self) -> u32 {
self.symbologyModifier
}
pub fn getContentType(&self) -> &str {
&self.contentType
}
pub fn setContentType(&mut self, content_type: String) {
self.contentType = content_type
}
pub fn getIsMirrored(&self) -> bool {
self.isMirrored
}
pub fn setIsMirrored(&mut self, is_mirrored: bool) {
self.isMirrored = is_mirrored
}
}

View File

@@ -107,11 +107,11 @@ impl ECIStringBuilder {
self.encodeCurrentBytesIfAny();
if let Ok(character_set_eci) = CharacterSetECI::getCharacterSetECIByValue(value) {
dbg!(
character_set_eci,
CharacterSetECI::getCharset(&character_set_eci).name(),
CharacterSetECI::getCharset(&character_set_eci).whatwg_name()
);
// dbg!(
// character_set_eci,
// CharacterSetECI::getCharset(&character_set_eci).name(),
// CharacterSetECI::getCharset(&character_set_eci).whatwg_name()
// );
self.current_charset = Some(CharacterSetECI::getCharset(&character_set_eci));
} else {
self.current_charset = None