From e02d99225e7bde74bf9672b518508fc3fe663c33 Mon Sep 17 00:00:00 2001 From: Paul Wessel Date: Thu, 27 Aug 2020 17:00:07 -1000 Subject: [PATCH] ALso fix plot3d for variable pen and color via header and CPT Similar to #4084 but for plot3d. --- src/psxy.c | 2 +- src/psxyz.c | 25 +++++++++++++++++++------ test/psxy/varpen.ps | Bin 0 -> 22323 bytes test/psxy/varpen.sh | 15 +++++++++++++++ test/psxyz/varpen.ps | Bin 0 -> 22477 bytes test/psxyz/varpen.sh | 15 +++++++++++++++ 6 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 test/psxy/varpen.ps create mode 100755 test/psxy/varpen.sh create mode 100644 test/psxyz/varpen.ps create mode 100755 test/psxyz/varpen.sh diff --git a/src/psxy.c b/src/psxy.c index 79936ac6716..5b89a1ca1e4 100644 --- a/src/psxy.c +++ b/src/psxy.c @@ -2091,7 +2091,7 @@ EXTERN_MSC int GMT_psxy (void *V_API, int mode, void *args) { polygon = false; PSL_setcolor (PSL, current_fill.rgb, PSL_IS_STROKE); } - if (change & 4) gmt_setpen (GMT, ¤t_pen); + if (change & 4 && penset_OK) gmt_setpen (GMT, ¤t_pen); } if (S.G.label_type == GMT_LABEL_IS_HEADER) { /* Get potential label from segment header */ SH = gmt_get_DS_hidden (L); diff --git a/src/psxyz.c b/src/psxyz.c index 28767b8d980..2642e9c1d47 100644 --- a/src/psxyz.c +++ b/src/psxyz.c @@ -1752,13 +1752,26 @@ EXTERN_MSC int GMT_psxyz (void *V_API, int mode, void *args) { gmt_illuminate (GMT, Ctrl->I.value, current_fill.rgb); gmt_illuminate (GMT, Ctrl->I.value, default_fill.rgb); } - if (change & 4 && penset_OK) gmt_setpen (GMT, ¤t_pen); - if (change & 1) polygon = true; - if (change & 2 && !Ctrl->L.polygon) { - polygon = false; - PSL_setcolor (PSL, current_fill.rgb, PSL_IS_STROKE); + + if (Ctrl->W.cpt_effect) { + if (Ctrl->W.pen.cptmode & 1) { /* Change current pen color via CPT */ + gmt_M_rgb_copy (current_pen.rgb, current_fill.rgb); + gmt_setpen (GMT, ¤t_pen); + } + if ((Ctrl->W.pen.cptmode & 2) == 0 && !Ctrl->G.active) /* Turn off CPT fill */ + gmt_M_rgb_copy (current_fill.rgb, GMT->session.no_rgb); + else if (Ctrl->G.active) + current_fill = Ctrl->G.fill; } - if (change & 4) gmt_setpen (GMT, ¤t_pen); + else if (Zin == NULL) { + if (change & 1) polygon = true; + if (change & 2 && !Ctrl->L.polygon) { + polygon = false; + PSL_setcolor (PSL, current_fill.rgb, PSL_IS_STROKE); + } + if (change & 4 && penset_OK) gmt_setpen (GMT, ¤t_pen); + } + if (S.G.label_type == GMT_LABEL_IS_HEADER) /* Get potential label from segment header */ gmt_extract_label (GMT, L->header, S.G.label, SH->ogr); diff --git a/test/psxy/varpen.ps b/test/psxy/varpen.ps new file mode 100644 index 0000000000000000000000000000000000000000..14b3f59fc5abe8124bd8273c45761edd2b6c6579 GIT binary patch literal 22323 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 t.txt +> -W0.5p -Z1 +6.5 1.5 +6.5 0.5 +> -W6p -Z2 +7.5 1.5 +7.5 0.5 +EOF +gmt begin varpen ps + gmt makecpt -Cjet -T0/3 + gmt plot t.txt -R6/8/0/2 -JX15c -W+cl -B -BWSrt -C +gmt end show diff --git a/test/psxyz/varpen.ps b/test/psxyz/varpen.ps new file mode 100644 index 0000000000000000000000000000000000000000..6a88d9e045e281281cffb79594d90425f992c8c7 GIT binary patch literal 22477 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 VXmO#!)EEF)$ya`mm7l+E{SPiJ%V7Wj literal 0 HcmV?d00001 diff --git a/test/psxyz/varpen.sh b/test/psxyz/varpen.sh new file mode 100755 index 00000000000..ac43159dea4 --- /dev/null +++ b/test/psxyz/varpen.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# Test setting of pen width and color via cpt and headers + +cat << EOF > t.txt +> -W0.25p -Z1 +6.5 1.5 0 +6.5 0.5 0 +> -W6p -Z2 +7.5 1.5 0 +7.5 0.5 0 +EOF +gmt begin varpen ps + gmt makecpt -Cjet -T0/3 + gmt plot3d t.txt -R6/8/0/2 -JX12c -W+cl -B -BWSrt -C -p135/35 +gmt end show