Skip to content

Commit 78efef3

Browse files
committed
More config stuff.
1 parent 1bed62c commit 78efef3

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

R/config.R

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ loadConfig = function(filename) {
4646
#' @importFrom grDevices dev.off
4747
load_temp_config = function(filename) {
4848

49-
gsconfig$original.par <- par(no.readonly = TRUE)
50-
5149
graphTemplate <- yaml.load_file(filename)
5250

5351
if(length(all.equal(gsconfig$original.par, par(no.readonly = TRUE))) > 1){
@@ -107,13 +105,13 @@ config <- function(type, ..., persist=FALSE, custom.config = FALSE){
107105
globalConfig <- append(globalConfig, list(...))
108106
}
109107

110-
if (persist){
111-
if (type == "par"){
112-
gsconfig$options[names(globalConfig)] <- globalConfig
113-
} else {
114-
gsconfig$options[[type]] <- globalConfig
115-
}
116-
}
108+
# if (persist){
109+
# if (type == "par"){
110+
# gsconfig$options[names(globalConfig)] <- globalConfig
111+
# } else {
112+
# gsconfig$options[[type]] <- globalConfig
113+
# }
114+
# }
117115

118116
return(globalConfig)
119117
}

R/gsplot-class.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ gsplot.default <- function(...,config.file=NA, theme=NA, frame.plot=TRUE) {
2626

2727
if (!is.na(config.file)){
2828
load_temp_config(config.file)
29-
}
29+
}
3030

31-
# if(length(all.equal(gsconfig$original.par, par(no.readonly = TRUE))) > 1){
32-
# par(gsconfig$original.par)
33-
# }
31+
if(length(all.equal(gsconfig$original.par, par(no.readonly = TRUE))) > 1){
32+
par(gsconfig$original.par)
33+
}
3434

3535
object <- add_new_par(object, 'global')
3636

0 commit comments

Comments
 (0)