Skip to content
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

Refit of already-longoptified modules to incorporate multi-directives #8046

Merged
merged 8 commits into from
Nov 30, 2023
Merged

Refit of already-longoptified modules to incorporate multi-directives #8046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f89b52
Refit of already-longoptified modules to incorporate multi-directive …
rbdavis Nov 18, 2023
8b5e218
Fix code indents.
rbdavis Nov 18, 2023
ed8a877
Merge branch 'master' into longopts-mdrefit
rbdavis Nov 18, 2023
71ebd7c
Update gmtconvert_inc.h
rbdavis Nov 18, 2023
e5bf2ca
Update gmtconvert_inc.h
rbdavis Nov 18, 2023
1c96ecf
Merge branch 'master' into longopts-mdrefit
PaulWessel Nov 23, 2023
bfaaefb
Merge branch 'master' into longopts-mdrefit
PaulWessel Nov 23, 2023
1776c4b
Update gmtregress_inc.h
PaulWessel Nov 23, 2023
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 src/longopt/blockmean_inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { /* Local options for this m
short_modifiers, long_modifiers,
transproc_mask */
{ 0, 'A', "fields",
"z,s,l,h,w", "mean,aliastest|stddev,low,high,weight",
"z,s,l,h,w", "mean,stddev,low,high,weight",
"", "",
GMT_TP_MULTIDIR },
{ 0, 'C', "center", "", "", "", "", GMT_TP_STANDARD },
Expand Down
5 changes: 4 additions & 1 deletion src/longopt/blockmode_inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { /* Local options for all th
short_directives, long_directives,
short_modifiers, long_modifiers,
transproc_mask */
{ 0, 'A', "fields", "", "", "", "", GMT_TP_STANDARD },
{ 0, 'A', "fields",
"z,s,l,h,w", "mode,L1_scale|l1_scale,low,high,weight",
"", "",
GMT_TP_MULTIDIR },
{ 0, 'C', "center", "", "", "", "", GMT_TP_STANDARD },
{ 0, 'D', "histogram",
"", "",
Expand Down
4 changes: 3 additions & 1 deletion src/longopt/fitcircle_inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
short_modifiers, long_modifiers,
transproc_mask */
{ 0, 'F', "coordinates|coords",
"", "", "", "", GMT_TP_STANDARD },
"f,m,n,s,c", "flat_mean,mean,north,south,small",
"", "",
GMT_TP_MULTIDIR },
{ 0, 'L', "solution|norm",
"1,2,3", "absolutes,squares,both",
"", "",
Expand Down
10 changes: 8 additions & 2 deletions src/longopt/gmtregress_inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
"x,y,o,r", "x_on_y,y_on_x,ortho|orthogonal,reduced"
"", "",
GMT_TP_STANDARD },
{ 0, 'F', "columns|column_combination", "", "", "", "", GMT_TP_STANDARD },
{ 0, 'F', "columns|column_combination",
"x,y,m,r,c,z,w", "x,y,model,residual,symmetrical,standardized,weight",
"", "",
GMT_TP_MULTIDIR },
{ 0, 'N', "norm",
"1,2,r,w", "mean_absolute,mean_squared,lms|LMS,rms|RMS",
"", "",
Expand All @@ -47,7 +50,10 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
"", "",
"i,n", "inverse,number",
GMT_TP_STANDARD },
{ 0, 'W', "weighted", "", "", "", "", GMT_TP_STANDARD },
{ 0, 'W', "weighted",
"w,x,y,r", "weights,sigmax,sigmay,correlations",
"", "",
GMT_TP_MULTIDIR },
{ 0, 'Z', "limit", "", "", "", "", GMT_TP_STANDARD },
{ 0, '\0', "", "", "", "", "", 0 } /* End of list marked with empty option and strings */
};
Expand Down