Mark
/
daisy
mirror of https://github.com/rm-dr/daisy
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved unit printing

pull/2/head
Mark 2023-04-10 14:02:11 -07:00
parent 775d85b170
commit e2fd61a2ef
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/quantity/unit.rs
View File

@ -32,6 +32,17 @@ impl ToString for Unit {
fn to_string(&self) -> String { fn to_string(&self) -> String {
if self.unitless() { return String::new(); }; if self.unitless() { return String::new(); };
let mut top_empty = true;
let mut bottom_empty = true;
for (_, p) in &self.val {
if *p > 0f64 {
top_empty = false;
} else {
bottom_empty = false;
}
};
let mut t = String::new(); let mut t = String::new();
let mut b = String::new(); let mut b = String::new();
@ -47,19 +58,31 @@ impl ToString for Unit {
}; };
if *p == 1f64 { if *p == 1f64 {
t.push_str(&format!("{c}")); t.push_str(&format!("{c}·"));
} else if *p == -1f64 { } else if *p == -1f64 {
b.push_str(&format!("{c}")); if top_empty {
} else if *p > 0f64 { b.push_str(&format!("{c}⁻¹·"));
t.push_str(&format!("{c}^{p}"));
} else { } else {
b.push_str(&format!("{c}^{}", -p)); b.push_str(&format!("{c}·"));
}
} else if *p > 0f64 {
t.push_str(&format!("{c}^{p}·"));
} else {
if top_empty {
b.push_str(&format!("{c}^{}·", p));
} else {
b.push_str(&format!("{c}^{}·", -p));
}
} }
}; };
if b.len() != 0 { if top_empty {
format!("{t}/{b}") format!("{}", &b[..b.len()-2]) // Slice cuts off the last `·` (2 bytes)
} else {t} } else if bottom_empty {
format!("{}", &t[..t.len()-2])
} else {
format!("{}/{}", &t[..t.len()-2], &b[..b.len()-2])
}
} }
} }