Skip to content

More grdview fixes #3681

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 2 commits into from
Jul 18, 2020
Merged

More grdview fixes #3681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9e3e78
Use corect -T syntax in scripts and check if argument
PaulWessel Jul 18, 2020
c446995
Update grdview.ps
PaulWessel Jul 18, 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
6 changes: 3 additions & 3 deletions src/grdview.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,8 +681,8 @@ static int parse (struct GMT_CTRL *GMT, struct GRDVIEW_CTRL *Ctrl, struct GMT_OP
Ctrl->S.value = sval;
break;
case 'T': /* Tile plot -T[+s][+o<pen>] */
Ctrl->T.active = true;
if (strchr (opt->arg, '+') || gmt_M_compat_check (GMT, 6)) { /* New syntax */
Ctrl->T.active = true; /* Plot as tiles */
if (opt->arg[0] && (strchr (opt->arg, '+') || gmt_M_compat_check (GMT, 6))) { /* New syntax */
if (strstr (opt->arg, "+s")) Ctrl->T.skip = true;
if ((c = strstr (opt->arg, "+o")) && gmt_getpen (GMT, &c[2], &Ctrl->T.pen)) {
gmt_pen_syntax (GMT, 'T', NULL, " ", 0);
Expand All @@ -691,7 +691,7 @@ static int parse (struct GMT_CTRL *GMT, struct GRDVIEW_CTRL *Ctrl, struct GMT_OP
else
Ctrl->T.outline = true;
}
else { /* Old-style syntax -T[s][o<pen>] */
else if (opt->arg[0]) { /* Old-style syntax -T[s][o<pen>] */
k = 0;
if (opt->arg[0] == 's') Ctrl->T.skip = true, k = 1;
if (opt->arg[k] == 'o') { /* Want tile outline also */
Expand Down
Binary file modified test/grdview/grdview.ps
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions test/grdview/grdview.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ $view -O -K -R-0.5/1.5/0/2 -X4c -Qs
$contour -K
$view -O -K -R-1/3/-1/3 -X4c -Qs
$contour -K
$view -O -K -Towhite -R-0.5/2.5/-0.5/2.5 -X-12c -Y-4c
$view -O -K -T+owhite -R-0.5/2.5/-0.5/2.5 -X-12c -Y-4c
label -T $3
$view -O -K -Towhite -R0/2/0/2 -X4c
$view -O -K -Towhite -R-0.5/1.5/0/2 -X4c
$view -O -K -Towhite -R-1/3/-1/3 -X4c
$view -O -K -T+owhite -R0/2/0/2 -X4c
$view -O -K -T+owhite -R-0.5/1.5/0/2 -X4c
$view -O -K -T+owhite -R-1/3/-1/3 -X4c
$view -Qi100 -O -K -R-0.5/2.5/-0.5/2.5 -X-12c -Y-4c
$contour -K
label -Qi100 $3
Expand Down