Depend on mkin (>= 1.0.2) to preserve model names in fits

Some comments and small rearrangements in the GUI code that I introduced
as I started to review it.

1 files changed, 6 insertions, 3 deletions

diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R
index 7e0a052..63d347c 100644
--- a/inst/GUI/gmkin.R
+++ b/inst/GUI/gmkin.R
@@ -1,6 +1,6 @@
 # gWidgetsWWW2 GUI for mkin {{{1

 

-# Copyright (C) 2013-2016,2018,2019 Johannes Ranke

+# Copyright (C) 2013-2016,2018,2019,2021 Johannes Ranke

 # Portions of this file are copyright (C) 2013 Eurofins Regulatory AG, Switzerland

 # Contact: jranke@uni-bremen.de

 

@@ -21,17 +21,18 @@
 

 # Configuration {{{1

 # Widgets {{{2

+# Three column layout

 left_width = 250

 right_width = 500

+# Widget heights in left column

 ds_height = 142

 m_height = 142

 f_height = 142

-save_keybinding = "Shift-F12"

+# Model editor gcombobox with mkinmod model definition

 gcb_observed_width = 100

 gcb_type_width = 70

 gcb_to_width = 160

 gcb_sink_width = 70

-

 # Plotting {{{2

 plot_formats <- c("png", "pdf")

 if (requireNamespace("devEMF", quietly = TRUE)) {

@@ -40,6 +41,8 @@ if (requireNamespace("devEMF", quietly = TRUE)) {
 plot_format <- plot_formats[[1]]

 # Options {{{2

 options(width = 75) # For summary

+# Keybinding {{{2

+save_keybinding = "Shift-F12"

 # Set the GUI title and create the basic widget layout {{{1

 # Three panel layout {{{2

 window_title <- paste0("gmkin ", packageVersion("gmkin"),