Skip to content

Let psvelo accept CPT and a richer way of coloring symbols #4901

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
PaulWessel merged 15 commits into from
Mar 4, 2021
Merged

Let psvelo accept CPT and a richer way of coloring symbols #4901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f73daa1
Allow velo to use a CPT
PaulWessel Mar 3, 2021
4ca887b
Update psvelo.c
PaulWessel Mar 4, 2021
09c4af8
Update documentation
PaulWessel Mar 4, 2021
da1ab66
Update psvelo.c
PaulWessel Mar 4, 2021
d342c55
Docs updated
PaulWessel Mar 4, 2021
122b781
Finailze behavior
PaulWessel Mar 4, 2021
d659012
Typos and comments
PaulWessel Mar 4, 2021
01b101d
Update velo_common.rst_
PaulWessel Mar 4, 2021
1c21fa1
Update psvelo.c
PaulWessel Mar 4, 2021
afa1a31
Add new test for velo
PaulWessel Mar 4, 2021
e6db20e
Update psvelo.c
PaulWessel Mar 4, 2021
466bdb7
Do need to specify filled arrow head though
PaulWessel Mar 4, 2021
b65fbd3
Update PS original
PaulWessel Mar 4, 2021
ffec96a
Update psvelo.c
PaulWessel Mar 4, 2021
dcb4038
Update psvelo.c
PaulWessel Mar 4, 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
6 changes: 4 additions & 2 deletions doc/rst/source/supplements/geodesy/psvelo.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,19 @@ Synopsis
|SYN_OPT-R|
[ |-A|\ *parameters* ]
[ |SYN_OPT-B| ]
[ |-C|\ *cpt*]
[ |-E|\ *fill* ]
[ |-G|\ *fill* ]
[ |-K| ]
[ |-L| ]
[ |-L|\ [*pen*\ [**+c**\ [**f**\|\ **l**]]] ]
[ |-N| ] [ |-O| ] [ |-P| ]
[ |-S|\ *<format><args>*\ [**+f**\ *font*] ]
[ |SYN_OPT-U| ]
[ |SYN_OPT-V| ]
[ |-W|\ *pen* ]
[ |-W|\ [*pen*][**+c**\ [**f**\|\ **l**]] ]
[ |SYN_OPT-X| ]
[ |SYN_OPT-Y| ]
[ |-Z|\ [**m**\|\ **e**\|\ **n**\|\ **u**\ ][**+e**] ]
[ |SYN_OPT-di| ]
[ |SYN_OPT-e| ]
[ |SYN_OPT-h| ]
Expand Down
8 changes: 5 additions & 3 deletions doc/rst/source/supplements/geodesy/velo.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ Synopsis
|SYN_OPT-R|
[ |-A|\ *parameters* ]
[ |SYN_OPT-B| ]
[ |-C|\ *cpt*]
[ |-E|\ *fill* ]
[ |-G|\ *fill* ]
[ |-L| ]
[ |-L|\ [*pen*\ [**+c**\ [**f**\|\ **l**]]] ]
[ |-N| ]
[ |-S|\ *<format><args>*\ [**+f**\ *font*] ]
[ |SYN_OPT-U| ]
[ |SYN_OPT-V| ]
[ |-W|\ *pen* ]
[ |SYN_OPT-X| ]
[ |-W|\ [*pen*][**+c**\ [**f**\|\ **l**]] ]
[ |-Z|\ [**m**\|\ **e**\|\ **n**\|\ **u**\ ][**+e**] ]
|SYN_OPT-X| ]
[ |SYN_OPT-Y| ]
[ |SYN_OPT-di| ]
[ |SYN_OPT-e| ]
Expand Down
69 changes: 51 additions & 18 deletions doc/rst/source/supplements/geodesy/velo_common.rst_
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ Description
-----------

Reads data values from *files* [or standard input] and
will plot velocity arrows on a map.
Most options are the same as for :doc:`plot </plot>`, except **-S**.
will plot the selected geodesy symbol on a map.
You may choose from velocity vectors and their uncertainties,
rotational wedges and their uncertainties, anisotropy bars,
or strain crosses. Symbol fills or their outlines may be colored
based on constant parameters or via color lookup tables.

Required Arguments
------------------
Expand Down Expand Up @@ -36,9 +39,9 @@ Required Arguments
velocity arrows. The *confidence* sets the 2-dimensional confidence
limit for the ellipse, e.g., 0.95 for 95% confidence ellipse. *font*
sets the font and size of the text [9p,Helvetica,black]. The ellipse will be filled with the
color or shade specified by the |-G| option [default transparent]. The
color or shade specified by the |-E| option [default is transparent]. The
arrow and the circumference of the ellipse will be drawn with the pen
attributes specified by the |-W| option. Parameters are expected to be
attributes specified by the |-W| option and arrow-head can be colored via |-G|. Parameters are expected to be
in the following columns:

**1**,\ **2**:
Expand All @@ -49,7 +52,7 @@ Required Arguments
uncertainty of eastward, northward velocities (1-sigma) (**-:** option interchanges order)
**7**:
correlation between eastward and northward components
**8**:
**Trailing text**:
name of station (optional).

