add line to candlestick chart
This commit is contained in:
parent
c7fcaab4bd
commit
898ff0f729
2
R/apex.R
2
R/apex.R
|
@ -141,7 +141,7 @@ make_series <- function(mapdata, mapping, type = NULL, serie_name = NULL) {
|
||||||
mapdata$x[is.na(mapdata$x)] <- "NA"
|
mapdata$x[is.na(mapdata$x)] <- "NA"
|
||||||
x_order <- unique(mapdata$x)
|
x_order <- unique(mapdata$x)
|
||||||
if (is_x_datetime(mapdata)) {
|
if (is_x_datetime(mapdata)) {
|
||||||
add_names <- FALSE
|
add_names <- c("x", "y")
|
||||||
x_order <- sort(x_order)
|
x_order <- sort(x_order)
|
||||||
} else {
|
} else {
|
||||||
add_names <- names(mapping)
|
add_names <- names(mapping)
|
||||||
|
|
|
@ -31,8 +31,8 @@ add_line <- function(ax,
|
||||||
} else {
|
} else {
|
||||||
apex_type <- ax$x$mixed_type
|
apex_type <- ax$x$mixed_type
|
||||||
}
|
}
|
||||||
if (!isTRUE(apex_type %in% c("line", "bar", "scatter")))
|
if (!isTRUE(apex_type %in% c("line", "bar", "scatter", "candlestick")))
|
||||||
stop("add_line: apex() must be a column or scatter chart.", call. = FALSE)
|
stop("add_line: apex() must be a column, scatter or candlestick chart.", call. = FALSE)
|
||||||
ax$x$ax_opts$chart$type <- "line"
|
ax$x$ax_opts$chart$type <- "line"
|
||||||
if (is.null(data))
|
if (is.null(data))
|
||||||
data <- ax$x$data
|
data <- ax$x$data
|
||||||
|
@ -56,6 +56,13 @@ add_line <- function(ax,
|
||||||
ax$x$ax_opts$stroke$width <- c(ax$x$ax_opts$stroke$width, 4)
|
ax$x$ax_opts$stroke$width <- c(ax$x$ax_opts$stroke$width, 4)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (identical(apex_type, "candlestick")) {
|
||||||
|
if (is.null(ax$x$ax_opts$stroke$width)) {
|
||||||
|
ax$x$ax_opts$stroke$width <- c(1, 4)
|
||||||
|
} else {
|
||||||
|
ax$x$ax_opts$stroke$width <- c(ax$x$ax_opts$stroke$width, 4)
|
||||||
|
}
|
||||||
|
}
|
||||||
if (identical(type, "line")) {
|
if (identical(type, "line")) {
|
||||||
ax$x$ax_opts$stroke$curve <- "straight"
|
ax$x$ax_opts$stroke$curve <- "straight"
|
||||||
} else if (identical(type, "spline")) {
|
} else if (identical(type, "spline")) {
|
||||||
|
|
|
@ -35,7 +35,8 @@ parse_df <- function(data, add_names = FALSE) {
|
||||||
# format(x)
|
# format(x)
|
||||||
js_date(x)
|
js_date(x)
|
||||||
} else if (inherits(x, "POSIXt")) {
|
} else if (inherits(x, "POSIXt")) {
|
||||||
as.numeric(x) * 1000
|
# as.numeric(x) * 1000
|
||||||
|
js_date(x)
|
||||||
} else if (inherits(x, "factor")) {
|
} else if (inherits(x, "factor")) {
|
||||||
as.character(x)
|
as.character(x)
|
||||||
} else {
|
} else {
|
||||||
|
@ -112,6 +113,7 @@ parse_timeline_data <- function(.list) {
|
||||||
|
|
||||||
parse_candlestick_data <- function(.list) {
|
parse_candlestick_data <- function(.list) {
|
||||||
list(list(
|
list(list(
|
||||||
|
type = "candlestick",
|
||||||
data = lapply(
|
data = lapply(
|
||||||
X = seq_len(length(.list[[1]])),
|
X = seq_len(length(.list[[1]])),
|
||||||
FUN = function(i) {
|
FUN = function(i) {
|
||||||
|
|
Loading…
Reference in New Issue