arnekeller/kv
1
0
Fork 0
mirror of https://gitlab.kit.edu/uskyk/kv.git synced 2024-11-24 09:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix display issue with >= 5 variables

Browse Source 
Previously, the initial window would be too small.

Resolves #2
This commit is contained in:
Arne Keller 2023-11-09 11:36:14 +01:00
parent 77805f75cf
commit 07e0ce40c4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/svg.rs
View File

@ -7,10 +7,11 @@ const SIZE_FACTOR: usize = 64;
fn main() { fn main() {
let args = args().collect::<Vec<_>>(); let args = args().collect::<Vec<_>>();
let vars = [A, B, C, D]; let vars = [A, B, C, D, E];
//let function = vec![0, 0, 1, 1, 1, 1, 1, 0].into_iter().map(Into::into).collect(); //let function = vec![0, 0, 1, 1, 1, 1, 1, 0].into_iter().map(Into::into).collect();
//let function = vec![0, 0, 1, 1, 1, 1, 1, 2].into_iter().map(Into::into).collect(); //let function = vec![0, 0, 1, 1, 1, 1, 1, 2].into_iter().map(Into::into).collect();
let function = parse_function("-1111000-1-01---"); //let function = parse_function("-1111000-1-01---");
let function = parse_function("11101111111111111111101111111101");
let groups = find_groups(&function, &vars, One); let groups = find_groups(&function, &vars, One);
eprintln!("all:"); eprintln!("all:");
for x in &groups { for x in &groups {
@ -45,5 +46,5 @@ fn main() {
.collect() .collect()
}; };
println!("{}", svg::get_svg(SIZE_FACTOR, false, &function, &vars, &block_masks)); println!("{}", svg::get_svg(SIZE_FACTOR, true, &function, &vars, &block_masks));
} }

3
src/ui/svg.rs
View File

@ -74,7 +74,8 @@ pub fn get_svg(size_factor: usize, print_labels: bool,
if print_labels { if print_labels {
for i in 0..vars.len() { for i in 0..vars.len() {
let offset = (i / 4) as f32 * size2 + size16; let offset = (i / 4) as f32 * size2 + size16;
let initial_window = 2usize.pow(((i + 2) / 4) as u32); let initial_window = 2usize.pow((i / 2) as u32);
//eprintln!("i = {i}, offset = {offset}, initial_window = {initial_window}");
let mut start = vec![false; initial_window]; let mut start = vec![false; initial_window];
start.extend(vec![true; initial_window]); start.extend(vec![true; initial_window]);
let desired_len = if i % 2 == 0 { w } else { h }; let desired_len = if i % 2 == 0 { w } else { h };