diff --git a/DESCRIPTION b/DESCRIPTION index 2278365..d9d7278 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: RnavGraph Type: Package Title: Using graphs as a navigational infrastructure. -Version: 0.1.2 -Date: 2012-02-15 +Version: 0.1.3 +Date: 2012-04-16 Author: Adrian R. Waddell and R. Wayne Oldford Maintainer: Adrian Waddell Url: http://www.navgraph.com @@ -20,6 +20,6 @@ Collate: 'AllGenerics.R' 'ng_data.R' 'ng_graph.R' 'ng_path.R' 'Viz2D_Ggobi.R' 'Viz2D_Axis.R' 'Viz2D_tk2d.R' 'FunctionNavGraph.R' 'graphtools.R' 'navGraph.R' 'scagNav.R' 'zzz.R' -Packaged: 2012-02-17 12:21:03 UTC; adrian +Packaged: 2012-04-22 22:08:02 UTC; adrian Repository: CRAN -Date/Publication: 2012-02-17 17:18:29 +Date/Publication: 2012-04-23 05:50:58 diff --git a/MD5 b/MD5 index d883e09..92612ee 100644 --- a/MD5 +++ b/MD5 @@ -1,6 +1,6 @@ -b1c74de1902019922b72646a074be1ec *DESCRIPTION +3673d9d195109d07e3b01eaa77b502b3 *DESCRIPTION c2013f30dbf0baba1aaccacd9a1f38d5 *NAMESPACE -13488fab8b0813269a3ecdef9a60d9c9 *NEWS +5b6dd643e175d892e1b82c7801aaad86 *NEWS 2eb21102bd24f42a9eaa379c87aa36e3 *R/AllGenerics.R 1eae90f5511b1e0227466cecb11e61a3 *R/FunctionNavGraph.R 698183f7c8d7f656c8bda9b23251958c *R/GraphDisplay.R @@ -18,7 +18,7 @@ e2046071e11a654375f749ae3f73a299 *R/ng_data.R b329d41fa64771577a44a16fadf604a7 *R/ng_image.R a99f1c3a3c7c5bab62790b432ad4e06c *R/ng_path.R 2df6ec796522c5881afa798e4091d435 *R/scagNav.R -f0faaa3bcbd4ac6b9f5be64be8f5326f *R/zzz.R +5a4d3cd998af953695dd538d3713dcb4 *R/zzz.R 05fa39a7aa4a291f0106a0d5c0f1af5f *data/olive.rda 4c65ddaaa2d9011f2f2ecf1ced77cc38 *demo/00Index f6bed440461ba5b5119b13ea84486afe *demo/ng_2d_image_files_aloi.R @@ -37,7 +37,7 @@ e6195073c4c1053f62f75299ab46dc34 *demo/ng_2d_myplot_grid.R 893374fbe4c8212a0239feb08c2cdaaa *demo/ng_2d_scagnostics_olive.R ff1cda694de51a83619676e3aca1c099 *demo/ng_own_viz.R 0a75373364cfcf4acae0aa67e48c3533 *inst/doc/RnavGraph.Rnw -e084b049d0c279a64fb3879ebc2d99a2 *inst/doc/RnavGraph.pdf +2d8fce94c6d4f91b52d024f833d9a8b2 *inst/doc/RnavGraph.pdf b32561c5cecdc451ee9a893f3efecd4b *inst/tcl/GraphDisplay.tcl ffbe67dcab0a0c7cf371524ffcba5a4d *inst/tcl/tkScatterplotV1.tcl 94bfc13ab09e12cfb4bbc2b23e0f4c05 *inst/tcl/tkScatterplotV3.tcl diff --git a/NEWS b/NEWS index 3b9236c..6c5ab5a 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,11 @@ +New to Version 0.1.3 +-------------------- +* fixed .onLoad and .onAttach + New to Version 0.1.2 -------------------- -* Added Slicing +* Vignette updated +* Minor Bug fixes New to Version 0.1.1 -------------------- diff --git a/R/zzz.R b/R/zzz.R index 5cdb4c2..1a2d51e 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -1,18 +1,18 @@ -.onLoad <- function(lib, pkg) { +.onLoad <- function(libname, pkgname) { .Tcl('set ng_windowManager("ngInstance") 0') ## graph display - tclfile <- file.path(.find.package(package = "RnavGraph"),"tcl", "GraphDisplay.tcl") + tclfile <- file.path(.find.package(package = pkgname, lib.loc = libname),"tcl", "GraphDisplay.tcl") tcl("source", tclfile) ## image resizing function in C - .Tcl(paste('load "',system.file("libs",.Platform$r_arch,paste("ImgscaleTea",.Platform$dynlib.ext,sep=''),package="RnavGraph"),'"',sep='')) - .Tcl(paste('load "',system.file("libs",.Platform$r_arch,paste("DisplaystuffTea",.Platform$dynlib.ext,sep=''),package="RnavGraph"),'"',sep='')) + .Tcl(paste('load "',system.file("libs",.Platform$r_arch,paste("ImgscaleTea",.Platform$dynlib.ext,sep=''), package = pkgname, lib.loc = libname),'"',sep='')) + .Tcl(paste('load "',system.file("libs",.Platform$r_arch,paste("DisplaystuffTea",.Platform$dynlib.ext,sep=''),package = pkgname, lib.loc = libname),'"',sep='')) ## tk2d display - tclfile <- file.path(.find.package(package = "RnavGraph"),"tcl", "tkScatterplotV3.tcl") + tclfile <- file.path(.find.package(package = pkgname, lib.loc = libname),"tcl", "tkScatterplotV3.tcl") tcl("source", tclfile) ## load Img tk extension @@ -31,8 +31,8 @@ } -.onAttach <- function(lib, pkg) { +.onAttach <- function(libname, pkgname) { packageStartupMessage("\nRnavGraph Version ", - utils::packageDescription("RnavGraph", field="Version"), + utils::packageDescription(pkg = pkgname, lib.loc = libname, field="Version"), '\nPlease read the package vignette. Use vignette("RnavGraph").\n\n') } diff --git a/inst/doc/RnavGraph.pdf b/inst/doc/RnavGraph.pdf index 0f51720..5a0c0a2 100644 Binary files a/inst/doc/RnavGraph.pdf and b/inst/doc/RnavGraph.pdf differ