**-Sn**\ *barscale*
Expand All @@ -68,9 +71,9 @@ Required Arguments
the velocity arrows. The *confidence* sets the 2-dimensional
confidence limit for the ellipse, e.g., 0.95 for 95% confidence ellipse.
*font* sets the font and size of the text [9p,Helvetica,black]. The ellipse will be
filled with the color or shade specified by the |-G| option [default
filled with the color or shade specified by the |-E| option [default
transparent]. The arrow and the circumference of the ellipse will be
drawn with the pen attributes specified by the |-W| option. Parameters
drawn with the pen attributes specified by the |-W| option and arrow-head can be colored via |-G|. Parameters
are expected to be in the following columns:

**1**,\ **2**:
Expand All @@ -81,16 +84,16 @@ Required Arguments
semi-major, semi-minor axes
**7**:
counter-clockwise angle, in degrees, from horizontal axis to major axis of ellipse.
**8**:
**Trailing text**:
name of station (optional)

**-Sw**\ *wedgescale/wedgemag*

Rotational wedges. *wedgescale* sets the size of the wedges. Values are
Rotational wedges. *wedgescale* sets the size of the wedges. Rotation values are
multiplied by *wedgemag* before plotting. For example, setting
*wedgemag* to 1.e7 works well for rotations of the order of 100
nanoradians/yr. Use **-G** to set the fill color or shade for the wedge,
and **-E** to set the color or shade for the uncertainty. Parameters are
nanoradians/yr. Use |-G| to set the fill color or shade for the wedge,
and |-E| to set the color or shade for the uncertainty. Parameters are
expected to be in the following columns:

**1**,\ **2**:
Expand Down Expand Up @@ -128,6 +131,12 @@ Optional Arguments

.. include:: ../../explain_-B.rst_

.. _-C:

**-C**\ *cpt*
Give a CPT and let symbol color normally set by |-G| be
determined from the magnitude. See **-Z** for other selections.

.. _-D:

**-D**\ *Sigma\_scale*
Expand All @@ -138,19 +147,28 @@ Optional Arguments

**-E**\ *fill* :ref:`(more ...) <-Gfill_attrib>`
Sets the color or shade used for filling uncertainty wedges
(**-Sw**) or velocity error ellipses (**-Se** or **-Sr**). [If
**-E** is not specified, the uncertainty regions will be transparent.]
(**-Sw**) or velocity error ellipses (**-Se** or **-Sr**). If
**-E** is not specified, the uncertainty regions will be transparent.
**Note**: Using **-C** and **-Z+e** will update the uncertainty fill
color based on the selected measure in **-Z** [magnitude error].

.. _-G:

**-G**\ *fill* :ref:`(more ...) <-Gfill_attrib>`
Select color or pattern for filling of symbols or polygons [Default is no fill].
Select color or pattern for filling of symbols [Default is no fill].
**Note**: Using **-C** (and optionally **-Z**) will update the symbol fill
color based on the selected measure in **-Z** [magnitude].

.. _-L:

**-L**
Draw lines. Ellipses and fault planes will have their outlines drawn
using current pen (see **-W**).
**-L**\ [*pen*\ [**+c**\ [**f**\|\ **l**]]]
Draw lines. Ellipses and rotational wedges will have their outlines drawn
using current pen (see **-W**). Alternatively, append a separate pen to
use for the error outlines.
If the modifier **+cl** is appended then the color of the pen are updated from the CPT (see
**-C**). If instead modifier **+cf** is appended then the color from the cpt
file is applied to error fill only [Default]. Use just **+c** to set both
pen and fill color.

.. _-N:

Expand All @@ -169,14 +187,29 @@ Optional Arguments

.. _-W:

**-W**
**-W**\ [*pen*][**+c**\ [**f**\|\ **l**]]
Set pen attributes for velocity arrows, ellipse circumference and
fault plane edges. [Defaults: width = default, color = black, style = solid].
If the modifier **+cl** is appended then the color of the pen are updated from the CPT (see
**-C**). If instead modifier **+cf** is appended then the color from the cpt
file is applied to symbol fill only [Default]. Use just **+c** to set both
pen and fill color.

.. _-X:

.. include:: ../../explain_-XY.rst_

.. _-Z:

**Z**\ [**m**\|\ **e**\|\ **n**\|\ **u**\ ][**+e**]
Select the quantity that will be used with the CPT given via **-C** to
set the fill color. Choose from **m**\ agnitude (vector magnitude or
rotation magnitude), **e**\ ast-west velocity, **n**\ orth-south velocity,
or **u**\ ser-supplied data column (supplied after the required columns).
To instead use the corresponding error estimates (i.e., vector or rotation
uncertainty) to lookup the color and paint the error ellipse or wedge
instead, append **+e**.

.. |Add_-di| unicode:: 0x20 .. just an invisible code
.. include:: ../../explain_-di.rst_

Expand Down
Loading