[Stacomir-commits] r461 - pkg/stacomir pkg/stacomir/R stacomir0.5.3/pkg/stacomir/R

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Mon Sep 4 14:39:39 CEST 2017 

Author: briand
Date: 2017-09-04 14:39:39 +0200 (Mon, 04 Sep 2017)
New Revision: 461

Modified:
   pkg/stacomir/.Rbuildignore
   pkg/stacomir/DESCRIPTION
   pkg/stacomir/NEWS.md
   pkg/stacomir/R/interface_report_mig_char.R
   pkg/stacomir/README.Rmd
   pkg/stacomir/README.md
   stacomir0.5.3/pkg/stacomir/R/interface_report_mig_char.R
Log:


Modified: pkg/stacomir/.Rbuildignore
===================================================================
--- pkg/stacomir/.Rbuildignore	2017-09-01 17:32:16 UTC (rev 460)
+++ pkg/stacomir/.Rbuildignore	2017-09-04 12:39:39 UTC (rev 461)
@@ -1,3 +1,6 @@
 ^README\.Rmd$
 ^README-.*\.png$
-^logo\.png$
\ No newline at end of file
+^logo\.png$
+^NEWS.md$
+^NEWS.md.html$
+^README.md.html$
\ No newline at end of file

Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION	2017-09-01 17:32:16 UTC (rev 460)
+++ pkg/stacomir/DESCRIPTION	2017-09-04 12:39:39 UTC (rev 461)
@@ -1,5 +1,5 @@
 Package: stacomiR
