[Stacomir-commits] r326 - in pkg/stacomir: R R/po inst/examples inst/po/fr/LC_MESSAGES

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

Author: briand
Date: 2017-03-19 20:56:06 +0100 (Sun, 19 Mar 2017)
New Revision: 326

Modified:
   pkg/stacomir/R/BilanConditionEnv.r
   pkg/stacomir/R/interface_BilanConditionEnv.r
   pkg/stacomir/R/po/R-stacomiR_fr_FR.mo
   pkg/stacomir/R/po/R-stacomiR_fr_FR.po
   pkg/stacomir/inst/examples/bilanConditionEnv_example.R
   pkg/stacomir/inst/po/fr/LC_MESSAGES/R-stacomiR.mo
Log:


Modified: pkg/stacomir/R/BilanConditionEnv.r
===================================================================
--- pkg/stacomir/R/BilanConditionEnv.r	2017-03-19 19:39:05 UTC (rev 325)
+++ pkg/stacomir/R/BilanConditionEnv.r	2017-03-19 19:56:06 UTC (rev 326)
@@ -1,9 +1,8 @@
-#TODO add link to example in Roxygen, develop plot and summary methods
 #' class BilanConditionEnv simple output of one or several environmental
 #' conditions...
 #' 
-#' Annual overview of environmental conditions. Enables to draw charts and
-#' write files.
+#' Annual overview of environmental conditions. Enables to draw some plot. Mostly used to build
+#' joined graphs for BilanMigration in class BilanMigrationConditionEnv
 #' 
 #' @include RefHorodate.r 
 #' @include RefStationMesure.r
@@ -23,6 +22,7 @@
 #' @keywords classes
 #' @aliases BilanConditionEnv bilanConditionEnv
 #' @keywords classes
+#' @example inst/examples/bilanConditionEnv_example.R
 #' @export 
 setClass(Class="BilanConditionEnv",
 		representation=representation(			

Modified: pkg/stacomir/R/interface_BilanConditionEnv.r
===================================================================
--- pkg/stacomir/R/interface_BilanConditionEnv.r	2017-03-19 19:39:05 UTC (rev 325)
+++ pkg/stacomir/R/interface_BilanConditionEnv.r	2017-03-19 19:56:06 UTC (rev 326)
@@ -1,5 +1,3 @@
-# Nom fichier :        interface_BilanConditionEnv    (classe)
-
 #' Interface for class conditionEnv
 #' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
 interface_ConditionEnv = function()
@@ -14,19 +12,15 @@
 
     assign("group",group,envir = .GlobalEnv)
    gWidgets::add(ggroupboutons,group)
-    
-    # date de debut et de fin
     choice(bilanConditionEnv at horodatedebut,label=gettext("Begginning",domain="R-stacomiR"),
 			nomassign="bilanConditionEnv_date_debut",
 			funoutlabel=gettext("Beginning date has been chosen\n",domain="R-stacomiR"),
-			decal=-2,
-			affichecal=FALSE)
+			decal=-2)
     choice(bilanConditionEnv at horodatefin,
 			label=gettext("End",domain="R-stacomiR"),
 			nomassign="bilanConditionEnv_date_fin",
 			funoutlabel=gettext("Ending date has been chosen\n",domain="R-stacomiR"),
-			decal=-1,
-			affichecal=FALSE)
+			decal=-1)
     choice(bilanConditionEnv at stationMesure)
     
     ggroupboutonsbas = gWidgets::ggroup(horizontal=FALSE)
@@ -34,14 +28,9 @@
     assign("ggroupboutonsbas",ggroupboutonsbas, envir=.GlobalEnv)
     
     toolbarlist = list(
-    #Calc=gWidgets::gaction(handler=hbilanConditionEnvcalc , action=bilanConditionEnv,icon = "new",label="calcul",tooltip="calcul des conditions environnementales entre deux dates"),
     Graph=gWidgets::gaction(handler=hbilanConditionEnvgraph , icon = "graph",label="graph",tooltip=gettext("Summary graphic",domain="R-stacomiR")),
-    Stat =gWidgets::gaction(handler=hbilanConditionEnvstat , icon = "matrix",label="stat",tooltip=gettext("Summary tables in .csv",domain="R-stacomiR")),
     annuler=gWidgets::gaction(handler= quitte,icon = "close",label=gettext("Exit",domain="R-stacomiR"),domain="R-stacomiR"))
     gWidgets::add(ggroupboutonsbas, gtoolbar(toolbarlist))
     gWidgets::addSpring(group)
-    #graphes=ggraphics(width=600,height=400)
-    #add(ggrouptotal1,graphes )  # on ajoute au groupe horizontal
-    #assign("graphes",graphes,envir=envir_stacomi)
 	dev.new()
 }
\ No newline at end of file

Modified: pkg/stacomir/R/po/R-stacomiR_fr_FR.mo
===================================================================
(Binary files differ)

Modified: pkg/stacomir/R/po/R-stacomiR_fr_FR.po
===================================================================
--- pkg/stacomir/R/po/R-stacomiR_fr_FR.po	2017-03-19 19:39:05 UTC (rev 325)
+++ pkg/stacomir/R/po/R-stacomiR_fr_FR.po	2017-03-19 19:56:06 UTC (rev 326)
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: stacomiR 0.5.0\n"
-"POT-Creation-Date: 2017-02-02 12:54+0100\n"
-"PO-Revision-Date: 2017-02-02 13:21+0100\n"
+"POT-Creation-Date: 2017-03-19 20:51+0100\n"
+"PO-Revision-Date: 2017-03-19 20:54+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -843,7 +843,7 @@
 msgstr "Choix du nombre de pas de temps"
 
 msgid "Ending date"
-msgstr ""
+msgstr "Date de fin"
 
 msgid "Not implemented for objectBilan = %s"
 msgstr "Non éxécuté pour objectBilan = %s"
@@ -869,7 +869,7 @@
 msgstr "inexistant dans la base de données, données disponibles "
 
 msgid ","
-msgstr ""
+msgstr ","
 
 msgid "les longeur de 'labels' et 'checked' sont differentes"
 msgstr "les longeur de 'labels' et 'checked' sont differentes"

Modified: pkg/stacomir/inst/examples/bilanConditionEnv_example.R
===================================================================
--- pkg/stacomir/inst/examples/bilanConditionEnv_example.R	2017-03-19 19:39:05 UTC (rev 325)
+++ pkg/stacomir/inst/examples/bilanConditionEnv_example.R	2017-03-19 19:56:06 UTC (rev 326)
@@ -1,9 +1,7 @@
 require(stacomiR)
-# launching stacomi without selecting the scheme or interface
 stacomi(gr_interface=FALSE,
 		login_window=FALSE,
 		database_expected=FALSE)
-# the following script will load the Arzal dataset if connected to iav schema
 \dontrun{
 	bil_CE<-new("BilanConditionEnv")
 	bil_CE<-choice_c(bil_CE,

Modified: pkg/stacomir/inst/po/fr/LC_MESSAGES/R-stacomiR.mo
===================================================================
(Binary files differ)