From 331eee13af7d676cdb485db81d2c603dc53e701a Mon Sep 17 00:00:00 2001 From: Federico Esteban Date: Thu, 2 Jan 2025 14:34:59 -0300 Subject: [PATCH 1/3] Update contributing.rst Fix typo --- doc/rst/source/devdocs/contributing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rst/source/devdocs/contributing.rst b/doc/rst/source/devdocs/contributing.rst index 2cedd3708ec..07150241c9b 100644 --- a/doc/rst/source/devdocs/contributing.rst +++ b/doc/rst/source/devdocs/contributing.rst @@ -440,7 +440,7 @@ using the following steps: - Run ``dvc diff`` to check that modified files are in the correct directory. - Add the modified images to dvc using ``dvc add test/baseline//``, ``dvc add doc/scripts/images/``, or ``dvc add doc/examples/images/`` - depending on the type of test modified. RUn one dvc add command per updated PostScript plot. + depending on the type of test modified. Run one dvc add command per updated PostScript plot. - Check that the .dvc file was updated by running ``git status``. - Stage the modified .dvc files in git using ``git add test/baseline//.dvc``, ``git add doc/scripts/images/.dvc``, or ``git add doc/examples/images/.dvc``, again per updated file. From 325e3ccda59eba071d61c9677c6d78266feb3dee Mon Sep 17 00:00:00 2001 From: Joaquim Date: Fri, 3 Jan 2025 01:57:43 +0000 Subject: [PATCH 2/3] Do not warn that longoptions where reformatted. See #8657 (#8658) But keep in mind that there are warnings in the code above this. --- src/gmt_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gmt_init.c b/src/gmt_init.c index 2e6b99530e6..61d765258c6 100644 --- a/src/gmt_init.c +++ b/src/gmt_init.c @@ -1168,9 +1168,9 @@ GMT_LOCAL void gmtinit_translate_to_short_options(struct GMTAPI_CTRL *API, struc and also note that at this point we will always be at GMT_MSG_WARNING or whatever default verbosity level the program is initialized with -- fix this later (or not)! */ #endif /* 0 */ - if (modified) { + if (modified && gmt_M_is_verbose (API->GMT, GMT_MSG_INFORMATION)) { /* Echo the converted options */ char *cmd = GMT_Create_Cmd (API, *options); - GMT_Report (API, GMT_MSG_WARNING, "Reformatted options: %s\n", cmd); + GMT_Report (API, GMT_MSG_INFORMATION, "Reformatted options: %s\n", cmd); GMT_Destroy_Cmd (API, &cmd); /* Free string */ } } From 79800bdf95bf29945c713144f4df4fe5b4833ecb Mon Sep 17 00:00:00 2001 From: Joaquim Date: Fri, 3 Jan 2025 02:01:35 +0000 Subject: [PATCH 3/3] Increase number of decimals when reporting increments in grdedit -A --- src/grdedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grdedit.c b/src/grdedit.c index 052ec946535..1e2ae3624b8 100644 --- a/src/grdedit.c +++ b/src/grdedit.c @@ -595,7 +595,7 @@ EXTERN_MSC int GMT_grdedit (void *V_API, int mode, void *args) { if (Ctrl->A.active) { G->header->inc[GMT_X] = gmt_M_get_inc (GMT, G->header->wesn[XLO], G->header->wesn[XHI], G->header->n_columns, G->header->registration); G->header->inc[GMT_Y] = gmt_M_get_inc (GMT, G->header->wesn[YLO], G->header->wesn[YHI], G->header->n_rows, G->header->registration); - GMT_Report (API, GMT_MSG_INFORMATION, "Reset grid-spacing in file %s to %g/%g\n", + GMT_Report (API, GMT_MSG_INFORMATION, "Reset grid-spacing in file %s to %.14g/%.14g\n", out_file, G->header->inc[GMT_X], G->header->inc[GMT_Y]); } if (gmt_M_is_geographic (GMT, GMT_IN) && gmt_M_is_cartesian (GMT, GMT_OUT)) { /* Force a switch from geographic to Cartesian */