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.

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

Final version of updates for 6.5: grdimage, colorbar, grdmix #8251

Merged
merged 34 commits into from
Jan 1, 2024

Conversation

PaulWessel
Copy link
Member

This PR takes over the function of the previous PR (#8241) which now has been absorbed and modified into this cleaner PR. It also makes further adjustments to the placement and pale dimensions related to the enhanced -Li|I[gap] option in colorbar. I also have added a test for this whose plot looks like this:

interval-panel

You can see the older PR for various new test plots that documents the working of grdmix and grdimage. I get zero failures with this branch, running with or without OpenMP, Plesae make sure you change to theimg-layout branch, select static as active server (export GMT_DATA_SERVER=static) and run all tests. If you find any issues under Windows or Linux please let me know.

The colorbar docs now states this:

L

I believe this is the last item to be merged into master before we release 6.5.

Finalize the -Li|I positioning and frame dimensions and not break previous tests.
@PaulWessel PaulWessel added the enhancement Improving an existing feature label Jan 1, 2024
@PaulWessel PaulWessel added this to the 6.5.0 milestone Jan 1, 2024
@PaulWessel PaulWessel requested a review from a team January 1, 2024 11:53
@PaulWessel PaulWessel self-assigned this Jan 1, 2024
Copy link
Contributor

github-actions bot commented Jan 1, 2024

Summary of changed images

This is an auto-generated report of images that have changed on the DVC remote

Status Path
added test/baseline/grdimage/grdimage_Q_effects.ps
added test/baseline/grdimage/grid_transp.ps
added test/baseline/grdimage/image_vartrans.ps
added test/baseline/grdimage/transp_mix.ps
added test/baseline/psscale/interval-panel.ps
modified test/baseline/grdimage/
modified test/baseline/grdmix/
modified test/baseline/grdmix/grdmix.ps
modified test/baseline/psscale/
modified test/baseline/psscale/autoscale.ps
modified test/baseline/psscale/categoricalcpt.ps
modified test/baseline/psscale/catlabels.ps
modified test/baseline/psscale/cbarfontsize.ps
modified test/baseline/psscale/cbars.ps
modified test/baseline/psscale/cpthinges.ps
modified test/baseline/psscale/cptmix.ps
modified test/baseline/psscale/cpttime.ps
modified test/baseline/psscale/customwidths.ps
modified test/baseline/psscale/cyclecpt.ps
modified test/baseline/psscale/hardsoft.ps
modified test/baseline/psscale/horizontal.ps
modified test/baseline/psscale/horsclpanel.ps
modified test/baseline/psscale/pattern.ps
modified test/baseline/psscale/placebars.ps
modified test/baseline/psscale/psscale.ps
modified test/baseline/psscale/scale_percent.ps
modified test/baseline/psscale/scales.ps
modified test/baseline/psscale/scalings.ps
modified test/baseline/psscale/seis.ps
modified test/baseline/psscale/slant_annot.ps
modified test/baseline/psscale/transp_scale.ps
modified test/baseline/psscale/versclpanel.ps
modified test/baseline/psscale/vertcustannot.ps
modified test/baseline/psscale/vertical.ps

Image diff(s)

Added images

  • test/baseline/grdimage/grdimage_Q_effects.png

  • test/baseline/grdimage/grid_transp.png

  • test/baseline/grdimage/image_vartrans.png

  • test/baseline/grdimage/transp_mix.png

  • test/baseline/psscale/interval-panel.png

Modified images

Path Old New
test/baseline/grdmix/grdmix.ps
test/baseline/psscale/autoscale.ps
test/baseline/psscale/categoricalcpt.ps
test/baseline/psscale/catlabels.ps
test/baseline/psscale/cbarfontsize.ps
test/baseline/psscale/cbars.ps
test/baseline/psscale/cpthinges.ps
test/baseline/psscale/cptmix.ps
test/baseline/psscale/cpttime.ps
test/baseline/psscale/customwidths.ps
test/baseline/psscale/cyclecpt.ps
test/baseline/psscale/hardsoft.ps
test/baseline/psscale/horizontal.ps
test/baseline/psscale/horsclpanel.ps
test/baseline/psscale/pattern.ps
test/baseline/psscale/placebars.ps
test/baseline/psscale/psscale.ps
test/baseline/psscale/scale_percent.ps
test/baseline/psscale/scales.ps
test/baseline/psscale/scalings.ps
test/baseline/psscale/seis.ps
test/baseline/psscale/slant_annot.ps
test/baseline/psscale/transp_scale.ps
test/baseline/psscale/versclpanel.ps
test/baseline/psscale/vertcustannot.ps
test/baseline/psscale/vertical.ps

Report last updated at commit 03498f3

Copy link
Member

@seisman seisman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but need to update the copyright year to 2024 to make the "Code Validator" workflow pass.

@joa-quim
Copy link
Member

joa-quim commented Jan 1, 2024

Can we merge this? I need to trig a GMT build in the Julia system.

@PaulWessel
Copy link
Member Author

Yep, doing it now.

@PaulWessel PaulWessel merged commit e8c8817 into master Jan 1, 2024
7 checks passed
@PaulWessel PaulWessel deleted the img-layout branch January 1, 2024 19:23
@PaulWessel
Copy link
Member Author

Master is now up to date with all those changes and copyright year is now 2024.
Going to bed but will work on building installers and tar balls tomorrow.

@joa-quim
Copy link
Member

joa-quim commented Jan 1, 2024

OK, I'll build the Win installer tonight.

@anbj
Copy link
Contributor

anbj commented Jan 1, 2024

OK, I'll build the Win installer tonight.

Please also remember to do a Windows portable.

@PaulWessel
Copy link
Member Author

Just fixed a few warnings and updated master. No big deal if you have started building yet.

@joa-quim
Copy link
Member

joa-quim commented Jan 1, 2024

If you want one with 1 or 2 weeks old, I have it here.

@joa-quim
Copy link
Member

joa-quim commented Jan 2, 2024

I built these 4 guys. Which one should we publish as 6.5?

01/01/2024  11:33 PM       203,678,458 gmt-6.5.0-win64_DOCS_MB.exe
01/01/2024  09:00 PM       189,460,313 gmt-6.5.0-win64_DOCS_NO_MB.exe
01/01/2024  11:04 PM       160,435,361 gmt-6.5.0-win64_NO_DOCS_MB.exe
01/01/2024  09:44 PM       146,217,412 gmt-6.5.0-win64_NO_DOCS_NO_MB.exe

@PaulWessel
Copy link
Member Author

You can choose what you think is useful for Win users and possibly Julia users.

BTW, I fixed a half-dozen or so of warnings that were annoying me. Probably no need to rebuild your installers.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Improving an existing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants