Skip to content

Let -d set starting column via modifier#5966

Merged
PaulWessel merged 2 commits intomasterfrom
add-d-modifier
Nov 9, 2021
Merged

Let -d set starting column via modifier#5966
PaulWessel merged 2 commits intomasterfrom
add-d-modifier

Conversation

@PaulWessel
Copy link
Member

See #5630 for background discussion. The best solution is to add an optional modifier +ccol to override the default settings for the starting column, which for backwards compatible reasons shall remain 2 for input and 0 for output.

All tests pass for me since the default remains the same.

Note: I don't understand how to get the modifier to show up in the options.rst file - it works in the explain*.rst_ files.

See #5630 for background discussion.  The best solution is to add an optional modifier to override the default settings for the starting column, which for backwards compatible reasons shall remain 2 for input and 0 for output.
@PaulWessel PaulWessel added the enhancement Improving an existing feature label Nov 9, 2021
@PaulWessel PaulWessel added this to the 6.3.0 milestone Nov 9, 2021
@PaulWessel PaulWessel requested a review from maxrjones November 9, 2021 20:34
@maxrjones
Copy link
Member

The remaining files that need to be updated are doc/rst/source/std-opts-classic.rst and doc/rst/source/std-opts.rst.

@PaulWessel
Copy link
Member Author

Seems pretty good now, no?

@PaulWessel PaulWessel merged commit 5b33672 into master Nov 9, 2021
@PaulWessel PaulWessel deleted the add-d-modifier branch November 9, 2021 21:38
@maxrjones
Copy link
Member

Ran into a problem building mbsystem due to the update to gmt_input_is_nan_proxy in this PR:

mbgrd2obj.c:360:46: error: too few arguments to function call, expected 3, have 2
                if (gmt_input_is_nan_proxy(GMT, G->data[ij])) {
                    ~~~~~~~~~~~~~~~~~~~~~~                 ^
/Users/meghanj/Sandbox/gmt-dev/include/gmt/gmt_prototypes.h:335:17: note: 'gmt_input_is_nan_proxy' declared here
EXTERN_MSC bool gmt_input_is_nan_proxy (struct GMT_CTRL *GMT, double value, unsigned int col);

@PaulWessel
Copy link
Member Author

PaulWessel commented Nov 10, 2021 via email

PaulWessel added a commit that referenced this pull request Nov 10, 2021
See #5966 for background.  Solution is to rename the function and add a backwards compatible macro in gmt_mb.h to handle this change.
PaulWessel added a commit that referenced this pull request Nov 10, 2021
* Handle deprecation of function for MB-system

See #5966 for background.  Solution is to rename the function and add a backwards compatible macro in gmt_mb.h to handle this change.

* Update gmt_mb.h
@maxrjones maxrjones added the add-changelog Add PR to the changelog label Nov 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

add-changelog Add PR to the changelog enhancement Improving an existing feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants