Format boolean parameters as On/Off by default
This commit is contained in:
parent
0aad790fd7
commit
5aec636f9f
|
@ -251,7 +251,7 @@ impl Param for BoolParam {
|
||||||
fn set_from_string(&mut self, string: &str) -> bool {
|
fn set_from_string(&mut self, string: &str) -> bool {
|
||||||
let value = match &self.string_to_value {
|
let value = match &self.string_to_value {
|
||||||
Some(f) => f(string),
|
Some(f) => f(string),
|
||||||
None => Some(string.eq_ignore_ascii_case("true")),
|
None => Some(string.eq_ignore_ascii_case("true") || string.eq_ignore_ascii_case("on")),
|
||||||
};
|
};
|
||||||
|
|
||||||
match value {
|
match value {
|
||||||
|
@ -288,16 +288,17 @@ impl Param for BoolParam {
|
||||||
|
|
||||||
fn normalized_value_to_string(&self, normalized: f32, _include_unit: bool) -> String {
|
fn normalized_value_to_string(&self, normalized: f32, _include_unit: bool) -> String {
|
||||||
let value = normalized > 0.5;
|
let value = normalized > 0.5;
|
||||||
match &self.value_to_string {
|
match (value, &self.value_to_string) {
|
||||||
Some(f) => format!("{}", f(value)),
|
(v, Some(f)) => format!("{}", f(v)),
|
||||||
None => format!("{}", value),
|
(true, None) => String::from("On"),
|
||||||
|
(false, None) => String::from("Off"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn string_to_normalized_value(&self, string: &str) -> Option<f32> {
|
fn string_to_normalized_value(&self, string: &str) -> Option<f32> {
|
||||||
let value = match &self.string_to_value {
|
let value = match &self.string_to_value {
|
||||||
Some(f) => f(string),
|
Some(f) => f(string),
|
||||||
None => Some(string.eq_ignore_ascii_case("true")),
|
None => Some(string.eq_ignore_ascii_case("true") || string.eq_ignore_ascii_case("on")),
|
||||||
}?;
|
}?;
|
||||||
|
|
||||||
Some(if value { 1.0 } else { 0.0 })
|
Some(if value { 1.0 } else { 0.0 })
|
||||||
|
@ -317,6 +318,16 @@ impl<T: Display + Copy> Display for PlainParam<T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Display for BoolParam {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
match (self.value, &self.value_to_string) {
|
||||||
|
(v, Some(func)) => write!(f, "{}", func(v)),
|
||||||
|
(true, None) => write!(f, "On"),
|
||||||
|
(false, None) => write!(f, "Off"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl NormalizebleRange<f32> for Range<f32> {
|
impl NormalizebleRange<f32> for Range<f32> {
|
||||||
fn normalize(&self, plain: f32) -> f32 {
|
fn normalize(&self, plain: f32) -> f32 {
|
||||||
match &self {
|
match &self {
|
||||||
|
|
Loading…
Reference in a new issue