Skip to content

Commit

Permalink
Two more GUI inconsistencies
Browse files Browse the repository at this point in the history
- Respect use_of_ff='min' for models loaded from project files
- Disable configure button after loading a project
  • Loading branch information
jranke committed Dec 11, 2015
1 parent d53d967 commit b2a6b64
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
8 changes: 8 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# NEWS for package 'gmkin'

## gmkin 0.6-5 (2015-12-11)

### Bug fixes

- When configuring a fit using a model with use_of_ff = 'max', this was ignored when the model was loaded from a project file

- The configure button was not disabled when switching a project (which clears model and dataset selections)

## gmkin 0.6-4 (2015-12-09)

- Various small corrections of unexpected or incorrect GUI behaviour. See git commit logs for details.
Expand Down
3 changes: 2 additions & 1 deletion inst/GUI/gmkin.R
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit b2a6b64

Please sign in to comment.