From 4ecf6504406842824850a288f964954261220aa1 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Sat, 13 Feb 2021 09:43:58 +0100 Subject: Another workspace update, remove outdated option --- NEWS.md | 4 ++++ data/FOCUS_2006.RData | Bin 4268 -> 9848 bytes docs/pkgdown.yml | 2 +- inst/GUI/gmkin.R | 10 ---------- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/NEWS.md b/NEWS.md index 7b21903..ec13ced 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,10 @@ - Depend on mkin (>= 1.0.2) which preserves model names stored in 'mkinmod' objects, which were overwritten starting from mkin 1.0.0 +- Remove option to plot during fit, as mkin does not have this functionality any more + +- Another update of the 'FOCUS_2006' workspace to satisfy gmkin on windows + ## gmkin 0.6-11 (2021-02-12) - Adapt built-in 'FOCUS_2006' workspace to mkin 1.0.x as we have now have the 'deg_func' element in 'mkinmod' objects diff --git a/data/FOCUS_2006.RData b/data/FOCUS_2006.RData index a2641e2..a85b1bf 100644 Binary files a/data/FOCUS_2006.RData and b/data/FOCUS_2006.RData differ diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index eaddd9e..7c00991 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -3,5 +3,5 @@ pkgdown: 1.6.1 pkgdown_sha: ~ articles: gmkin_manual: gmkin_manual.html -last_built: 2021-02-13T06:25Z +last_built: 2021-02-13T08:43Z diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R index 63d347c..cfaa6e8 100644 --- a/inst/GUI/gmkin.R +++ b/inst/GUI/gmkin.R @@ -987,19 +987,11 @@ run_fit_handler <- function(h, ...) { #{{{3 iniparms <- Parameters.ini$Initial names(iniparms) <- sub("_0", "", Parameters.ini$Name) inifixed <- names(iniparms[Parameters.ini$Fixed]) - if (svalue(f.gg.opts.plot)) { - if (.Platform$OS.type == "windows") { - # When on windows, check for an active windows device. If not present, - # open one - if (attr(dev.cur(), "names") != "windows") windows() - } - } ftmp <<- mkinfit(m.cur, override(ds.cur$data), state.ini = iniparms, fixed_initials = inifixed, parms.ini = deparms, fixed_parms = defixed, - plot = svalue(f.gg.opts.plot), solution_type = svalue(f.gg.opts.st), atol = as.numeric(svalue(f.gg.opts.atol)), rtol = as.numeric(svalue(f.gg.opts.rtol)), @@ -1142,8 +1134,6 @@ f.gg.opts.g <- ggroup(cont = f.config) # First group {{{4 f.gg.opts.1 <- gformlayout(cont = f.gg.opts.g) solution_types <- c("auto", "analytical", "eigen", "deSolve") -f.gg.opts.plot <- gcheckbox("Plot during the fit", - cont = f.gg.opts.1, checked = FALSE) f.gg.opts.st <- gcombobox(solution_types, selected = 1, label = "solution_type", width = 160, cont = f.gg.opts.1) -- cgit v1.2.1