Signed-off-by: James Cherry <cherry@parallaxsw.com>
This commit is contained in:
James Cherry 2023-05-10 10:12:43 -07:00
parent 9cedf395ad
commit f7f2b0cadf
2 changed files with 6 additions and 5 deletions

View File

@ -83,9 +83,9 @@ public:
private: private:
Unit time_unit_; Unit time_unit_;
Unit resistance_unit_;
Unit capacitance_unit_; Unit capacitance_unit_;
Unit voltage_unit_; Unit voltage_unit_;
Unit resistance_unit_;
Unit current_unit_; Unit current_unit_;
Unit power_unit_; Unit power_unit_;
Unit distance_unit_; Unit distance_unit_;

View File

@ -67,6 +67,7 @@ Unit::operator=(const Unit &unit)
scale_ = unit.scale_; scale_ = unit.scale_;
stringDelete(suffix_); stringDelete(suffix_);
suffix_ = stringCopy(unit.suffix_); suffix_ = stringCopy(unit.suffix_);
stringDelete(scaled_suffix_);
scaled_suffix_ = stringCopy(unit.scaled_suffix_); scaled_suffix_ = stringCopy(unit.scaled_suffix_);
digits_ = unit.digits_; digits_ = unit.digits_;
} }
@ -165,9 +166,9 @@ Unit::asString(float value,
Units::Units() : Units::Units() :
time_unit_("s"), time_unit_("s"),
resistance_unit_("ohm"),
capacitance_unit_("F"), capacitance_unit_("F"),
voltage_unit_("v"), voltage_unit_("v"),
resistance_unit_("ohm"),
current_unit_("A"), current_unit_("A"),
power_unit_("W"), power_unit_("W"),
distance_unit_("m"), distance_unit_("m"),
@ -180,10 +181,10 @@ Units::find(const char *unit_name)
{ {
if (stringEq(unit_name, "time")) if (stringEq(unit_name, "time"))
return &time_unit_; return &time_unit_;
else if (stringEq(unit_name, "capacitance"))
return &capacitance_unit_;
else if (stringEq(unit_name, "resistance")) else if (stringEq(unit_name, "resistance"))
return &resistance_unit_; return &resistance_unit_;
else if (stringEq(unit_name, "capacitance"))
return &capacitance_unit_;
else if (stringEq(unit_name, "voltage")) else if (stringEq(unit_name, "voltage"))
return &voltage_unit_; return &voltage_unit_;
else if (stringEq(unit_name, "current")) else if (stringEq(unit_name, "current"))
@ -200,8 +201,8 @@ void
Units::operator=(const Units &units) Units::operator=(const Units &units)
{ {
time_unit_ = *units.timeUnit(); time_unit_ = *units.timeUnit();
capacitance_unit_ = *units.capacitanceUnit();
resistance_unit_ = *units.resistanceUnit(); resistance_unit_ = *units.resistanceUnit();
capacitance_unit_ = *units.capacitanceUnit();
voltage_unit_ = *units.voltageUnit(); voltage_unit_ = *units.voltageUnit();
current_unit_ = *units.currentUnit(); current_unit_ = *units.currentUnit();
power_unit_ = *units.powerUnit(); power_unit_ = *units.powerUnit();