diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2015-12-11 07:30:39 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-12-11 07:30:39 +0100 |
commit | b2a6b64968b9047a62cc503a23f42a796afe6e51 (patch) | |
tree | 84e701e8ab8619bbc58fc7b3fd5a2a98ac840dc4 /inst/GUI/gmkin.R | |
parent | d53d967e9734ef3939966933bda39a7d4ad615cc (diff) |
Two more GUI inconsistencies
- Respect use_of_ff='min' for models loaded from project files
- Disable configure button after loading a project
Diffstat (limited to 'inst/GUI/gmkin.R')
-rw-r--r-- | inst/GUI/gmkin.R | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R index ef60139..8e8e445 100644 --- a/inst/GUI/gmkin.R +++ b/inst/GUI/gmkin.R @@ -194,6 +194,7 @@ p.switcher <- function(h, ...) { svalue(center) <- 1
svalue(c.ds) <- empty_conf_labels[1]
svalue(c.m) <- empty_conf_labels[2]
+ f.conf$call_Ext("disable")
update_p_editor(p.cur)
update_ds.df()
update_m.df()
@@ -351,7 +352,7 @@ update_plot_obssel <- function() { configure_fit_handler <- function(h, ...) { # Configure fit button {{{3
if (length(intersect(names(m.cur$spec), ds.cur$observed)) > 0) {
if (is.null(m.cur$cf) && Sys.which("gcc") != "") {
- mtmp <- mkinmod(speclist = m.cur$spec)
+ mtmp <- mkinmod(speclist = m.cur$spec, use_of_ff = m.cur$use_of_ff)
mtmp$name <- m.cur$name
m.cur <<- mtmp
}
|