[Stacomir-commits] r487 - in pkg/stacomir: . R inst/config inst/examples man man/figures vignettes

[noreply at r-forge.r-project.org]

Author: briand
Date: 2018-05-26 22:35:36 +0200 (Sat, 26 May 2018)
New Revision: 487

Added:
   pkg/stacomir/vignettes/.Rhistory
Modified:
   pkg/stacomir/NEWS.md
   pkg/stacomir/R/report_dc.R
   pkg/stacomir/inst/config/libraries.R
   pkg/stacomir/inst/examples/report_dc-example.R
   pkg/stacomir/man/figures/
   pkg/stacomir/man/stacomiR-package.Rd
   pkg/stacomir/vignettes/
Log:
Corrected problem with stacomiR-package file, trial again for the Vignette

Modified: pkg/stacomir/NEWS.md
===================================================================
--- pkg/stacomir/NEWS.md	2018-05-18 19:59:51 UTC (rev 486)
+++ pkg/stacomir/NEWS.md	2018-05-26 20:35:36 UTC (rev 487)
@@ -1,6 +1,11 @@
 # stacomiR 0.5.3.9000
 
+* developped vignette for package (@marion)
 
+* changed stacomiR-package.md according to Kurt Hornik (CRAN) demand to use macro in share
+
+* bug in interface report_dc corrected
+
 # stacomiR 0.5.3.1
 
 * added and edited readme.Rmd file (@cedric and @marion #447-#452)

Modified: pkg/stacomir/R/report_dc.R
===================================================================
--- pkg/stacomir/R/report_dc.R	2018-05-18 19:59:51 UTC (rev 486)
+++ pkg/stacomir/R/report_dc.R	2018-05-26 20:35:36 UTC (rev 487)
@@ -431,6 +431,7 @@
 #' @keywords internal
 #' @author cedric.briand
 funbarchartDC = function(h,...) {
+  report_dc<-get("report_dc",envir=envir_stacomi)  
   report_dc=charge(report_dc)
   report_dc=connect(report_dc)
   if( nrow(report_dc at data)==0 ) {
@@ -464,6 +465,7 @@
 #' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
 #' @keywords internal
 funboxDC = function(h,...) {  
+  report_dc<-get("report_dc",envir=envir_stacomi)  
   report_dc=charge(report_dc)
   report_dc=connect(report_dc)
   

Modified: pkg/stacomir/inst/config/libraries.R
===================================================================
--- pkg/stacomir/inst/config/libraries.R	2018-05-18 19:59:51 UTC (rev 486)
+++ pkg/stacomir/inst/config/libraries.R	2018-05-26 20:35:36 UTC (rev 487)
@@ -9,7 +9,7 @@
 #if (!'XML'%in%installed.packages()[, 'Package']) install.packages("XML", repos = "http://www.omegahat.org/R")
 #require('tcltk2')
 require('ggplot2')
-#require('gWidgets') # already called by depends
+require('gWidgets') # already called by depends
 require('RODBC')
 ##require('Hmisc')
 options(guiToolkit = "RGtk2")

Modified: pkg/stacomir/inst/examples/report_dc-example.R
===================================================================
--- pkg/stacomir/inst/examples/report_dc-example.R	2018-05-18 19:59:51 UTC (rev 486)
+++ pkg/stacomir/inst/examples/report_dc-example.R	2018-05-26 20:35:36 UTC (rev 487)
@@ -14,7 +14,7 @@
 	  horodatefin="2015-12-31",
 	  silent=TRUE)
   Sys.setenv(TZ='GMT')
-  # This dataset formating is GMT. If this option is not set
+  # This dataset format is GMT. If this option is not set
   # the dataset is tranformed from timestamp to date
   r_dc<-connect(r_dc)
   # this dataset has been loaded by the previous lines


Property changes on: pkg/stacomir/man/figures
___________________________________________________________________
Added: svn:ignore
   + *.pdf
*.png


Modified: pkg/stacomir/man/stacomiR-package.Rd
===================================================================
--- pkg/stacomir/man/stacomiR-package.Rd	2018-05-18 19:59:51 UTC (rev 486)
+++ pkg/stacomir/man/stacomiR-package.Rd	2018-05-26 20:35:36 UTC (rev 487)
@@ -7,8 +7,8 @@
 }
 \description{
 \packageDescription{stacomiR}
+}
 \details{
-The DESCRIPTION file:
 \packageDESCRIPTION{stacomiR}
 \packageIndices{stacomiR}
 To use the stacomiR package, simply load the library using \code{library(stacomiR)}. Once done, type \code{stacomi()} in R terminal.


Property changes on: pkg/stacomir/vignettes
___________________________________________________________________
Modified: svn:ignore
   - stacomir.pdf

   + stacomir.pdf
*.synctex
*.tex
*.aux
*.md
*.out


Added: pkg/stacomir/vignettes/.Rhistory
===================================================================