diff options
author | Jakob Odersky <jodersky@gmail.com> | 2014-11-09 13:18:20 +0100 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2014-11-09 13:19:00 +0100 |
commit | 7ebffc568407e950955b9975f06a0164295cbc5a (patch) | |
tree | feda6a1b1458e9bad9fcf84e88020b54015a5474 | |
parent | 1c733a1c18ab154e477c42818c48dd2c74866b13 (diff) | |
download | mavigator-7ebffc568407e950955b9975f06a0164295cbc5a.tar.gz mavigator-7ebffc568407e950955b9975f06a0164295cbc5a.tar.bz2 mavigator-7ebffc568407e950955b9975f06a0164295cbc5a.zip |
add dummy components to frontend
3 files changed, 57 insertions, 16 deletions
diff --git a/vfd-frontend/src/main/scala/vfd/frontend/Main.scala b/vfd-frontend/src/main/scala/vfd/frontend/Main.scala index e94b94e..aa6d8d8 100644 --- a/vfd-frontend/src/main/scala/vfd/frontend/Main.scala +++ b/vfd-frontend/src/main/scala/vfd/frontend/Main.scala @@ -27,16 +27,24 @@ object Main { div(`class` := "col-xs-12")( div(`class` := "panel panel-default")( div(`class` := "panel-body")( - "autopilot mode")))), + button(`class` := "btn")("ACK"), + img(`src` := env.asset("images/leds/red-on.svg"), height := "30px"))))), div(`class` := "row")( div(`class` := "col-xs-4")( div(`class` := "panel panel-default")( div(`class` := "panel-body")( - "navigation"))), + iframe( + width := "100%", + height := "350px", + "frameborder".attr := "0", + "scrolling".attr := "no", + "marginheight".attr := "0", + "marginwidth".attr := "0", + src := "http://www.openstreetmap.org/export/embed.html?bbox=6.5611016750335684%2C46.51718501017836%2C6.570038795471191%2C46.520577350893525&layer=mapnik")))), div(`class` := "col-xs-5")( div(`class` := "panel panel-default")( div(`class` := "panel-body")( - "primary"))), + panels.Primary()))), div(`class` := "col-xs-3")( div(`class` := "panel panel-default")( div(`class` := "panel-body")( diff --git a/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Communication.scala b/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Communication.scala index a26348e..909fdb7 100644 --- a/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Communication.scala +++ b/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Communication.scala @@ -2,8 +2,10 @@ package vfd.frontend.ui.panels import rx.Rx import rx.Rx +import scalatags.JsDom.all.style import scalatags.JsDom.all.`class` import scalatags.JsDom.all.div +import scalatags.JsDom.all.i import scalatags.JsDom.all.intFrag import scalatags.JsDom.all.stringAttr import scalatags.JsDom.all.stringFrag @@ -13,24 +15,34 @@ import scalatags.JsDom.all.td import scalatags.JsDom.all.tr import vfd.frontend.util.Environment import vfd.frontend.util.Framework.RxStr -import rx.core.Var -import rx.core.Obs object Communication { def apply(packets: Rx[Int], crcs: Rx[Int], overflows: Rx[Int], wrongIds: Rx[Int])(implicit app: Environment) = { div( - "Packets", - table(`class` := "table")( - tr( - td("OK"), - td(packets), - td("CRC"), - td(crcs), - td("OFLW"), - td(packets), - td("BID"), - td(packets)))) + "Link Status", + table(`class` := "table table-condensed")( + tbody( + tr( + td("Uplink"), + td("-20 dBm"), + td("Server"), + td("5 ms")), + tr( + td("Heartbeat"), + td(i(`class` := "fa fa-heart", style:="color: #ff0000;"))))), + "Packet Statistics", + table(`class` := "table table-condensed")( + tbody( + tr( + td("OK"), + td(packets), + td(`class` := "danger")("CRC"), + td(crcs), + td("OFLW"), + td(packets), + td("BID"), + td(packets))))) } }
\ No newline at end of file diff --git a/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Primary.scala b/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Primary.scala new file mode 100644 index 0000000..3b48375 --- /dev/null +++ b/vfd-frontend/src/main/scala/vfd/frontend/ui/panels/Primary.scala @@ -0,0 +1,21 @@ +package vfd.frontend.ui.panels + +import rx.core.Var +import scalatags.JsDom.all.div +import vfd.frontend.ui.Components +import vfd.frontend.util.Environment + +object Primary { + + def apply()(implicit env: Environment) = { + val pitchRoll = Var((0.0, 0.0)) + val heading = Var(0.0) + val altitude = Var(0.0) + + div( + Components.heading(heading, "33%"), + Components.attitude(pitchRoll, "33%"), + Components.altitude(altitude, "33%")) + } + +}
\ No newline at end of file |