From 31605150d3e10b08dad2086005c64664f5648a51 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Fri, 27 May 2022 22:39:03 -0230 Subject: prepare to switch ui library --- pressure/pressure.go | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) (limited to 'pressure') diff --git a/pressure/pressure.go b/pressure/pressure.go index da1ab1e..820a8cf 100644 --- a/pressure/pressure.go +++ b/pressure/pressure.go @@ -1,10 +1,5 @@ package pressure -import ( - "errors" - "fmt" -) - type Pressure float32 const ( @@ -14,35 +9,8 @@ const ( PoundsPerSquareInch Pressure = 6_894.757 ) -// UnitStrings returns a slice of strings, each representing a -// unit. -// This is necessary because giu.Combo only works with strings. -func UnitStrings() []string { - return []string{"Pa", "kPa", "bar", "psi"} -} - -const ( - DefaultUnit Pressure = Kilopascal - // DefaultUnitIndex is used to index UnitStrings(). - DefaultUnitIndex int32 = 1 // kPa -) - -func UnitFromString(s string) (Pressure, error) { - // Each case corresponds to a value in UnitStrings(). - switch s { - case "Pa": - return Pascal, nil - case "kPa": - return Kilopascal, nil - case "bar": - return Bar, nil - case "psi": - return PoundsPerSquareInch, nil - default: - return *new(Pressure), errors.New(fmt.Sprintf("invalid unit: '%s'", s)) - } +func (p Pressure) As(unit Pressure) float32 { + return float32(p / unit) } -func Atmospheric() Pressure { - return 1 * Bar -} +const Atmospheric = Bar -- cgit v1.2.3