Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle gmt set GMT_THEME classic in a modern session #4726

Merged
merged 7 commits into from
Feb 2, 2021
Merged

Handle gmt set GMT_THEME classic in a modern session #4726

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4940122
Handle gmt set GMT_THEME classic in a modern session
PaulWessel Jan 31, 2021
5aceae3
Update src/gmt_init.c
PaulWessel Jan 31, 2021
968059c
Update src/gmt_init.c
PaulWessel Jan 31, 2021
8855a82
Merge branch 'gmt-themes' into gmt-themes-classic
PaulWessel Jan 31, 2021
9c344cc
Merge branch 'master' into gmt-themes-classic
PaulWessel Jan 31, 2021
4feb721
Merge branch 'gmt-themes' into gmt-themes-classic
Feb 2, 2021
188e805
Update src/gmt_init.c
Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions src/gmt_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3096,8 +3096,8 @@ void gmt_reload_history (struct GMT_CTRL *GMT) {
}

void gmt_reload_settings (struct GMT_CTRL *GMT) {
gmt_conf_SI(GMT); /* Get the original system defaults */
(void)gmt_getdefaults (GMT, NULL); /* Overload user defaults */
gmt_conf_SI(GMT); /* Get the original system defaults for SI */
(void)gmt_getdefaults (GMT, NULL); /* Overload with any user defaults from initial gmt.conf */
}

/*! . */
Expand Down Expand Up @@ -6325,6 +6325,33 @@ GMT_LOCAL void gmtinit_conf_classic (struct GMT_CTRL *GMT) {

if (!strncmp (GMT_DEF_UNITS, "US", 2U))
gmtinit_conf_classic_US (GMT); /* Override with US settings */

if (GMT->current.setting.run_mode == GMT_MODERN) { /* Means we switch to classic in a modern mode setssion */
GMT_keyword_updated[GMTCASE_FONT_ANNOT_PRIMARY] = true;
GMT_keyword_updated[GMTCASE_FONT_ANNOT_SECONDARY] = true;
GMT_keyword_updated[GMTCASE_FONT_LABEL] = true;
GMT_keyword_updated[GMTCASE_FONT_HEADING] = true;
GMT_keyword_updated[GMTCASE_FONT_TAG] = true;
GMT_keyword_updated[GMTCASE_FONT_TITLE] = true;
GMT_keyword_updated[GMTCASE_FONT_SUBTITLE] = true;
GMT_keyword_updated[GMTCASE_FONT_LOGO] = true;
GMT_keyword_updated[GMTCASE_FORMAT_GEO_MAP] = true;
GMT_keyword_updated[GMTCASE_MAP_ANNOT_OFFSET_PRIMARY] = true;
GMT_keyword_updated[GMTCASE_MAP_ANNOT_OFFSET_SECONDARY] = true;
GMT_keyword_updated[GMTCASE_MAP_FRAME_AXES] = true;
GMT_keyword_updated[GMTCASE_MAP_LABEL_OFFSET] = true;
GMT_keyword_updated[GMTCASE_MAP_TITLE_OFFSET] = true;
GMT_keyword_updated[GMTCASE_MAP_HEADING_OFFSET] = true;
GMT_keyword_updated[GMTCASE_MAP_TICK_LENGTH_PRIMARY] = true;
GMT_keyword_updated[GMTCASE_MAP_TICK_LENGTH_SECONDARY] = true;
GMT_keyword_updated[GMTCASE_MAP_FRAME_WIDTH] = true;
GMT_keyword_updated[GMTCASE_MAP_FRAME_PEN] = true;
GMT_keyword_updated[GMTCASE_MAP_TICK_PEN_PRIMARY] = true;
GMT_keyword_updated[GMTCASE_MAP_TICK_PEN_SECONDARY] = true;
GMT_keyword_updated[GMTCASE_MAP_GRID_PEN_PRIMARY] = true;
GMT_keyword_updated[GMTCASE_MAP_GRID_PEN_SECONDARY] = true;
GMT_keyword_updated[GMTCASE_MAP_VECTOR_SHAPE] = true;
}
}

/*! . */
Expand Down