diff options
| -rw-r--r-- | DESCRIPTION | 8 | ||||
| -rw-r--r-- | R/gmkin.R | 11 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | inst/GUI/README | 2 | ||||
| -rw-r--r-- | inst/GUI/TODO | 4 | ||||
| -rw-r--r-- | inst/GUI/gmkin.R (renamed from inst/GUI/mkinGUI.R) | 0 | ||||
| -rw-r--r-- | man/gmkin.Rd | 19 |
7 files changed, 38 insertions, 8 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index 80f87454..5c55e362 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,9 +3,11 @@ Type: Package Title: Routines for fitting kinetic models with one or more state variables to chemical degradation data Version: 0.9-25 -Date: 2013-11-17 -Author: Johannes Ranke, with contributions from Katrin Lindenberger, René Lehmann -Maintainer: Johannes Ranke <jranke@uni-bremen.de> +Date: 2013-11-18 +Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre"), + email = "jranke@uni-bremen.de"), + person("Katrin", "Lindenberger", role = "ctb"), + person("René", "Lehmann", role = "ctb")) Description: Calculation routines based on the FOCUS Kinetics Report (2006). Includes a function for conveniently defining differential equation models, model solution based on eigenvalues if possible or using numerical solvers diff --git a/R/gmkin.R b/R/gmkin.R new file mode 100644 index 00000000..912d31c2 --- /dev/null +++ b/R/gmkin.R @@ -0,0 +1,11 @@ +gmkin <- function() { + if (require(gWidgetsWWW2)) load_app(system.file("GUI/gmkin.R", package = "mkin")) + else { + message( + "\nYou need to install gWidgetsWWW2 in order to run the mkin GUI gmkin.\n", + "This package is not currently on CRAN but can be installed from github\n", + "using the devtools package:\n", + "library(devtools)\n", + "install_github('gWidgetsWWW2', 'jverzani')") + } +} @@ -1,8 +1,8 @@ TODO for version 1.0 - Think about what a user would expect from version 1.0 -- Move the GUI to a separate package as it has special dependencies and should have it own versioning - Support model definitions without pathway to sink in combination with formation fractions - Complete the main package vignette named mkin to include a method description +- Calculate pseudoDT50 values as recommended by FOCUS Nice to have: - Calculate confidence intervals for DT50 and DT90 values when only one parameter is involved diff --git a/inst/GUI/README b/inst/GUI/README index f431c2d1..89e37265 100644 --- a/inst/GUI/README +++ b/inst/GUI/README @@ -1 +1 @@ -These code fragments are experimental. +These code fragments are still experimental, but some basic functionality works. diff --git a/inst/GUI/TODO b/inst/GUI/TODO index c0e822c6..1fbcca66 100644 --- a/inst/GUI/TODO +++ b/inst/GUI/TODO @@ -1,3 +1 @@ -- Import of csv files -- Make summary text file accessible -- Make plot of fit and residuals accessible +- Make plot of fit and residuals configurable diff --git a/inst/GUI/mkinGUI.R b/inst/GUI/gmkin.R index 07f892e0..07f892e0 100644 --- a/inst/GUI/mkinGUI.R +++ b/inst/GUI/gmkin.R diff --git a/man/gmkin.Rd b/man/gmkin.Rd new file mode 100644 index 00000000..29a4f8ca --- /dev/null +++ b/man/gmkin.Rd @@ -0,0 +1,19 @@ +\name{gmkin} +\alias{gmkin} +\title{ + Start a graphical user interface (GUI) based on the \code{gWidgetsWWW2} toolkit. +} +\description{ + This function starts a browser based GUI. Please visit the + \href{http://github.com/jverzani/gWidgetsWWW2}{github page of gWidgetsWWW2} + for an explanation how this toolkit works. +} +\usage{ + gmkin() +} +\value{ + The function is called for its side effect, namely starting the GUI in a browser. +} +\author{ + Johannes Ranke +} |