diff --git a/DESCRIPTION b/DESCRIPTION index 1a1800d..934385e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,7 +17,7 @@ Description: Analyze repertory grids, a qualitative-quantitative 2004, ISBN: 978-0-470-09080-0). The package is part of the The package is part of the project. Version: 0.1.15 -Date: 2023-12-26 +Date: 2024-02-18 Encoding: UTF-8 URL: https://github.com/markheckmann/OpenRepGrid, http://markheckmann.github.io/OpenRepGrid/ Imports: @@ -70,7 +70,7 @@ Collate: 'utils-import.r' 'utils.r' 'zzz.r' -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.0 NeedsCompilation: no Suggests: testthat (>= 2.1.0), diff --git a/NAMESPACE b/NAMESPACE index bcd1e6f..61dbc4c 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -3,6 +3,7 @@ S3method("[",openrepgridSettings) S3method(dim,gridlist) S3method(dim,repgrid) +S3method(drawDetails,gmSplitTextGrob) S3method(plot,indexDilemma) S3method(print,alignByLoadings) S3method(print,constructCor) diff --git a/NEWS.md b/NEWS.md index 0d0793c..3d0f95a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# OpenRepGrid (development version) +# OpenRepGrid (0.1.15) * rename `ward` method to `ward.D` in `cluster` (fix #36) * `indexDDI` and `indexUncertainty`, two dispersion indexes for dependency (e.g., situation-resource) grids added. Jon Raskin kindly helped with the documentation. diff --git a/OpenRepGrid.Rproj b/OpenRepGrid.Rproj index d4b03a5..13c0b43 100644 --- a/OpenRepGrid.Rproj +++ b/OpenRepGrid.Rproj @@ -18,5 +18,6 @@ StripTrailingWhitespace: Yes BuildType: Package PackageUseDevtools: Yes PackageInstallArgs: --no-multiarch --with-keep.source +PackageRoxygenize: rd,collate,namespace QuitChildProcessesOnExit: Yes diff --git a/R/gmMain.r b/R/gmMain.r index ffd288d..fe89e24 100644 --- a/R/gmMain.r +++ b/R/gmMain.r @@ -298,6 +298,8 @@ gmSplitTextGrob <- function(text, x = unit(0.5, "npc"), y = unit(0.5, "npc"), ju # variation to explore +#' @export +#' @keywords internal drawDetails.gmSplitTextGrob <- function(x, recording) # drawdetails method is called when resizing window { # str(x); diff --git a/R/openrepgrid.r b/R/openrepgrid.r index 107e49e..88c8404 100644 --- a/R/openrepgrid.r +++ b/R/openrepgrid.r @@ -264,6 +264,5 @@ #' #' @name OpenRepGrid-overview #' @keywords package -#' @docType package #' -NULL +"_PACKAGE" diff --git a/R/repgrid-basicops.r b/R/repgrid-basicops.r index 086faf9..3f64b2b 100644 --- a/R/repgrid-basicops.r +++ b/R/repgrid-basicops.r @@ -1400,7 +1400,7 @@ makeRepgrid <- function(args) { l <- c(list(x = x), args) # make a new repgrid object x <- do.call(e.setElements, l) l <- c(list(x = x), args) # make a new repgrid object - x <- do.call(c.setConstructs, l) + x <- do.call(c_setConstructs, l) x <- initRatingArray(x) # initialize rating array l <- c(list(x = x), args) # make a new repgrid object x[, ] <- matrix(args$scores, ncol = getNoOfElements(x), byrow = T) # to fill matrix rowwise diff --git a/R/repgrid-constructs.r b/R/repgrid-constructs.r index cdaf76e..7e64f29 100644 --- a/R/repgrid-constructs.r +++ b/R/repgrid-constructs.r @@ -328,8 +328,8 @@ c_makeNewConstruct <- function(x = NULL, l.name = NA, l.preferred = NA, l.emerge -# internal: c.setConstructs sets constructs by index -c.setConstructs <- function(x, l.name = NA, l.preferred = NA, l.emerged = NA, +# internal: c_setConstructs sets constructs by index +c_setConstructs <- function(x, l.name = NA, l.preferred = NA, l.emerged = NA, r.name = NA, r.preferred = NA, r.emerged = NA, index = NULL, ...) { if (!inherits(x, "repgrid")) { # check if x is repgrid object @@ -355,8 +355,8 @@ c.setConstructs <- function(x, l.name = NA, l.preferred = NA, l.emerged = NA, x } # x <- makeEmptyRepgrid() -# x <- c.setConstructs(x, l.name=c("construct left 1", "construct left 2")) -# x <- c.setConstructs(x, l.n=c("construct left 3", "construct left 4"), index=3:4) +# x <- c_setConstructs(x, l.name=c("construct left 1", "construct left 2")) +# x <- c_setConstructs(x, l.n=c("construct left 3", "construct left 4"), index=3:4) # str(x@constructs, m=3) @@ -424,7 +424,7 @@ c_addConstructs <- function(x, l.name = NA, l.preferred = NA, l.emerged = NA, } ### NOT RUN # x <- makeEmptyRepgrid() -# x <- c.setConstructs(x, l.name=c("construct left 1", "construct left 2")) +# x <- c_setConstructs(x, l.name=c("construct left 1", "construct left 2")) # x <- c_addConstructs(x, l.name="construct added at the end") # x <- c_addConstructs(x, l.name="construct left inserted at position 1", pos=1) # x <- c_addConstructs(x, l.name="construct right inserted at position 1", pos=1) diff --git a/man/OpenRepGrid-overview.Rd b/man/OpenRepGrid-overview.Rd index af368d1..c2f07f1 100644 --- a/man/OpenRepGrid-overview.Rd +++ b/man/OpenRepGrid-overview.Rd @@ -220,6 +220,14 @@ functions for these purposes. } } +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/markheckmann/OpenRepGrid} + \item \url{http://markheckmann.github.io/OpenRepGrid/} +} + +} \author{ Current members of the \pkg{OpenRepGrid} development team: Mark Heckmann. Everyone who is interested in developing the package is invited to join. diff --git a/man/OpenRepGrid.Rd b/man/OpenRepGrid.Rd index ad93229..60e734f 100644 --- a/man/OpenRepGrid.Rd +++ b/man/OpenRepGrid.Rd @@ -2,8 +2,8 @@ % Please edit documentation in R/openrepgrid.r \docType{package} \name{OpenRepGrid} -\alias{OpenRepGrid} \alias{OpenRepGrid-package} +\alias{OpenRepGrid} \title{\code{OpenRepGrid}: an R package for the analysis of repertory grids.} \description{ \if{html}{\figure{logo.png}{options: style='float: right; padding-left: 10px;' alt='logo' width='120'}} The @@ -30,6 +30,7 @@ Routledge, London, New York). Useful links: \itemize{ \item \url{https://github.com/markheckmann/OpenRepGrid} + \item \url{http://markheckmann.github.io/OpenRepGrid/} } }