Skip to content

Commit 7c021de

Browse files
committed
Factor out creation of empty text face
1 parent 5a2ae4a commit 7c021de

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

src/repr/plot.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,7 @@ impl ContinuousRepresentation for Plot {
182182
let face_lines = if let Some(line_style) = &self.line_style {
183183
unimplemented!("Text rendering does not yet support line plots")
184184
} else {
185-
(0..face_height)
186-
.map(|_| " ".repeat(face_width as usize))
187-
.collect::<Vec<String>>()
188-
.join("\n")
185+
text_render::empty_face(face_width, face_height)
189186
};
190187
let face_points = if let Some(point_style) = &self.point_style {
191188
text_render::render_face_points(
@@ -197,10 +194,7 @@ impl ContinuousRepresentation for Plot {
197194
&point_style,
198195
)
199196
} else {
200-
(0..face_height)
201-
.map(|_| " ".repeat(face_width as usize))
202-
.collect::<Vec<String>>()
203-
.join("\n")
197+
text_render::empty_face(face_width, face_height)
204198
};
205199
text_render::overlay(&face_lines, &face_points, 0, 0)
206200
}

src/text_render.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,13 @@ pub fn overlay(under: &str, over: &str, x: i32, y: i32) -> String {
472472
out.join("\n")
473473
}
474474

475+
pub fn empty_face(width: u32, height: u32) -> String {
476+
(0..height)
477+
.map(|_| " ".repeat(width as usize))
478+
.collect::<Vec<String>>()
479+
.join("\n")
480+
}
481+
475482
#[cfg(test)]
476483
mod tests {
477484
use super::*;
@@ -690,4 +697,13 @@ mod tests {
690697
let r = "o#\n#o";
691698
assert_eq!(overlay(a, b, -1, -1), r);
692699
}
700+
701+
#[test]
702+
fn test_empty_face() {
703+
assert_eq!(empty_face(0, 0), "");
704+
assert_eq!(empty_face(1, 1), " ");
705+
assert_eq!(empty_face(2, 2), " \n ");
706+
assert_eq!(empty_face(2, 3), " \n \n ");
707+
assert_eq!(empty_face(4, 2), " \n ");
708+
}
693709
}

0 commit comments

Comments
 (0)