Remove duplicate colour from SILOQualityCodes. Prep for release.

matt-s-gibbs · Jul 4, 2022 · 708af09 · 708af09
1 parent 309a56b
commit 708af09
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,8 @@
-# SWTools 0.2.3.2
+# SWTools 0.2.4.0
 
 * Add buffer parameter to SILOSitesfromPolygon to find SILO sites that might be slightly outside the polygon provided.
 * Add SILOWriteFunctionsforSource function to bulk write SILO input for Source based on Thiessen polygons, creating functions to load for each time series and to weight them for each subcatchment, and a table to point each functional unit in each subcatchment to these functions using the Rainfall-Runoff model feature editor.
+* Remove duplicate colour from SILOQualityCodes
 
 # SWTools 0.2.3.1
 

diff --git a/R/SILO.R b/R/SILO.R
@@ -232,7 +232,7 @@ SILOQualityCodes<-function(SILO,filename=NULL)
   #colours to shade codes, green to red, derived from
   #rev(RColorBrewer::brewer.pal(7,"RdYlGn"))
   cols<-c("#1A9850", "#91CF60", "#D9EF8B", "#FFFFBF", "#FEE08B", "#FC8D59", "#D73027")
-  cols<-c(cols,cols[1]) #add 8th item for span
+  cols<-c(cols,"#2b83ba") #add 8th item for span from a different colour palette
   names(cols)<-lookup$Quality
 
   #pull out the quality code column for each dataset in the list

diff --git a/R/SILOMorton.R b/R/SILOMorton.R
@@ -33,7 +33,7 @@ SILOMortonQualityCodes<-function(SILO,filename=NULL)
   #colours to shade codes, green to red, derived from
   #rev(RColorBrewer::brewer.pal(7,"RdYlGn"))
   cols<-c("#1A9850", "#91CF60", "#D9EF8B", "#FFFFBF", "#FEE08B", "#FC8D59", "#D73027")
-  cols<-c(cols,cols[1]) #add 8th item for span
+  cols<-c(cols,"#2b83ba") #add 8th item for span from a different colour palette
   names(cols)<-lookup$Quality
 
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,12 +1,12 @@
 # Resubmission
 
-This is a minor update for one bug fix.
+This is a minor update to functionality.
 
 # Test environments
 
 * Local Windows 10, R version 4.1.0 x86_64-w64-mingw32 (64-bit)
 * github actions MacOSX R version 4.1.0, x86_64-apple-darwin17.0 (64-bit)
-* R-hub Ubuntu Linux, Fedora Linux and Windows Server
+* R-hub solaris-x86-patched
 * win-builder (devel and release) x86_64-w64-mingw32
 
 ## Github actions MacOSX
@@ -22,21 +22,7 @@ Maintainer: 'Matt Gibbs <[email protected]>'
 
 ## R-hub
 
-* Windows Server 2022, R-devel, 64 bit
-
-One NOTE:
-
->* checking for detritus in the temp directory ... NOTE
-Found the following files/directories:
-  'lastMiKTeXException'
-
-I have run devtools::Check(manual=TRUE) locally to try and reproduce this without success. As it does not turn up on other checks, assuming it is a R-hub Windows server issue.
-
-* Ubuntu Linux 20.04.1 LTS, R-release, GCC
-
-Status: OK
-
-* Fedora Linux, R-devel, clang, gfortran
+* solaris-x86-patched
 
 Status: OK