diff options
author | Jakob Odersky <jodersky@gmail.com> | 2015-04-14 11:49:44 +0200 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2015-04-15 12:00:21 +0200 |
commit | faf47af828149e45ec3f0a06d287b9d54600a559 (patch) | |
tree | e7ff70d7c0bd793f6bb8da8967f3f523c71b2dc2 /vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Generic.scala | |
parent | 7183beef6a70f16318a6feb21e84fe71d57bdd86 (diff) | |
download | mavigator-faf47af828149e45ec3f0a06d287b9d54600a559.tar.gz mavigator-faf47af828149e45ec3f0a06d287b9d54600a559.tar.bz2 mavigator-faf47af828149e45ec3f0a06d287b9d54600a559.zip |
pass rx value of instruments as a parameter
Diffstat (limited to 'vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Generic.scala')
-rw-r--r-- | vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Generic.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Generic.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Generic.scala index af9469a..86c27e1 100644 --- a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Generic.scala +++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/instruments/Generic.scala @@ -2,18 +2,19 @@ package vfd.dashboard.ui.instruments import org.scalajs.dom import org.scalajs.dom.html +import rx._ import vfd.dashboard.Environment class Generic( min: Double, med: Double, max: Double, - unit: String)(implicit env: Environment) + unit: String, + val value: Rx[Double]) + (implicit env: Environment) extends SvgInstrument[Double] { import SvgInstrument._ - - val initial = 0.0 lazy val element = svgObject("generic") lazy val handElement = part("hand") @@ -29,12 +30,11 @@ class Generic( minElement.textContent = min.toString medElement.textContent = med.toString maxElement.textContent = max.toString - update(min) super.load(e) } protected def update(value: Double) = { - rotate(handElement, value / (max - min) * math.Pi * 3 / 2) + rotate(handElement, value / (max - min) * math.Pi * 3 / 2) valueElement.textContent = value.toString } }
\ No newline at end of file |