Commit c050ccfb authored by David's avatar David
Browse files

Cleaned it up a bit, so it's no longer touting CoreLogic

parent f5962d18
Pipeline #665 failed with stage
in 10 seconds
......@@ -156,11 +156,11 @@ class TickerView : View() {
}
}
val askUs = TickerEntry<Text>(title = "meh", content = createText("Ask us about working for CoreLogic!"), reschedule = true)
val someText = TickerEntry<Text>(title = "meh", content = createText("I should do something useful here"), reschedule = true)
val entries = listOf(
askUs,
someText,
currentTime,
cpuTemp
)
......
......@@ -37,7 +37,7 @@ class DefaultView : View() {
//Cat view not ready yet! Time to build a stupid simple corelogic recruiting view
//this.add(catView.root)
alignment = Pos.CENTER
this.add(recruitingView.root)
//this.add(recruitingView.root)
}
bottom = tickerView.root
......@@ -49,7 +49,6 @@ class DefaultView : View() {
vgrow = Priority.ALWAYS
alignment = Pos.TOP_RIGHT
this.add(find<WeatherGovWidgetView>().root)
// this.add(find(DarkSkyCurrentConditionsView::class).root)
style {
paddingTop = 6.0
paddingBottom = 6.0
......
......@@ -48,7 +48,7 @@ class NamePlateView : View() {
}
}
}
label("Developer") {
label("Lead SRE") {
useMaxWidth = true
style {
fontSize = 20.px
......
......@@ -13,6 +13,7 @@ import tornadofx.*
//TODO: use widgets and expose some things that can have events pushed to them.
//TODO: can use the RestProgressBar
//TODO: radar view doesn't work any more because weather.gov changed their stuff.
class LoadingView : View() {
override val root = hbox {
vgrow = Priority.ALWAYS
......@@ -66,4 +67,4 @@ class RadarView : View() {
isPreserveRatio = true
}
}
}
\ No newline at end of file
}
......@@ -142,7 +142,7 @@ class WeatherController : Controller() {
}
.doOnError { throwable: Throwable ->
//TODO: emit to the ticker the error to display it on the screen
logger.error("Failed to acquire station identifier!", throwable)
logger.error("Failed to acquire station identifier! {}", throwable.message)
}
.retry()
.subscribe()
......@@ -167,7 +167,7 @@ class WeatherController : Controller() {
}
.doOnError { throwable: Throwable ->
//TODO: emit to the ticker the error to display it on the screen
logger.error("Failed to acquire hourly forecast url", throwable)
logger.error("Failed to acquire hourly forecast url: {}", throwable.message)
}
.retry() //TODO: should have some kind of backoff or whatever yeah need that
.subscribe()
......@@ -287,7 +287,7 @@ class WeatherController : Controller() {
//Probably on error resume next
}
.onErrorResumeNext { throwable: Throwable ->
logger.error("Unable to parse weather.gov data", throwable)
logger.error("Unable to parse weather.gov data: {}", throwable.message)
Observable.empty<CurrentObservation>()
}
.repeat()//Repeat is needed so when an error happens, it will start over again Repeat might cause problems when it's empty... ?
......@@ -366,7 +366,7 @@ class WeatherController : Controller() {
currentObservationModel.hourlyForecasts.addAll(it)
}
.onErrorResumeNext { throwable: Throwable ->
logger.error("Unable to parse weather.gov data for hourly forecast", throwable)
logger.error("Unable to parse weather.gov data for hourly forecast: {}", throwable.message)
Observable.empty<List<HourForecast>>()
}
.repeat()//Repeat is needed so when an error happens, it will start over again Repeat might cause problems when it's empty... ?
......
......@@ -202,7 +202,8 @@ class WeatherGovWidgetView : View() {
center = borderpane {
//TODO: also needs to be touch evented -- Handled via mouse emulation, it'll be fine
weatherController.handleDisplayRadar(this.events(javafx.scene.input.MouseEvent.MOUSE_RELEASED))
// Gotta disable the radar display, until I can update it.
//weatherController.handleDisplayRadar(this.events(javafx.scene.input.MouseEvent.MOUSE_RELEASED))
style {
fontSize = 20.px
......@@ -332,4 +333,4 @@ class WeatherGovWidgetView : View() {
override fun onUndock() {
logger.debug("TODO: stop the polling")
}
}
\ No newline at end of file
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment