-
Notifications
You must be signed in to change notification settings - Fork 220
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
Wrap velo #525
Merged
Merged
Wrap velo #525
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
e3c296f
add new velo function
lhoupert c6e3476
create new velo function
lhoupert c2b951c
format alias
lhoupert 1cf7967
clarify the type of data input
lhoupert fc7bec8
remove reference to vector x, y (not of use anymore)
lhoupert 7b905d7
clear code from reference to variable sizes and direction
lhoupert 1fcf089
start with test
lhoupert ac05994
fix raw string
lhoupert 38514ef
update add-velo with upstream master branch and fix issues
lhoupert fd6e421
clarify aliases and edit test
lhoupert 4858aff
Apply suggestions from code review
lhoupert 099a3d6
update docstring
lhoupert 8c6c0e1
fix errors from make lint
lhoupert 480abd0
remove baseline img
lhoupert 98d5ded
create example and edit test so it fit the example
lhoupert dea4b1c
Apply suggestions from code review
lhoupert 132995a
Merge branch 'master' of https://github.com/GenericMappingTools/pygmt…
lhoupert c908e78
Apply suggestions from code review
lhoupert 6e3076a
temporarily disable pylint check as base_plotting.py exceed 2000 lines
lhoupert 6dff809
Merge branch 'add-velo' of https://github.com/lhoupert/pygmt into add…
lhoupert e5de366
edit gallery example to add text
lhoupert 76c9b28
Apply suggestions from code review
lhoupert 7dccfa9
update baseline test image
lhoupert 1fe7005
Update examples/gallery/plot/velo_arrow_ellipse.py
lhoupert e2e956c
Apply suggestions from code review
lhoupert 8364134
detect data type
lhoupert 7a9de97
remove scaling as alias
lhoupert 909827a
Revert "remove scaling as alias"
lhoupert 1e5fe88
raise error if alias S is not defined
lhoupert cfcae90
edit function arguments
lhoupert 92f94f1
edit dataframe check
lhoupert 0e66deb
Merge branch 'master' into add-velo
weiji14 437e415
Fix velo import errors and do some light code linting
weiji14 dd24153
Refactor velo to use virtualfile_from_data and add three more unit tests
weiji14 cc0ef72
Alias panel (c) for velo, and lightly edit some docstrings
weiji14 34ad182
Merge branch 'master' into add-velo
weiji14 90e9e0d
Alias scale (H), intensity (I) and zvalue (Z) from GMT 6.2.0
weiji14 d3850b7
Merge branch 'master' into add-velo
weiji14 d67bfcd
Fix typos and add intersphinx mappings
weiji14 c90ec47
Remove dash-colon option to interchange column order
weiji14 80743aa
[skip ci] Fix a few more typos and indentation issues
weiji14 2661e2c
Update the frame, region, projection and color of velo example
weiji14 ef3465e
Merge branch 'master' into add-velo
weiji14 86cf8a0
Update dvc hash for test_velo_pandas_dataframe
weiji14 be959fc
Use serial/Oxford comma in velo summary description
weiji14 0653349
Merge branch 'master' into add-velo
weiji14 c9f859d
Merge branch 'master' into add-velo
weiji14 92feb97
Apply suggestions from code review
weiji14 71d3797
Apply suggestions from code review
weiji14 9ef3983
Rename alias intensity for -I to shading
weiji14 88d1c8f
Rename alias facecolor for -G to color
weiji14 984b4cb
Merge branch 'master' into add-velo
weiji14 b8a2410
Move docstring for projection (J) and region (R) up a bit
weiji14 c9c7b66
Merge branch 'master' into add-velo
weiji14 23e908c
Rename alias to spec (S) and update baseline images for GMT 6.2.0rc1
weiji14 d33f7a5
Merge branch 'master' into add-velo
weiji14 6b99454
Fix typo on examples/gallery/symbols/velo_arrow_ellipse.py
weiji14 f949f16
Mark fig.velo tests with xfail
weiji14 1064c82
Rename alias uncertainty_color to uncertaintycolor for parameter E
weiji14 8a7cb44
Merge branch 'master' into add-velo
weiji14 da9ee3b
Move velo_arrow_ellipse.py under "Seismology and Geodesy" category
weiji14 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
edit function arguments
- Loading branch information
commit cfcae90a0ae8591b667a6d5f46e62b1b69b1d704
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By adding the condition
I was hoping triggering an error if
scaling
was not defined as an argument, for example by calling velo like that:figtest.velo(data=dataf)
However, it didn't raise any error. It seems that it doesn't run through this part of the code. Any idea why?
Any suggestion on how to write a condition where I want
data
,scaling
,projection
andregion
defined as an argument?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If no
data
is given, this will error out at thekind = data_kind(data)
code line (as it requiresdata
to be notNone
. Also, we don't need to check forprojection
orregion
(see #525 (comment)).Not sure, the logic seems ok. Did you try just with
if "S" not in kwargs
(discarding the 'or' bit)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @weiji14 , it didnt do anything. It seems that if no additional argument is defined (
figtest.velo(data=dataf)
), this part of the script is not executed . I tried withif 1==1
and nothing appears...