From bf8287a0a663048aeff2aaf079202b96cc9e0721 Mon Sep 17 00:00:00 2001 From: cc Date: Wed, 20 Aug 2025 20:31:50 -0700 Subject: Add dilation funcitonality to compressed representation --- src/label_formats/label_format.rs | 109 ++++++++++++++++++++++++++++++++ src/label_formats/large_label_format.rs | 38 +++++------ src/label_formats/mod.rs | 1 - 3 files changed, 129 insertions(+), 19 deletions(-) (limited to 'src/label_formats') diff --git a/src/label_formats/label_format.rs b/src/label_formats/label_format.rs index 0f33932..6407097 100644 --- a/src/label_formats/label_format.rs +++ b/src/label_formats/label_format.rs @@ -3,3 +3,112 @@ pub struct LabelFormat { pub width: usize, pub height: usize, } + +impl LabelFormat { + pub fn get_left(&self, x: usize, y: usize) -> Option { + if x > 0 { + return Some(self.buffer[(x-1) + y * self.width]); + } + return None; + } + + pub fn get_right(&self, x: usize, y: usize) -> Option { + if (x+1) < self.width { + return Some(self.buffer[(x+1) + y * self.width]); + } + return None; + } + + pub fn get_up(&self, x: usize, y: usize) -> Option { + if y > 0 { + return Some(self.buffer[x + (y-1) * self.width]); + } + return None; + } + + pub fn get_down(&self, x: usize, y: usize) -> Option { + if (y+1) < self.height { + return Some(self.buffer[x + (y+1) * self.width]); + } + return None; + } + + pub fn display(&self, include_space: bool) { + for y in 0..self.height { + for x in 0..self.width { + print!("{:04X}", self.buffer[x + y*self.width]); + if include_space { + print!(" "); + } + } + println!(); + } + } + + pub fn dilate(&self) -> LabelFormat { + let width = self.width; + let height = self.height; + let mut output_buffer = vec![0u16; width*height]; + for y in 0..height { + for x in 0..width { + let index = x + y * width; + let current_color = self.buffer[index]; + if current_color != 0 { + output_buffer[index] = current_color; + continue; + } + if let Some(color) = self.get_up(x,y) { + if color != 0 { + output_buffer[index] = color; + continue; + } + } + if let Some(color) = self.get_right(x,y) { + if color != 0 { + output_buffer[index] = color; + continue; + } + } + if let Some(color) = self.get_down(x,y) { + if color != 0 { + output_buffer[index] = color; + continue; + } + } + if let Some(color) = self.get_left(x,y) { + if color != 0 { + output_buffer[index] = color; + continue; + } + } + } + } + LabelFormat { + buffer: output_buffer, + width, + height, + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn dilation_test() { + const DIM: usize = 6; + let mut test_data = LabelFormat { + buffer: vec![0u16; DIM*DIM], + width: DIM, + height: DIM, + }; + + test_data.buffer[2+3*DIM] = 1; + test_data.buffer[3+3*DIM] = 1; + test_data.display(true); + println!(); + let dilated = test_data.dilate(); + dilated.display(true); + } +} diff --git a/src/label_formats/large_label_format.rs b/src/label_formats/large_label_format.rs index f717ac5..244c7d3 100644 --- a/src/label_formats/large_label_format.rs +++ b/src/label_formats/large_label_format.rs @@ -42,25 +42,27 @@ fn flood(source: &LargeLabelFormat, destination: &mut Vec, } } -pub fn compress_large_labels(largelabels: LargeLabelFormat) -> LabelFormat { - let mut label: u16 = 1; - let mut output_buffer: Vec = vec![0u16; largelabels.buffer.len()]; - for y in 0..largelabels.height { - for x in 0..largelabels.width { - let index = x + y*largelabels.width; - if largelabels.buffer[index] == 0 { - continue; - } - if output_buffer[index] == 0 { - let color = largelabels.buffer[index]; - flood(&largelabels, &mut output_buffer, x, y, color, label); - label += 1; +impl LargeLabelFormat { + pub fn compress(&self) -> LabelFormat { + let mut label: u16 = 1; + let mut output_buffer: Vec = vec![0u16; self.buffer.len()]; + for y in 0..self.height { + for x in 0..self.width { + let index = x + y*self.width; + if self.buffer[index] == 0 { + continue; + } + if output_buffer[index] == 0 { + let color = self.buffer[index]; + flood(&self, &mut output_buffer, x, y, color, label); + label += 1; + } } } + return LabelFormat { + buffer: output_buffer, + width: self.width, + height: self.height, + }; } - return LabelFormat { - buffer: output_buffer, - width: largelabels.width, - height: largelabels.height, - }; } diff --git a/src/label_formats/mod.rs b/src/label_formats/mod.rs index 7386df8..1e3e4ae 100644 --- a/src/label_formats/mod.rs +++ b/src/label_formats/mod.rs @@ -2,5 +2,4 @@ mod large_label_format; mod label_format; pub use large_label_format::LargeLabelFormat; -pub use large_label_format::compress_large_labels; pub use label_format::LabelFormat; -- cgit v1.2.1