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

Jump to bottom

Revert "Adjust scalebar logic to combine any specified parameters with defaults" #689

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Revert "Adjust scalebar logic to combine any specified parameters with defaults" #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions py4DSTEM/visualize/show.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def show(
and

>>> show(dp, calibration=calibration, scalebar={'length':0.5,'width':2,
'position':'ul','label':True})
'position':'ul','label':True'})

will display a more customized scalebar.

Expand Down Expand Up @@ -316,7 +316,7 @@ def show(
if returnfig==False (default), the figure is plotted and nothing is returned.
if returnfig==True, return the figure and the axis.
"""
if scalebar is True or scalebar is None:
if scalebar is True:
scalebar = {}

# Alias dep
Expand Down Expand Up @@ -428,31 +428,25 @@ def show(
er = ".calibration attribute must be a Calibration instance"
assert isinstance(cal, Calibration), er
if isinstance(ar, DiffractionSlice):
defaultscalebar = {
scalebar = {
"Nx": ar.data.shape[0],
"Ny": ar.data.shape[1],
"pixelsize": cal.get_Q_pixel_size(),
"pixelunits": cal.get_Q_pixel_units(),
"space": "Q",
"position": "br",
}
for key, value in defaultscalebar.items():
if key not in scalebar.keys():
scalebar[key] = value
pixelsize = cal.get_Q_pixel_size()
pixelunits = cal.get_Q_pixel_units()
elif isinstance(ar, RealSlice):
defaultscalebar = {
scalebar = {
"Nx": ar.data.shape[0],
"Ny": ar.data.shape[1],
"pixelsize": cal.get_R_pixel_size(),
"pixelunits": cal.get_R_pixel_units(),
"space": "Q",
"position": "br",
}
for key, value in defaultscalebar.items():
if key not in scalebar.keys():
scalebar[key] = value
pixelsize = cal.get_R_pixel_size()
pixelunits = cal.get_R_pixel_units()
# get the data
Expand Down