[Zooimage-commits] r254 - in pkg/zooimage: . R man

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

Author: phgrosjean
Date: 2015-10-01 10:16:26 +0200 (Thu, 01 Oct 2015)
New Revision: 254

Modified:
   pkg/zooimage/DESCRIPTION
   pkg/zooimage/NAMESPACE
   pkg/zooimage/NEWS
   pkg/zooimage/R/gui.R
   pkg/zooimage/man/correctError.Rd
   pkg/zooimage/man/gui.Rd
   pkg/zooimage/man/zooimage.package.Rd
Log:
Small bugs correction

Modified: pkg/zooimage/DESCRIPTION
===================================================================
--- pkg/zooimage/DESCRIPTION	2015-09-29 13:21:59 UTC (rev 253)
+++ pkg/zooimage/DESCRIPTION	2015-10-01 08:16:26 UTC (rev 254)
@@ -1,8 +1,8 @@
 Package: zooimage
 Type: Package
 Title: Analysis of Numerical Zooplankton Images
-Version: 5.4-1
-Date: 2015-09-29
+Version: 5.4-2
+Date: 2015-10-01
 Author: Philippe Grosjean [aut, cre],
   Kevin Denis [aut], Guillaume Wacquet [aut]
 Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),

Modified: pkg/zooimage/NAMESPACE
===================================================================
--- pkg/zooimage/NAMESPACE	2015-09-29 13:21:59 UTC (rev 253)
+++ pkg/zooimage/NAMESPACE	2015-10-01 08:16:26 UTC (rev 254)
@@ -28,6 +28,7 @@
 
 # planktonSorter
 export(correctError)
+export(activeLearning)
 
 # Zic
 export(zicCheck)
@@ -176,6 +177,7 @@
 export(validClass)
 export(vignettesClass)
 export(viewManual)
+export(viewFrenchManual)
 export(viewResults)
 export(ZIDlg)
 # Not in menus yet!

Modified: pkg/zooimage/NEWS
===================================================================
--- pkg/zooimage/NEWS	2015-09-29 13:21:59 UTC (rev 253)
+++ pkg/zooimage/NEWS	2015-10-01 08:16:26 UTC (rev 254)
@@ -1,5 +1,13 @@
 = zooimage News
 
+== Changes in zooimage 5.4-2
+
+* Correction of one bug in the function addVigsToTrain().
+
+* The functions activeLearning() and viewFrenchManual() were not exported in
+  the NAMESPACE, but are required for the menus. Fixed.
+
+
 == Changes in zooimage 5.4-1
 
 * Correction of various bugs by Guillaume Wacquet.

Modified: pkg/zooimage/R/gui.R
===================================================================
--- pkg/zooimage/R/gui.R	2015-09-29 13:21:59 UTC (rev 253)
+++ pkg/zooimage/R/gui.R	2015-10-01 08:16:26 UTC (rev 254)
@@ -758,7 +758,7 @@
 			if (ChgVigs[i] %in% RedundantVigs1) {
 				status <- "Redundant"
 				pathTrain1 <- Paths1[which(Vigs1 == ChgVigs[i])]
-				athTrain2 <- ""
+				pathTrain2 <- ""
 				ChgToSave <- rbind(ChgToSave, cbind(nameChg, status,
 					pathTrain1, pathTrain2))
 			}

Modified: pkg/zooimage/man/correctError.Rd
===================================================================
--- pkg/zooimage/man/correctError.Rd	2015-09-29 13:21:59 UTC (rev 253)
+++ pkg/zooimage/man/correctError.Rd	2015-10-01 08:16:26 UTC (rev 254)
@@ -2,6 +2,7 @@
 \alias{correctError}
 \alias{addItemsToTrain}
 \alias{dropItemsToTrain}
+\alias{activeLearning}
 
 \title{ The ZooImage error correction (manual validation) tools }
 \description{
@@ -16,6 +17,8 @@
 addItemsToTrain(train, CtxSmp, add.mode = "SV+NSV", threshold = NA,
     dropItemsToTrain = dropItemsToTrain)
 dropItemsToTrain(train, cl, drop.nb)
+
+activeLearning(train, add.mode = "SV+NSV", threshold = NA)
 }
 
 \arguments{

Modified: pkg/zooimage/man/gui.Rd
===================================================================
--- pkg/zooimage/man/gui.Rd	2015-09-29 13:21:59 UTC (rev 253)
+++ pkg/zooimage/man/gui.Rd	2015-10-01 08:16:26 UTC (rev 254)
@@ -5,6 +5,7 @@
 \alias{closeAssistant}
 \alias{closeZooImage}
 \alias{viewManual}
+\alias{viewFrenchManual}
 \alias{focusR}
 \alias{focusGraph}
 \alias{acquireImg}
@@ -48,6 +49,7 @@
 closeAssistant()
 closeZooImage()
 viewManual()
+viewFrenchManual()
 focusR()
 focusGraph()
 acquireImg()

Modified: pkg/zooimage/man/zooimage.package.Rd
===================================================================
--- pkg/zooimage/man/zooimage.package.Rd	2015-09-29 13:21:59 UTC (rev 253)
+++ pkg/zooimage/man/zooimage.package.Rd	2015-10-01 08:16:26 UTC (rev 254)
@@ -16,8 +16,8 @@
   \tabular{ll}{
     Package: \tab zooimage\cr
     Type: \tab Package\cr
-    Version: \tab 5.4-1\cr
-    Date: \tab 2015-09-29\cr
+    Version: \tab 5.4-2\cr
+    Date: \tab 2015-10-01\cr
     License: \tab GPL 2 or above at your convenience.\cr
   }
 }