diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2014-07-16 09:31:25 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2014-07-16 09:37:35 +0200 |
| commit | c6460f91802c3a57e28be52b841bcd7fa938fb43 (patch) | |
| tree | 5b594a54214a4705ce3b55c2ceade5483cbaa054 | |
| parent | 38e80ae890d2bd0eecc831c37b0937e54ed23be3 (diff) | |
Fix sorting in fit list, add NEWS file
| -rw-r--r-- | .Rbuildignore | 1 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | DESCRIPTION | 4 | ||||
| -rw-r--r-- | GNUmakefile | 5 | ||||
| -rw-r--r-- | NEWS.md | 15 | ||||
| -rw-r--r-- | inst/GUI/gmkin.R | 5 |
6 files changed, 26 insertions, 5 deletions
diff --git a/.Rbuildignore b/.Rbuildignore index 7805348..dba8928 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,2 +1,3 @@ GNUmakefile +NEWS.md gmkin_screenshot.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..edc0071 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +NEWS diff --git a/DESCRIPTION b/DESCRIPTION index f6be6d4..80b7bf6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: gmkin Type: Package Title: GUI for fitting kinetic models to chemical degradation data with mkin -Version: 0.5-1 -Date: 2014-07-03 +Version: 0.5-2 +Date: 2014-07-16 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de"), person("Eurofins Regulatory AG", role = "cph")) diff --git a/GNUmakefile b/GNUmakefile index 7466d85..b034b3e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -25,7 +25,10 @@ help: # Development Tasks #------------------------------------------------------------------------------ -build: +NEWS: NEWS.md + sed -e 's/^-/ -/' -e 's/^## *//' -e 's/^#/\t\t/' <NEWS.md | fmt -80 >NEWS + +build: NEWS cd ..;\ "$(RBIN)/R" CMD build $(PKGSRC) @@ -0,0 +1,15 @@ +# CHANGES in gmkin VERSION 0.5-2 + +## BUG FIXES + +- Sorting in the fit table now works correctly + +## MINOR CHANGES + +- The statusbar message was improved + +- This NEWS file was added, in markdown format for viewing on github + +# CHANGES in gmkin VERSION 0.5-1 + +- This is the gmkin version presented at SETAC in Basel diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R index 7566824..12d5d14 100644 --- a/inst/GUI/gmkin.R +++ b/inst/GUI/gmkin.R @@ -47,7 +47,7 @@ ds.df <- data.frame() m.df <- data.frame()
f.df <- data.frame()
# Empty versions of meta data {{{2
-f.df.empty <- data.frame(Fit = "0",
+f.df.empty <- data.frame(Fit = as.integer(0),
Dataset = "",
Model = "",
stringsAsFactors = FALSE)
@@ -92,7 +92,8 @@ update_f.df <- function() { for (fit.index in names(f)) {
f.count <- f.count + 1
ftmp <- f[[fit.index]]
- f.df[f.count, ] <<- c(as.character(f.count), ftmp$ds.index, ftmp$mkinmod$name)
+ f.df[f.count, "Fit"] <<- as.integer(f.count)
+ f.df[f.count, c("Dataset", "Model")] <<- c(ftmp$ds.index, ftmp$mkinmod$name)
}
}
# Initialise meta data objects {{{1
|