[Stacomir-commits] r371 - pkg/stacomir/R

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

Author: briand
Date: 2017-06-04 08:36:09 +0200 (Sun, 04 Jun 2017)
New Revision: 371

Modified:
   pkg/stacomir/R/utilitaires.r
Log:
Fixes bug for R3.4.0 
note : R3.4.0 calling below introduces a bug (cannot destroy external pointer)
 so we call dispose on any object which will destroy the top-level window
 and we call it again

Modified: pkg/stacomir/R/utilitaires.r
===================================================================
--- pkg/stacomir/R/utilitaires.r	2017-05-27 20:35:40 UTC (rev 370)
+++ pkg/stacomir/R/utilitaires.r	2017-06-04 06:36:09 UTC (rev 371)
@@ -6,19 +6,23 @@
 #' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
 quitte=function(...){
 	# all gWidgets object are assigned in .GlobalEnv, the other are in envir_stacomi
-	if (exists("ggroupboutonsbas",envir=.GlobalEnv)) 
-		# delete for something added with the add method
-		delete(ggroupboutons,ggroupboutonsbas)
-
-	if (exists("notebook",envir=envir_stacomi))
-		dispose(notebook)
-	
-
-	if (exists("group",envir=.GlobalEnv)) {
-		delete(ggroupboutons,group) 
-		rm(group,envir= .GlobalEnv)
-	}
-
+	# note R3.4.0 calling below introduces a bug (cannot destroy external pointer)
+	# so we call dispose on any object which will destroy the top-level window
+	# and we call it again
+#	if (exists("ggroupboutonsbas",envir=.GlobalEnv)) 
+#		# delete for something added with the add method
+#		delete(ggroupboutons,ggroupboutonsbas)
+#		
+#
+#	if (exists("notebook",envir=envir_stacomi))
+#		dispose(notebook)
+#	
+#
+#	if (exists("group",envir=.GlobalEnv)) {
+#		delete(ggroupboutons,group) 
+#		rm(group,envir= .GlobalEnv)
+#	}
+	dispose(ggroupboutonsbas)
 	if (exists("envir_stacomi")){
 		miettes=ls(envir=envir_stacomi)
 		if (length(miettes)> 0 ) {
@@ -30,6 +34,7 @@
 		rm(list=ls(pattern="frame",envir=.GlobalEnv),envir=.GlobalEnv)
 	}
 	if (exists("g")) rm(g)
+	interface_graphique()
 }
 
 #' function used for some lattice graphes with dates 
@@ -144,7 +149,7 @@
 		} else {
 			# the access to csv file failed despite database_expected=true
 			# if the file does not open, we switch to the file located within the package
-			cat("C:/program files/calcmig.csv does not exist, switching to defaut package file")
+			cat("C:/program files/stacomi/calcmig.csv does not exist, switching to defaut package file")
 			data("calcmig",envir=environment())				
 		}
 	} else {