Skip to content

Place movie indicator f without any shifts #3685

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

Merged
merged 3 commits into from
Jul 19, 2020
Merged

Place movie indicator f without any shifts #3685

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e53d5c
THe movie indicator f uses Call_Module but must pass -X0 -Y0
PaulWessel Jul 19, 2020
dac0bb4
Merge branch 'master' into no-shift-indicators
PaulWessel Jul 19, 2020
603b4e5
Update gmt_plot.c
PaulWessel Jul 19, 2020
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
8 changes: 4 additions & 4 deletions src/gmt_plot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* GMT_plot.c contains code related to plotting maps. These functions requires
* we pass both the GMT and PSL control strucure pointers.
* we pass both the GMT and PSL control structure pointers.
*
* Author: Paul Wessel
* Date: 1-JAN-2010
Expand Down Expand Up @@ -7499,7 +7499,7 @@ GMT_LOCAL void gmtplot_prog_indicator_E (struct GMT_CTRL *GMT, double x, double
GMT_LOCAL void gmtplot_prog_indicator_F (struct GMT_CTRL *GMT, double x, double y, double t, double w, int justify, char *P1, char *F1, char *label, char kind, double width, double fsize, struct GMT_FONT *F) {
/* Place time axis indicator via call to basemap plus adding triangle here */
int symbol = PSL_INVTRIANGLE; /* Time marker when labels are below the line */
char cmd[GMT_LEN128] = {""}, region[GMT_LEN64] = {""}, unit[4] = {""}, axis = 0;
char cmd[GMT_LEN256] = {""}, region[GMT_LEN64] = {""}, unit[4] = {""}, axis = 0;
bool was = GMT->current.map.frame.init;
double fx, fy, dy, dy2, xt, s = 1.0, angle = 0.0, h;
struct GMT_PEN pen;
Expand Down Expand Up @@ -7539,9 +7539,9 @@ GMT_LOCAL void gmtplot_prog_indicator_F (struct GMT_CTRL *GMT, double x, double
if (fsize == 0.0)
F->size = 3.0 * dy * PSL_POINTS_PER_INCH; /* Set a scaled font size */
if (kind == 'F') /* Want annotations so add -Baf and set annotation font */
sprintf (cmd, "%s -JX%gi/0.0001i -Baf%s -B%c --MAP_FRAME_PEN=%s --FONT_ANNOT_PRIMARY=+%s", region, width, unit, axis, P1, gmt_putfont (GMT, F));
sprintf (cmd, "%s -JX%gi/0.0001i -Baf%s -B%c -X0 -Y0 --MAP_FRAME_PEN=%s --FONT_ANNOT_PRIMARY=+%s --GMT_HISTORY=false", region, width, unit, axis, P1, gmt_putfont (GMT, F));
else /* Only axis with ticks so only -Bf is used */
sprintf (cmd, "%s -JX%gi/0.0001i -Bf%s -B%c --MAP_FRAME_PEN=%s", region, width, unit, axis, P1);
sprintf (cmd, "%s -JX%gi/0.0001i -Bf%s -B%c -X0 -Y0 --MAP_FRAME_PEN=%s --GMT_HISTORY=false", region, width, unit, axis, P1);
GMT->current.map.frame.init = false; /* To enable more -B parsing */
GMT_Report (GMT->parent, GMT_MSG_DEBUG, "Call basemap from gmtplot_prog_indicator_F with args %s\n", cmd);
if (GMT_Call_Module (GMT->parent, "basemap", GMT_MODULE_CMD, cmd) != GMT_NOERROR) {
Expand Down