Separate text evidence selection from report formatting
This commit is contained in:
parent
f3275fc161
commit
852660bcc6
1 changed files with 139 additions and 81 deletions
|
|
@ -16,6 +16,104 @@ pub struct DisplayFilter {
|
|||
pub layer: Option<Layer>,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub(super) struct TextSelection<'a> {
|
||||
pub removed_cells: Vec<&'a str>,
|
||||
pub added_cells: Vec<&'a str>,
|
||||
pub modified_cells: Vec<TextCellSelection<'a>>,
|
||||
pub filtered_objects: usize,
|
||||
pub limited_objects: usize,
|
||||
pub filtered_cells: usize,
|
||||
}
|
||||
|
||||
pub(super) struct TextCellSelection<'a> {
|
||||
pub cell: &'a CellChange,
|
||||
pub attributes_changed: bool,
|
||||
pub replacements: Vec<(&'a ObjectChange, &'a ObjectChange)>,
|
||||
pub removed: Vec<&'a ObjectChange>,
|
||||
pub added: Vec<&'a ObjectChange>,
|
||||
}
|
||||
|
||||
impl<'a> TextSelection<'a> {
|
||||
pub fn new(cells: &'a [CellChange], show: &DisplayFilter, mut remaining: usize) -> Self {
|
||||
let mut selection = Self::default();
|
||||
let visible =
|
||||
|object: &ObjectChange| show.layer.is_none_or(|layer| object.layer == Some(layer));
|
||||
for cell in cells {
|
||||
let marker = cell_marker(cell.old.is_some(), cell.new.is_some());
|
||||
let attributes_changed = marker == '*' && cell.attributes_changed();
|
||||
if show.cell.as_ref().is_some_and(|name| name != &cell.name) {
|
||||
selection.filtered_cells += usize::from(marker != '*' || attributes_changed);
|
||||
if marker == '*' {
|
||||
selection.filtered_objects += cell.removed.len() + cell.added.len();
|
||||
}
|
||||
continue;
|
||||
}
|
||||
match marker {
|
||||
'-' => {
|
||||
selection.removed_cells.push(&cell.name);
|
||||
continue;
|
||||
}
|
||||
'+' => {
|
||||
selection.added_cells.push(&cell.name);
|
||||
continue;
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
|
||||
let mut selected = TextCellSelection {
|
||||
cell,
|
||||
attributes_changed,
|
||||
replacements: Vec::new(),
|
||||
removed: Vec::new(),
|
||||
added: Vec::new(),
|
||||
};
|
||||
let mut paired_old = BTreeSet::new();
|
||||
let mut paired_new = BTreeSet::new();
|
||||
for pair in &cell.replacements {
|
||||
let old = &cell.removed[pair.removed];
|
||||
let new = &cell.added[pair.added];
|
||||
if visible(old) && visible(new) {
|
||||
paired_old.insert(pair.removed);
|
||||
paired_new.insert(pair.added);
|
||||
if remaining >= 2 {
|
||||
selected.replacements.push((old, new));
|
||||
remaining -= 2;
|
||||
} else {
|
||||
selection.limited_objects += 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
// A layer filter may leave one side of a pair eligible on its own.
|
||||
for (objects, paired, selected) in [
|
||||
(&cell.removed, &paired_old, &mut selected.removed),
|
||||
(&cell.added, &paired_new, &mut selected.added),
|
||||
] {
|
||||
for (index, object) in objects.iter().enumerate() {
|
||||
if !visible(object) {
|
||||
selection.filtered_objects += 1;
|
||||
} else if !paired.contains(&index) {
|
||||
if remaining == 0 {
|
||||
selection.limited_objects += 1;
|
||||
} else {
|
||||
selected.push(object);
|
||||
remaining -= 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if attributes_changed
|
||||
|| !selected.replacements.is_empty()
|
||||
|| !selected.removed.is_empty()
|
||||
|| !selected.added.is_empty()
|
||||
{
|
||||
selection.modified_cells.push(selected);
|
||||
}
|
||||
}
|
||||
selection
|
||||
}
|
||||
}
|
||||
|
||||
impl Scope {
|
||||
pub(super) fn write_restrictions(&self, out: &mut String) {
|
||||
if self == &Self::default() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue