Skip to content

Skip 0 duration rects when generating output svg's #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skip 0 duration rects when generating output svg's #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 26 additions & 33 deletions src/statemap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,39 +641,35 @@ impl StatemapEntity {
} else {
x = globals.pixelWidth as f64;
}

println!(r##"<rect x="0" y="{}" width="{}"
height="{}" style="fill:{}" />"##, y, x, config.stripHeight,
config.background);

println!(r##"<g id="{}{}"><title>{} {}</title>"##,
globals.entityPrefix, self.name, globals.entityKind, self.name);

for i in 0..map.len() {
let rect = self.rects.get(&map[i]).unwrap().borrow();
let mut state = None;
let mut blended = false;
for rect_start in map {
let rect = self.rects[&rect_start].borrow();
if rect.duration == 0 {
// discard this rectangle since it has 0 width
continue;
Copy link
Author

@davidrusu davidrusu Oct 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only semantic change, rest is some cleanup

}

x = ((map[i] - globals.begin) as f64 /
x = ((rect_start - globals.begin) as f64 /
globals.timeWidth as f64) * globals.pixelWidth as f64;

for j in 0..rect.states.len() {
if rect.states[j] != 0 {
match state {
None => { state = Some(j) },
Some(_s) => {
blended = true;
break;
}
}
}
}
let states_held_in_rect: Vec<_> = rect.states
.iter()
.enumerate()
.filter(|(_, &t)| t > 0)
.collect();

if !blended {
assert!(state.is_some());
assert!(states_held_in_rect.len() > 0);

let mut datum = format!("{{ t: {}, s: {}", rect.start,
state.unwrap());
if states_held_in_rect.len() == 1 {
let state = states_held_in_rect[0].0;
let mut datum = format!("{{ t: {}, s: {}", rect.start, state);

output_tags(&rect, &mut datum);
datum.push_str("}");
Expand All @@ -683,30 +679,27 @@ impl StatemapEntity {
r##"height="{}" onclick="mapclick(evt, {})" "##,
r##"style="fill:{}" />"##),
x, y, rect_width(&rect), config.stripHeight,
data.len() - 1, colors[state.unwrap()]);
data.len() - 1, colors[state]);

continue;
}

let max = rect.states.iter().enumerate()
.max_by(|&(_, lhs), &(_, rhs)| lhs.cmp(rhs)).unwrap().0;
let max = states_held_in_rect.iter()
.max_by_key(|&(_, time_in_state)| time_in_state)
.unwrap().0;

let mut color = colors[max];
let mut datum = format!("{{ t: {}, s: {{ ", rect.start);
let mut comma = "";

for j in 0..rect.states.len() {
if rect.states[j] == 0 {
continue;
}

let ratio = rect.states[j] as f64 / rect.duration as f64;
for (state_id, time_in_state) in states_held_in_rect {
let ratio = *time_in_state as f64 / rect.duration as f64;

datum.push_str(&format!("{}'{}': {:.3}", comma, j, ratio));
datum.push_str(&format!("{}'{}': {:.3}", comma, state_id, ratio));
comma = ", ";

if j != max {
color = color.mix_nonlinear(&colors[j], ratio as f32);
if state_id != max {
color = color.mix_nonlinear(&colors[state_id], ratio as f32);
}
}

Expand Down