-Version: 0.5.3.452
+Version: 0.5.3.9000
 Date: 2017-09-01
 Title: Fish Migration Monitoring
 Authors at R: c(person("Cedric", "Briand", role = c("aut", "cre"), email = "cedric.briand00 at gmail.com"),
@@ -8,7 +8,7 @@
 Description: Graphical outputs and treatment for a database of fish pass
     monitoring. It is a part of the 'STACOMI' open source project developed in
     France by the French Agency for Biodiversity (AFB) institute to centralize
-    data obtained by fish pass monitoring. Version 0.5.3.452 is available in French and
+    data obtained by fish pass monitoring. Version 0.5.3.9000 is available in French and
     English. See <http://stacomir.r-forge.r-project.org/> for more information on
     'STACOMI'.
 License: GPL (>= 2)

Modified: pkg/stacomir/NEWS.md
===================================================================
--- pkg/stacomir/NEWS.md	2017-09-01 17:32:16 UTC (rev 460)
+++ pkg/stacomir/NEWS.md	2017-09-04 12:39:39 UTC (rev 461)
@@ -1,4 +1,4 @@
-# stacomiR 0.5.3.452
+# stacomiR 0.5.3.9000
 
 * added and edited readme.Rmd file (@cedric and @marion #447-#452)
 
@@ -14,4 +14,39 @@
 
 * changes to the summary-report\_mig\_interannual-method (@cedric # 439)
 
-* change to the presentation page in R-forge (@timothée #425 #436-#438)
\ No newline at end of file
+* change to the presentation page in R-forge (@timothée #425 #436-#438)
+
+# stacomiR 0.5.3
+
+* Langage with poedit (@cedric and @timothee).
+
+* suppress all assignments to .globalEnv.
+
+* adapt documentation and package to pass with zero warning and zero note.
+
+# stacomiR 0.5.2 (R-Forge)
+
+* Development of the command line interface (@ cedric)
+
+* Adaptation to the database change to adapt French SANDRE directives (@ cedric)
+
+* added 4 new report (silver eel, sea age, report\_mig\_mult, report_annual) and adapted all old script to use in both command line and graphical interface. (@ cedric and @marion)
+
+# stacomiR 0.5.1 (R-Forge)
+
+* tests with testthat (@cedric)
+
+# stacomiR 0.5.0 (R-Forge)
+
+* Roxygen documentation (@cedric)
+
+# stacomiR 0.4 (R-Forge)
+
+* classes adapted to the new database format
+
+# stacomiR 0.3 (R-Forge)
+
+* Adapting to one schema per user in the postgres database 
+
+* initial development of all classes following version 0.3 of the database
+ 
\ No newline at end of file

Modified: pkg/stacomir/R/interface_report_mig_char.R
===================================================================
--- pkg/stacomir/R/interface_report_mig_char.R	2017-09-01 17:32:16 UTC (rev 460)
+++ pkg/stacomir/R/interface_report_mig_char.R	2017-09-04 12:39:39 UTC (rev 461)
@@ -45,8 +45,6 @@
   choicemult(r_mig_char at horodatefin,,nomassign="bmC_date_fin",label=gettext("to",domain="R-stacomiR"),decal=0)
   choicemult(r_mig_char at echantillon)
   choicemult(r_mig_char at dc,objectreport=r_mig_char,is.enabled=TRUE)
-# FIXME Error in .local(object, ...) : 
-#  unused arguments (label = "Qualitative feature", frameassign = "frame_parqual") verify
   svalue(notebook)<-1	
   ggroupboutons<-get("ggroupboutons",envir=envir_stacomi)
   gWidgets::add(ggroupboutons,group)

Modified: pkg/stacomir/README.Rmd
===================================================================
--- pkg/stacomir/README.Rmd	2017-09-01 17:32:16 UTC (rev 460)
+++ pkg/stacomir/README.Rmd	2017-09-04 12:39:39 UTC (rev 461)
@@ -66,7 +66,7 @@
 -------------------    
 The open source postgresql database comprises a common schema with dictionaries,
 and different schema for different users. Each user can save its own schema and
-send it to others. *Contact the authors to get a copy of the database*. The
+send it to others. The
 database comprises tables related to infrastructure, operations and fish
 samples. 
 *Contact the authors to get a copy of the database*.
@@ -193,7 +193,7 @@
 We are evaluating the migration
 of all stages of eel (glass eel CIV, yellow eel AGJ and silver eel AGG).
 Glass
-eel and yellow eel migrate to the watershed while silver eel
+eel and yellow eel migrate to the watershed while silver eels
 are migrating back
 to the ocean.
 Data are loaded from the database with the `charge` method and the `calcule`
@@ -291,7 +291,9 @@
 ### R-GTK2 graphical interface
 
 The program is intended to be used by 'non experienced' R users. Launching
-`stacomi()` will create the interface.
+`stacomi()` will create the interface. The interface looks like :
+[Durif et al.,
+2009](http://fishlarvae.org/common/SiteMedia/durif%20et%20al%202009b.pdf))
 
 License
 -------

Modified: pkg/stacomir/README.md
===================================================================
--- pkg/stacomir/README.md	2017-09-01 17:32:16 UTC (rev 460)
+++ pkg/stacomir/README.md	2017-09-04 12:39:39 UTC (rev 461)
@@ -60,7 +60,7 @@
 -------------------    
 The open source postgresql database comprises a common schema with dictionaries,
 and different schema for different users. Each user can save its own schema and
-send it to others. *Contact the authors to get a copy of the database*. The
+send it to others. The
 database comprises tables related to infrastructure, operations and fish
 samples. 
 *Contact the authors to get a copy of the database*.

Modified: stacomir0.5.3/pkg/stacomir/R/interface_report_mig_char.R
===================================================================
--- stacomir0.5.3/pkg/stacomir/R/interface_report_mig_char.R	2017-09-01 17:32:16 UTC (rev 460)
+++ stacomir0.5.3/pkg/stacomir/R/interface_report_mig_char.R	2017-09-04 12:39:39 UTC (rev 461)
@@ -45,8 +45,6 @@
   choicemult(r_mig_char at horodatefin,,nomassign="bmC_date_fin",label=gettext("to",domain="R-stacomiR"),decal=0)
   choicemult(r_mig_char at echantillon)
   choicemult(r_mig_char at dc,objectreport=r_mig_char,is.enabled=TRUE)
-# FIXME Error in .local(object, ...) : 
-#  unused arguments (label = "Qualitative feature", frameassign = "frame_parqual") verify
   svalue(notebook)<-1	
   ggroupboutons<-get("ggroupboutons",envir=envir_stacomi)
   gWidgets::add(ggroupboutons,group)

More information about the Stacomir-commits mailing list