fix units: use SI in instruments)

4 files changed, 8 insertions, 8 deletions

diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Altimeter.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Altimeter.scala
index 9ff3bb5..732ab43 100644
--- a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Altimeter.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Altimeter.scala
@@ -12,8 +12,8 @@ class Altimeter(implicit env: Environment) extends SvgInstrument[Double] {
   lazy val hand = part("hand")
   lazy val moveable = Seq(hand)
 
-  // 36deg === 1m
+  // 1m === 36deg = 2Pi / 10 ~= 0.62832
   protected def update(altitude: Double) = {
-    rotate(hand, (altitude * 36).toInt)
+    rotate(hand, (altitude * 0.62832).toInt)
   }
 }
\ No newline at end of file
diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Compass.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Compass.scala
index e2d79e4..341c866 100644
--- a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Compass.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Compass.scala
@@ -13,6 +13,6 @@ class Compass(implicit env: Environment) extends SvgInstrument[Double] {
   lazy val moveable = Seq(plate)
   
   protected def update(heading: Double) = {
-    rotate(plate, heading.toInt)
+    rotate(plate, heading)
   }
 }
\ No newline at end of file
diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Horizon.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Horizon.scala
index 2484561..0e95843 100644
--- a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Horizon.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Horizon.scala
@@ -14,7 +14,7 @@ class Horizon(implicit env: Environment) extends SvgInstrument[(Double, Double)]
   lazy val moveable = Seq(pitch, roll)
   
   protected def update(pitchRoll: (Double, Double)) = {
-    translate(pitch, 0, pitchRoll._1.toInt)
-    rotate(roll, pitchRoll._2.toInt)
+    translate(pitch, 0, (pitchRoll._1 * 180 / math.Pi).toInt) // 1deg === 1px
+    rotate(roll, pitchRoll._2)
   }
 }
diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/SvgInstrument.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/SvgInstrument.scala
index c639cec..fe6c58a 100644
--- a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/SvgInstrument.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/SvgInstrument.scala
@@ -23,7 +23,7 @@ trait SvgInstrument[A] extends Instrument[A] {
   /** Called when element has been loaded. */
   protected def load(event: dom.Event): Unit = {
     for (part <- moveable) {
-      part.style.transition = "transform 250ms ease-out"
+      part.style.transition = "transform 50ms ease-out"
     }
     ready()
   }
@@ -47,8 +47,8 @@ object SvgInstrument {
   }
 
   /** Applies rotation styling to an element. */
-  def rotate(elem: html.Element, deg: Int): Unit = {
-    elem.style.transform = "rotateZ(" + deg + "deg)";
+  def rotate(elem: html.Element, rad: Double): Unit = {
+    elem.style.transform = "rotateZ(" + rad + "rad)";
   }
 
 }
\ No newline at end of file