Skip to content

Commit fe9276f

Browse files
author
Jordan S Read
committed
more code review changes
1 parent 1a8d3f8 commit fe9276f

1 file changed

Lines changed: 29 additions & 29 deletions

File tree

‎R/calc_views.R‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -74,38 +74,38 @@ which_reals <- function(values, na.value){
7474
return(which(!is.na(values) & values != na.value)) # which row to use. goofy because values != NA is always NA, not logical
7575

7676
}
77-
set_view_window <- function(views, var, na.value=NA, remove=TRUE, ignore=NULL){
77+
set_view_window <- function(views, param, na.value=NA, remove=TRUE, ignore=NULL){
7878
view_i <- which(names(views) %in% "view")
7979
for (i in view_i){
80-
values <- lapply(views[[i]][!names(views[[i]]) %in% ignore], function(x) strip_pts(x, var))
80+
values <- lapply(views[[i]][!names(views[[i]]) %in% ignore], function(x) strip_pts(x, param))
8181
val.i <- which_reals(values, na.value)
8282
if (length(val.i) == 0){
8383
values = na.value
8484
} else {
8585
values <- unname_c(values[val.i])
8686
}
8787
if (remove)
88-
views[[i]] <- lapply(views[[i]], function(x) remove_field(x, var))
88+
views[[i]] <- lapply(views[[i]], function(x) remove_field(x, param))
8989

90-
views[[i]][['window']][[var]] <- values
90+
views[[i]][['window']][[param]] <- values
9191
}
9292

9393
return(views)
9494
}
9595

9696
set_view_log <- function(views){
97-
set_view_window(views, var = 'log', na.value="")
97+
set_view_window(views, param = 'log', na.value="")
9898
}
9999

100100
set_view_lab <- function(views){
101-
views <- set_view_window(views, var = 'ylab', na.value="")
102-
set_view_window(views, var = 'xlab', na.value="")
101+
views <- set_view_window(views, param = 'ylab', na.value="")
102+
set_view_window(views, param = 'xlab', na.value="")
103103
}
104104

105105

106106
set_view_lim <- function(views){
107-
views <- set_view_window(views, var = 'xlim', na.value=NA, ignore='window', remove=FALSE)
108-
views <- set_view_window(views, var = 'ylim', na.value=NA, ignore='window', remove=FALSE)
107+
views <- set_view_window(views, param = 'xlim', na.value=NA, ignore='window', remove=FALSE)
108+
views <- set_view_window(views, param = 'ylim', na.value=NA, ignore='window', remove=FALSE)
109109

110110
data <- list(y=summarize_args(views,c('y','y1','y0'),ignore=c('window','gs.config')),
111111
x=summarize_args(views,c('x','x1','x0'),ignore=c('window','gs.config')))
@@ -116,22 +116,22 @@ set_view_lim <- function(views){
116116
definedSides <- unlist(c_unname(views),recursive = FALSE)
117117
definedSides <- unique(unname(unlist(definedSides[grep("side", names(definedSides))])))
118118

119-
for(var in c('y','x')){
120-
for (i in names(data[[var]])){
119+
for(param in c('y','x')){
120+
for (i in names(data[[param]])){
121121
n.i <- as.numeric(i)
122-
lim.name <- paste0(var,'lim')
123-
axs.name <- paste0(var, 'axs')
124-
view.side <- get_view_side(views, as.numeric(i), var)
122+
lim.name <- paste0(param,'lim')
123+
axs.name <- paste0(param, 'axs')
124+
view.side <- get_view_side(views, as.numeric(i), param)
125125
match.side <- as.character(views_with_side(views, view.side))
126-
data.var <- c_unname(data[[var]][match.side])
126+
data.var <- c_unname(data[[param]][match.side])
127127

128128
if(!is.null(data.var) && all(is.na(data.var))){
129129
if((view.side %% 2) == 0){ #even
130130
otherSide <- c(2,4)[c(2,4) %in% definedSides[definedSides != view.side]]
131131
} else { #odd
132132
otherSide <- c(1,3)[c(1,3) %in% definedSides[definedSides != view.side]]
133133
}
134-
data.var <- c_unname(data[[var]][otherSide])
134+
data.var <- c_unname(data[[param]][otherSide])
135135
if(all(is.na(data.var))){ #So do data total
136136
data.var <- c(0,1)
137137
}
@@ -182,42 +182,42 @@ views_with_side <- function(views, side){
182182
return(which(view.match))
183183
}
184184

185-
get_view_side <- function(views, view_i, var){
185+
get_view_side <- function(views, view_i, param){
186186
i = which(names(views) %in% 'view')[view_i]
187187
sides <- views[[i]][['window']][['side']]
188-
if (var=='y')
188+
if (param=='y')
189189
return(sides[which(sides %% 2 == 0)])
190-
else if (var=='x')
190+
else if (param=='x')
191191
return(sides[which(sides %% 2 != 0)])
192192
else
193-
stop('view side undefined for ',var)
193+
stop('view side undefined for ',param)
194194
}
195195

196-
summarize_args <- function(views, var, na.value,ignore='gs.config'){
196+
summarize_args <- function(views, param, na.value,ignore='gs.config'){
197197

198198
view_i <- which(names(views) %in% "view")
199199
values <- list()
200200
for (i in view_i){
201201
x <- views[[i]][!names(views[[i]]) %in% ignore]
202-
valStuff <- lapply(x, function(x) strip_pts(x, var))
202+
valStuff <- lapply(x, function(x) strip_pts(x, param))
203203
values[[i]] <- c_unname(valStuff)
204204
}
205205
names(values) <- view_i
206206
return(values)
207207
}
208208

209-
remove_field <- function(list, var){
209+
remove_field <- function(list, param){
210210

211-
for (v in var){
211+
for (v in param){
212212
if (v %in% names(list))
213213
list[[v]] <- NULL
214214
}
215215
return(list)
216216
}
217217

218-
strip_pts <- function(list, var){
218+
strip_pts <- function(list, param){
219219
out <- c()
220-
for (v in var){
220+
for (v in param){
221221
if (v %in% names(list))
222222
out <- append(out, list[[v]])
223223
else {
@@ -242,13 +242,13 @@ set_window <- function(list){
242242
plots <- list[[j]]
243243
plots[['window']] <- NULL
244244

245-
var <- c("axes","ann","frame.plot") #Add panel.first, panel.last, asp, and "main","sub","frame.plot"...without breaking title
245+
param <- c("axes","ann","frame.plot") #Add panel.first, panel.last, asp, and "main","sub","frame.plot"...without breaking title
246246
varPar <- c("xaxs","yaxs","xaxt","yaxt","las")
247247

248-
window[var] <- TRUE
248+
window[param] <- TRUE
249249

250250
for(i in names(plots)){
251-
for(k in var){
251+
for(k in param){
252252
if(k %in% names(plots[[i]])){
253253
window[[k]] <- plots[[i]][[k]]
254254
}

0 commit comments

Comments
 (0)