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

Updating returning parameters because of cpos #923

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Updating returning parameters because of cpos #923

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
35 changes: 20 additions & 15 deletions ansys/mapdl/core/plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,35 +272,40 @@ def general_plotter(
if title:
pl.add_title(title)

returns_parameter = []
if return_plotter:
returns_parameter.append(pl)
if return_cpos:
returns_parameter.append(pl.camera_position)

if not returns_parameter:
returns_parameter = None
else:
if len(returns_parameter) == 1:
returns_parameter = returns_parameter[0]
def return_from_plotter():
returns_parameter = []
if return_plotter:
returns_parameter.append(pl)
if return_cpos:
returns_parameter.append(pl.camera_position)

if not returns_parameter:
returns_parameter = None
else:
returns_parameter = tuple(returns_parameter)
if len(returns_parameter) == 1:
returns_parameter = returns_parameter[0]
else:
returns_parameter = tuple(returns_parameter)
return returns_parameter

returns_parameter = return_from_plotter()

# permit user to save the figure as a screenshot
if savefig:
pl.show(title=title, auto_close=False, window_size=window_size, screenshot=True)
pl.screenshot(savefig)

# return unclosed plotter
if return_plotter:
if returns_parameter:
return returns_parameter

# if not returning plotter, close right away
pl.close()

elif return_plotter:
return returns_parameter
else:
pl.show()

# Recreating "returns" to update cpos
returns_parameter = return_from_plotter()

return returns_parameter