From 256a9ba0f67b3242aea608ede6db3baa51417206 Mon Sep 17 00:00:00 2001 From: Nicolau Manubens Date: Fri, 1 Feb 2019 17:25:31 +0100 Subject: [PATCH 1/5] Updated MergeArrayDims. --- R/Utils.R | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/R/Utils.R b/R/Utils.R index d8ffa744..8f4e25d4 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -1539,9 +1539,15 @@ # It expects as inputs two named numeric vectors, and it extends them # with dimensions of length 1 until an ordered common dimension # format is reached. +# The first output is dims1 extended with 1s. +# The second output is dims2 extended with 1s. +# The third output is a merged dimension vector. If dimensions with +# the same name are found in the two inputs, and they have a different +# length, the maximum is taken. .MergeArrayDims <- function(dims1, dims2) { new_dims1 <- c() new_dims2 <- c() + new_dims3 <- c() while (length(dims1) > 0) { if (names(dims1)[1] %in% names(dims2)) { pos <- which(names(dims2) == names(dims1)[1]) @@ -1551,11 +1557,13 @@ } new_dims1 <- c(new_dims1, dims_to_add, dims1[1]) new_dims2 <- c(new_dims2, dims2[1:pos]) + new_dims3 <- c(new_dims3, dims2[1:pos]) dims1 <- dims1[-1] dims2 <- dims2[-c(1:pos)] } else { new_dims1 <- c(new_dims1, dims1[1]) new_dims2 <- c(new_dims2, 1) + new_dims3 <- c(new_dims3, dims1[1]) names(new_dims2)[length(new_dims2)] <- names(dims1)[1] dims1 <- dims1[-1] } @@ -1565,8 +1573,9 @@ names(dims_to_add) <- names(dims2) new_dims1 <- c(new_dims1, dims_to_add) new_dims2 <- c(new_dims2, dims2) + new_dims3 <- c(new_dims3, dims2) } - list(new_dims1, new_dims2) + list(new_dims1, new_dims2, pmax(new_dims1, new_dims2)) } # This function takes two named arrays and merges them, filling with -- GitLab From c267c0ebce933416581ad46835cb965cc6ac3d4b Mon Sep 17 00:00:00 2001 From: Nicolau Manubens Date: Fri, 1 Feb 2019 17:28:22 +0100 Subject: [PATCH 2/5] Small correction. --- R/Utils.R | 4 ---- 1 file changed, 4 deletions(-) diff --git a/R/Utils.R b/R/Utils.R index 8f4e25d4..44600181 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -1547,7 +1547,6 @@ .MergeArrayDims <- function(dims1, dims2) { new_dims1 <- c() new_dims2 <- c() - new_dims3 <- c() while (length(dims1) > 0) { if (names(dims1)[1] %in% names(dims2)) { pos <- which(names(dims2) == names(dims1)[1]) @@ -1557,13 +1556,11 @@ } new_dims1 <- c(new_dims1, dims_to_add, dims1[1]) new_dims2 <- c(new_dims2, dims2[1:pos]) - new_dims3 <- c(new_dims3, dims2[1:pos]) dims1 <- dims1[-1] dims2 <- dims2[-c(1:pos)] } else { new_dims1 <- c(new_dims1, dims1[1]) new_dims2 <- c(new_dims2, 1) - new_dims3 <- c(new_dims3, dims1[1]) names(new_dims2)[length(new_dims2)] <- names(dims1)[1] dims1 <- dims1[-1] } @@ -1573,7 +1570,6 @@ names(dims_to_add) <- names(dims2) new_dims1 <- c(new_dims1, dims_to_add) new_dims2 <- c(new_dims2, dims2) - new_dims3 <- c(new_dims3, dims2) } list(new_dims1, new_dims2, pmax(new_dims1, new_dims2)) } -- GitLab From 0c926c62fbfb6f6e7580ac1aa94e712d5bf3bfa3 Mon Sep 17 00:00:00 2001 From: nperez Date: Thu, 14 Mar 2019 17:34:13 +0100 Subject: [PATCH 3/5] Improved buildignore. --- .Rbuildignore | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 53e15ab8..8e011f40 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,6 +1,7 @@ -.git -.gitignore -.tar.gz -.pdf -./.nc -README.Rmd +*.\.git$ +*.\.gitignore$ +*.\.tar.gz$ +*.\.pdf$ +./.nc$ +README.Rmd$ +*.\.RData$ -- GitLab From 1a337fee6f7d4c90129d4918ce515a73156fcaf3 Mon Sep 17 00:00:00 2001 From: nperez Date: Thu, 14 Mar 2019 17:36:37 +0100 Subject: [PATCH 4/5] Fix in Rbuildignore. --- .Rbuildignore | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 8e011f40..2eaef680 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,7 +1,7 @@ -*.\.git$ -*.\.gitignore$ -*.\.tar.gz$ -*.\.pdf$ +.*\.git$ +.*\.gitignore$ +.*\.tar.gz$ +.*\.pdf$ ./.nc$ README.Rmd$ -*.\.RData$ +.*\.RData$ -- GitLab From 12bb3ba63bbd7141a4bb51a47c28a34541ef09b8 Mon Sep 17 00:00:00 2001 From: Nicolau Manubens Date: Fri, 15 Mar 2019 19:16:02 +0100 Subject: [PATCH 5/5] Small fix in PlotEquiM and Rbuildignore. --- .Rbuildignore | 2 +- R/PlotEquiMap.R | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.Rbuildignore b/.Rbuildignore index 2eaef680..aee68886 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -4,4 +4,4 @@ .*\.pdf$ ./.nc$ README.Rmd$ -.*\.RData$ +\..*\.RData$ diff --git a/R/PlotEquiMap.R b/R/PlotEquiMap.R index 51599dc7..8c3e3a07 100644 --- a/R/PlotEquiMap.R +++ b/R/PlotEquiMap.R @@ -640,6 +640,10 @@ PlotEquiMap <- function(var, lon, lat, varu = NULL, varv = NULL, # Colorbar # ~~~~~~~~~~ # + if (toptitle != "") { + margins[3] <- margins[3] - (cex_title + 1) + par(mar = margins) + } if (drawleg) { ColorBar(brks, cols, FALSE, subsampleg, bar_limits, var_limits, triangle_ends, col_inf = col_inf, col_sup = col_sup, -- GitLab