Skip to content

Let psvelo accept a missing scale argument and instead read it from data file #4909

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 5 commits into from
Mar 5, 2021
Merged

Let psvelo accept a missing scale argument and instead read it from data file #4909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7a9e6e
Let velo accept symbol scale from data record
PaulWessel Mar 5, 2021
a353a3d
Update psvelo.c
PaulWessel Mar 5, 2021
886682b
Improve docs
PaulWessel Mar 5, 2021
08cd7ca
Update docs
PaulWessel Mar 5, 2021
26dc3cd
Merge branch 'master' into velo-scaling
PaulWessel Mar 5, 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
2 changes: 1 addition & 1 deletion doc/rst/source/supplements/geodesy/psvelo.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Synopsis

**gmt psvelo** [ *table* ] |-J|\ *parameters*
|SYN_OPT-R|
|-S|\ *format*\ [*scale*][/*args*][**+f**\ *font*]
[ |-A|\ *parameters* ]
[ |SYN_OPT-B| ]
[ |-C|\ *cpt*]
Expand All @@ -23,7 +24,6 @@ Synopsis
[ |-K| ]
[ |-L|\ [*pen*\ [**+c**\ [**f**\|\ **l**]]] ]
[ |-N| ] [ |-O| ] [ |-P| ]
[ |-S|\ *<format><args>*\ [**+f**\ *font*] ]
[ |SYN_OPT-U| ]
[ |SYN_OPT-V| ]
[ |-W|\ [*pen*][**+c**\ [**f**\|\ **l**]] ]
Expand Down
2 changes: 1 addition & 1 deletion doc/rst/source/supplements/geodesy/velo.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Synopsis

**gmt velo** [ *table* ] |-J|\ *parameters*
|SYN_OPT-R|
|-S|\ *format*\ [*scale*][/*args*][**+f**\ *font*]
[ |-A|\ *parameters* ]
[ |SYN_OPT-B| ]
[ |-C|\ *cpt*]
Expand All @@ -22,7 +23,6 @@ Synopsis
[ |-I|\ [*intens*] ]
[ |-L|\ [*pen*\ [**+c**\ [**f**\|\ **l**]]] ]
[ |-N| ]
[ |-S|\ *<format><args>*\ [**+f**\ *font*] ]
[ |SYN_OPT-U| ]
[ |SYN_OPT-V| ]
[ |-W|\ [*pen*][**+c**\ [**f**\|\ **l**]] ]
Expand Down
57 changes: 30 additions & 27 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 @@ -33,16 +33,16 @@ Required Arguments
cases, the scales are in data units per length unit and sizes are in length units (default length
unit is controlled by :term:`PROJ_LENGTH_UNIT` unless **c**, **i**, or **p** is appended).

**-Se**\ *velscale/confidence*\ [**+f**\ *font*]

Velocity ellipses in (N,E) convention. *velscale* sets the scaling of 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 |-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 and arrow-head can be colored via |-G|. Parameters are expected to be
in the following columns:
**-Se**\ [*velscale*/]\ *confidence*\ [**+f**\ *font*]

Velocity ellipses in (N,E) convention. The *velscale* sets the scaling of the velocity arrows.
If *velscale* is not given the we read it from the data file as an extra column.
The *confidence* sets the 2-dimensional confidence limit for the ellipse, e.g., 0.95 for 95% confidence ellipse.
Use **+f** to set the font and size of the text [9p,Helvetica,black]; give **+f**\ 0 to deactivate labeling.
The arrow will be drawn with the pen attributes specified by the |-W| option and arrow-head can be colored via |-G|.
The ellipse will be filled with the color or shade specified by the |-E| option [default is transparent],
and its outline will be drawn if |-L| is selected using the pen selected (by |-W| if not given by |-L|).
Parameters are expected to be in the following columns:

**1**,\ **2**:
longitude, latitude of station (**-:** option interchanges order)
Expand All @@ -55,26 +55,27 @@ Required Arguments
**Trailing text**:
name of station (optional).

**-Sn**\ *barscale*
**-Sn**\ [*barscale*]

Anisotropy bars. *barscale* sets the scaling of the bars.
Anisotropy bars. The *barscale* sets the scaling of the bars.
If *barscale* is not given the we read it from the data file as an extra column.
Parameters are expected to be in the following columns:

**1**,\ **2**:
longitude, latitude of station (**-:** option interchanges order)
**3**,\ **4**:
eastward, northward components of anisotropy vector (**-:** option interchanges order)

**-Sr**\ *velscale/confidence*\ [**+f**\ *font*]
**-Sr**\ [*velscale*/]\ *confidence*\ [**+f**\ *font*]

Velocity ellipses in rotated convention. *velscale* sets the scaling of
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 |-E| option [default
transparent]. The arrow and the circumference of the ellipse will be
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:
Velocity ellipses in rotated convention. The *velscale* sets the scaling of the velocity arrows.
If *velscale* is not given the we read it from the data file as an extra column.
The *confidence* sets the 2-dimensional confidence limit for the ellipse, e.g., 0.95 for 95% confidence ellipse.
Use **+f** to set the font and size of the text [9p,Helvetica,black]; give **+f**\ 0 to deactivate labeling.
The arrow will be drawn with the pen attributes specified by the |-W| option and arrow-head can be colored via |-G|.
The ellipse will be filled with the color or shade specified by the |-E| option [default is transparent],
and its outline will be drawn if |-L| is selected using the pen selected (by |-W| if not given by |-L|).
Parameters are expected to be in the following columns:

**1**,\ **2**:
longitude, latitude, of station (**-:** option interchanges order)
Expand All @@ -87,10 +88,11 @@ Required Arguments
**Trailing text**:
name of station (optional)

**-Sw**\ *wedgescale/wedgemag*
**-Sw**\ [*wedgescale*/]\ *wedgemag*

Rotational wedges. *wedgescale* sets the size of the wedges. Rotation values are
multiplied by *wedgemag* before plotting. For example, setting
Rotational wedges. The *wedgescale* sets the size of the wedges.
If *wedgescale* is not given the we read it from the data file as an extra column.
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
Expand All @@ -103,10 +105,11 @@ Required Arguments
**4**:
rotation uncertainty in radians

**-Sx**\ *cross_scale*
**-Sx**\ [*cross_scale*]

gives Strain crosses. *cross_scale* sets the size of the cross. Parameters
are expected to be in the following columns:
gives Strain crosses. The *cross_scale* sets the size of the cross.
If *cross_scale* is not given the we read it from the data file as an extra column.
Parameters are expected to be in the following columns:

**1**,\ **2**:
longitude, latitude, of station (**-:** option interchanges order)
Expand Down
Loading