Bearloga has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303583
Change subject: Update annotations format & add range selector & update
log-scaling
......................................................................
Update annotations format & add range selector & update log-scaling
Change-Id: Ide7083f56eec810b4b6094e09ce45ca6fbf4baa8
---
M server.R
M ui.R
M utils.R
3 files changed, 8 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wonderbolt
refs/changes/83/303583/1
diff --git a/server.R b/server.R
index 09cf7d4..d747484 100644
--- a/server.R
+++ b/server.R
@@ -21,18 +21,19 @@
polloi::make_dygraph(xlab = "Date", ylab = "Pageviews",
title = "Sources of page views (e.g. search engines
and internal referers)") %>%
dyLegend(labelsDiv = "traffic_summary_legend", show = "always") %>%
- dyAnnotation(x = as.Date("2016-03-07"), text = "A",
- tooltip = "Switched to a new UDF")
+ dyRangeSelector %>%
+ dyEvent(as.Date("2016-03-07"), "A (new UDF)", labelLoc = "bottom")
})
output$traffic_bysearch_dygraph <- renderDygraph({
bysearch_traffic_data[[input$platform_traffic_bysearch]] %>%
- logscale(input$platform_traffic_bysearch_log) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_traffic_bysearch)) %>%
polloi::subset_by_date_range(time_frame_range(input$traffic_bysearch_timeframe,
input$traffic_bysearch_timeframe_daterange)) %>%
polloi::make_dygraph(xlab = "Date", ylab = "Pageviews",
title = "Pageviews from external search engines,
broken down by engine") %>%
- dyLegend(labelsDiv = "traffic_bysearch_legend", show = "always")
+ dyLegend(labelsDiv = "traffic_bysearch_legend", show = "always") %>%
+ dyAxis("y", logscale = input$platform_traffic_bysearch_log) %>%
+ dyRangeSelector(fillColor = "", strokeColor = "")
})
# Check datasets for missing data and notify user which datasets are missing
data (if any)
diff --git a/ui.R b/ui.R
index f8ad782..8b7bd7f 100644
--- a/ui.R
+++ b/ui.R
@@ -48,8 +48,9 @@
),
tabItem(tabName = "traffic_by_engine",
fluidRow(
- column(platform_select("platform_traffic_bysearch"), width = 2),
- column(checkboxInput("platform_traffic_bysearch_log", label =
"Log10 Scale", value = FALSE), width = 1),
+ column(platform_select("platform_traffic_bysearch"),
+ checkboxInput("platform_traffic_bysearch_log", label =
"Use Log scale", value = FALSE),
+ width = 3),
column(polloi::smooth_select("smoothing_traffic_bysearch"),
width = 3),
column(polloi::timeframe_select("traffic_bysearch_timeframe"),
width = 3),
column(polloi::timeframe_daterange("traffic_bysearch_timeframe"), width = 3)),
diff --git a/utils.R b/utils.R
index f4c0bce..ec2f6e4 100644
--- a/utils.R
+++ b/utils.R
@@ -46,10 +46,3 @@
return(invisible())
}
-
-logscale <- function(data, logscale_setting){
- if (logscale_setting) {
- return(cbind(date = data$date, as.data.frame(apply(data[, 2:ncol(data)],
2, log10))))
- }
- return(data)
-}
--
To view, visit https://gerrit.wikimedia.org/r/303583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide7083f56eec810b4b6094e09ce45ca6fbf4baa8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wonderbolt
Gerrit-Branch: master
Gerrit-Owner: Bearloga <mpo...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
