Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

215 setops list #219

Merged
merged 7 commits into from
Jul 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Fixes

* `openxlsx_setOp()` now works with named list ([#215](https://github.com/ycphs/openxlsx/issues/215))
* `loadWorkbook()` imports `inlineStr`. Values remain `inlineStr` when writing the workbook with `saveWorkbook()`. Similar `read.xlsx` and `readWorkbook` import `inlineStr`.

# openxlsx 4.2.4
Expand Down Expand Up @@ -32,15 +33,15 @@


# openxlsx 4.2.3

## New Features

* Most of functions in openxlsx now support non-ASCII arguments better. More specifically, we can use non-ASCII strings as names or contents for `createNamedRegion()` ([#103](https://github.com/ycphs/openxlsx/issues/103)), `writeComment()`, `writeData()`, `writeDataTable()` and `writeFormula()`. In addition, openxlsx now reads comments and region names that contain non-ASCII strings correctly on Windows. Thanks to @shrektan for the PR [#118](https://github.com/ycphs/openxlsx/pull/118).

* `setColWidths()` now supports zero-length `cols`, which is convinient when `cols` is dynamically provided [#128](https://github.com/ycphs/openxlsx/issues/128). Thanks to @shrektan for the feature request and the PR.

## Fixes for Check issues

* Fix to pass the tests for link-time optimization type mismatches

* Fix to pass the checks of native code (C/C++) based on static code analysis
Expand All @@ -63,8 +64,8 @@

* Added Tests for new parameter of `saveWorkbook()`

## Bug Fixes
## Bug Fixes

* Solved CRAN check errors based on the change disussed in [PR#17277](https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=17277)

# openxlsx 4.2.0
Expand All @@ -73,7 +74,7 @@

* Added `groupColumns()`, `groupRows()`, `ungroupColumns()`, and `ungroupRows()` to group/ugroup columns/rows ([#32](https://github.com/ycphs/openxlsx/issues/32))

## Bug Fixes
## Bug Fixes

* Allow xml-sensitve characters in sheetnames ([#78](https://github.com/ycphs/openxlsx/issues/78))

Expand Down Expand Up @@ -164,19 +165,19 @@

* `deleteNamedRegions` to delete named region and optionally the worksheet data

* set Workbook properties 'title', 'subject', 'category'
* set Workbook properties 'title', 'subject', 'category'

## Bug Fixes

* `pageSetup` fails when passing in sheet by name

* matching sheet names with special characters now works
* matching sheet names with special characters now works

* `skipEmptyCols` being ignored by `read.xlsx.Workbook`

* zero column data.frames would throw an error.

* `read.xlsx` on files created using apache poi failed to match sheet name to xml file.
* `read.xlsx` on files created using apache poi failed to match sheet name to xml file.

* deleted table re-appearing after save & load.

Expand All @@ -198,7 +199,7 @@

* options("openxlsx.zipflags") to pass additional flags to zip application e.g. compression level

* `getTables()` and `removeTable()` to show and remove Excel table objects
* `getTables()` and `removeTable()` to show and remove Excel table objects

* set column to 'hidden' with `setColWidths()`

Expand Down Expand Up @@ -238,7 +239,7 @@

## Bug Fixes

* Fix date time conversion accuracy issues.
* Fix date time conversion accuracy issues.

* Allow multibyte characters in names and comments.

Expand Down Expand Up @@ -308,7 +309,7 @@

* `getDateOrigin` function to return the date origin used internally by the xlsx file to pass to
`convertToDate`

* Auto-detection of date cells. Cells that "look" like dates will be converted to dates when reading from file.

* `read.xlsx.Workbook` to read from workbook objects
Expand Down Expand Up @@ -346,7 +347,7 @@
* extended `numFmt` formatting to numeric rounding also added option("openxlsx.numFmt" = ...)
for default number formatting of numeric columns

* additional `numFmt` "comma" to format numerics with "," thousands separator
* additional `numFmt` "comma" to format numerics with "," thousands separator

* `tableName` parameter to `writeDataTable` to assign the table a name

Expand Down Expand Up @@ -452,7 +453,7 @@

* conversion of numeric data to integer in `read.xlsx` fixed.

* `readWorkbook`/`read.xlsx` should work now. Empty values are
* `readWorkbook`/`read.xlsx` should work now. Empty values are
now padded with NA. Many other bugs fixed.

* borders on single row and/or column data.frames now work.
Expand Down
9 changes: 7 additions & 2 deletions R/helperFunctions.R
Original file line number Diff line number Diff line change
Expand Up @@ -813,8 +813,14 @@ buildFillList <- function(fills) {
return(fillAttrs)
}


# Can test with below:
# x <- "<definedName name=\"_xlnm._FilterDatabase\" localSheetId=\"0\" hidden=\"1\">'A & B < D > D'!$A$1:$A$10</definedName>"
getDefinedNamesSheet <- function(x) {
sub("'?\\!.*", "", sub("^.*>'", "", x))
}

# Not used but kepted in case fix above isn't correct
getDefinedNamedSheet_ <- function(x) {
belongTo <- unlist(lapply(strsplit(x, split = ">|<"), "[[", 3))
quoted <- grepl("^'", belongTo)

Expand All @@ -825,7 +831,6 @@ getDefinedNamesSheet <- function(x) {
return(belongTo)
}


getSharedStringsFromFile <- function(sharedStringsFile, isFile) {

## read in, get si tags, get t tag value and pull out all string nodes
Expand Down
7 changes: 5 additions & 2 deletions R/openxlsx.R
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ op.openxlsx <- list(
openxlsx.withFilter = NULL
)


#' @param x An option name (\code{"openxlsx."} prefix optional)
#' @param default A default value if \code{NULL}
#' @rdname openxlsx_options
Expand All @@ -137,7 +136,7 @@ openxlsx_setOp <- function(x, value) {
stop("x cannot be an unnamed list", call. = FALSE)
}

mapply(openxlsx_setOp, x = names(x), value = x)
return(invisible(mapply(openxlsx_setOp, x = names(x), value = x)))
}

value <- as.list(value)
Expand All @@ -163,3 +162,7 @@ check_openxlsx_op <- function(x) {

x
}

openxlsx_resetOp <- function() {
options(op.openxlsx)
}
4 changes: 3 additions & 1 deletion revdep/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

## Failed to check (28)


|package |version |error |warning |note |
|:--------------|:-------|:-----|:-------|:----|
|appreci8R |? | | | |
Expand All @@ -51,8 +52,9 @@
|SEtools |? | | | |
|sigFeature |? | | | |
|stplanr |? | | | |
|struct |? | | | |
|structToolbox |? | | | |
|TarSeqQC |? | | | |
|TPP |3.20.0 |1 | |3 |
|uncoverappLib |? | | | |
|upstartr |? | | | |

1 change: 1 addition & 0 deletions revdep/cran.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

We checked 117 reverse dependencies (0 from CRAN + 117 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.


* We saw 0 new problems
* We failed to check 0 packages

Loading