1
0
mirror of https://github.com/danog/libdvb.git synced 2024-11-26 20:04:39 +01:00

status display fix

This commit is contained in:
Andrey Dyldin 2020-10-26 14:28:59 +02:00
parent 68e4f734bb
commit 21571ca7b0

View File

@ -62,7 +62,7 @@ impl<'a> FeStatusDisplay<'a> {
let lo: f64 = -85.0; let lo: f64 = -85.0;
let hi: f64 = -6.0; let hi: f64 = -6.0;
let relative = 100.0 - (signal - hi) * 100.0 / (lo - hi); let relative = 100.0 - (signal - hi) * 100.0 / (lo - hi);
write!(f, "{:.0}% ({:.02}dBm)", relative, signal)?; write!(f, "{:.02}dBm ({:.0}%)", signal, relative)?;
} else { } else {
write!(f, "-")?; write!(f, "-")?;
} }
@ -74,7 +74,7 @@ impl<'a> FeStatusDisplay<'a> {
write!(f, " Q:")?; write!(f, " Q:")?;
if let Some(snr) = self.inner.snr { if let Some(snr) = self.inner.snr {
let relative = 5 * snr as u32; let relative = 5 * snr as u32;
write!(f, "{}% ({:.02}dB)", relative, snr)?; write!(f, "{:.02}dB ({}%)", snr, relative)?;
} else { } else {
write!(f, "-")?; write!(f, "-")?;
} }
@ -83,14 +83,14 @@ impl<'a> FeStatusDisplay<'a> {
return Ok(()); return Ok(());
} }
write!(f, " BER: ")?; write!(f, " BER:")?;
if let Some(ber) = self.inner.ber { if let Some(ber) = self.inner.ber {
write!(f, "{}", ber & 0xFFFF)?; write!(f, "{}", ber & 0xFFFF)?;
} else { } else {
write!(f, "-")?; write!(f, "-")?;
} }
write!(f, " UNC: ")?; write!(f, " UNC:")?;
if let Some(unc) = self.inner.unc { if let Some(unc) = self.inner.unc {
write!(f, "{}", unc & 0xFFFF) write!(f, "{}", unc & 0xFFFF)
} else { } else {
@ -125,7 +125,7 @@ impl<'a> FeStatusDisplay<'a> {
let lo: f64 = -85.0; let lo: f64 = -85.0;
let hi: f64 = -6.0; let hi: f64 = -6.0;
let relative = 100.0 - (signal - hi) * 100.0 / (lo - hi); let relative = 100.0 - (signal - hi) * 100.0 / (lo - hi);
write!(f, "{:.0}% ({:.02}dBm)", relative, signal)?; write!(f, "{:.02}dBm ({:.0}%)", signal, relative)?;
} else { } else {
write!(f, "-")?; write!(f, "-")?;
} }
@ -137,7 +137,7 @@ impl<'a> FeStatusDisplay<'a> {
write!(f, "\nSNR: ")?; write!(f, "\nSNR: ")?;
if let Some(snr) = self.inner.snr { if let Some(snr) = self.inner.snr {
let relative = 5 * snr as u32; let relative = 5 * snr as u32;
write!(f, "{}% ({:.02}dB)", relative, snr)?; write!(f, "{:.02}dB ({}%)", snr, relative)?;
} else { } else {
write!(f, "-")?; write!(f, "-")?;
} }