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

feat: Adapt PyMAPDL to common plotter #2799

Merged
merged 201 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
201 commits
Select commit Hold shift + click to select a range
d792fdb
feat: Adapt PyMAPDL to common plotter
AlejandroFernandezLuces Feb 20, 2024
048b0fe
fix: Remove manual test file
AlejandroFernandezLuces Feb 20, 2024
7685f2e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 20, 2024
c82999e
doc: Add docstrings
AlejandroFernandezLuces Feb 21, 2024
0d6ff52
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Feb 21, 2024
840e59a
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Feb 21, 2024
6f7ba58
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 21, 2024
ce42360
fix: small changes
AlejandroFernandezLuces Feb 22, 2024
e6458ca
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Feb 22, 2024
bcbc62e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 22, 2024
671df41
fix: set default bg color
AlejandroFernandezLuces Feb 22, 2024
2dd3349
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Feb 22, 2024
12cad3b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 22, 2024
fc704f2
Merge branch 'main' into feat/common-plotter
germa89 Feb 22, 2024
eadc5bb
Merge branch 'main' into feat/common-plotter
germa89 Feb 27, 2024
54c3a12
Merge branch 'main' of https://github.com/pyansys/pymapdl into feat/c…
AlejandroFernandezLuces May 30, 2024
15bc732
fix: Adapt to latest changes
AlejandroFernandezLuces May 30, 2024
3e7af1d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 30, 2024
9949845
Apply suggestions from code review
AlejandroFernandezLuces May 30, 2024
01a9d8a
feat: Use visualizer global variables
AlejandroFernandezLuces May 31, 2024
c9e04e7
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces May 31, 2024
b777f42
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces May 31, 2024
89d0a94
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 31, 2024
8054fed
fix: plotter calls
AlejandroFernandezLuces Jun 3, 2024
1051572
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 3, 2024
df54e82
fix: Plotting calls
AlejandroFernandezLuces Jun 3, 2024
48c081e
fix: Empty labels
AlejandroFernandezLuces Jun 3, 2024
c4b3e81
fix: Plotting tests
AlejandroFernandezLuces Jun 3, 2024
ce4ac24
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 3, 2024
b45a3b6
Update the image cache
pre-commit-ci[bot] Jun 3, 2024
72f4a1e
fix: pre-commit
AlejandroFernandezLuces Jun 3, 2024
f384f00
Update the image cache
AlejandroFernandezLuces Jun 3, 2024
4c96141
fix: Remove unused import
AlejandroFernandezLuces Jun 3, 2024
ed2b534
Update the image cache
AlejandroFernandezLuces Jun 3, 2024
c73a98b
fix: codacy issues
AlejandroFernandezLuces Jun 3, 2024
444cce4
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 3, 2024
8f3dcd4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 3, 2024
2d6fc22
fix: Plotting issues
AlejandroFernandezLuces Jun 3, 2024
f1a2d8c
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 3, 2024
390bee1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 3, 2024
fcaf67d
temp: pass tests
AlejandroFernandezLuces Jun 3, 2024
94392b8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 3, 2024
78ded5a
fix: Bugs in implementation
AlejandroFernandezLuces Jun 4, 2024
2bfc2ee
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 4, 2024
46b7094
Update the image cache
pre-commit-ci[bot] Jun 4, 2024
03c198b
fix: imports
AlejandroFernandezLuces Jun 4, 2024
ceef8a5
fix: remove off_screen
AlejandroFernandezLuces Jun 4, 2024
4cd06d4
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jun 5, 2024
5916838
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jun 7, 2024
6723281
fix: Doc changes
AlejandroFernandezLuces Jun 7, 2024
a87fbb9
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 7, 2024
259cc02
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 7, 2024
0e1498d
fix: Add missing comma
AlejandroFernandezLuces Jun 7, 2024
6026f47
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 7, 2024
1957a99
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 7, 2024
d20adb9
fix: Dependencies
AlejandroFernandezLuces Jun 7, 2024
4472874
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 7, 2024
b56d218
fix: Dependencies
AlejandroFernandezLuces Jun 7, 2024
d6e26bf
fix: Add missing function in plotter
AlejandroFernandezLuces Jun 7, 2024
0896b65
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jun 7, 2024
0a6d53e
fix: Wrong override
AlejandroFernandezLuces Jun 12, 2024
68f4995
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 12, 2024
c1dc399
Update the image cache
AlejandroFernandezLuces Jun 12, 2024
0789765
fix: rename built in shadowing variables
AlejandroFernandezLuces Jun 12, 2024
3b58a04
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 12, 2024
dc6bc54
fix: Built in shadowing
AlejandroFernandezLuces Jun 12, 2024
1d3337f
fix: more built in shadowing
AlejandroFernandezLuces Jun 12, 2024
f820825
fix: pre-commit
AlejandroFernandezLuces Jun 12, 2024
68f5b19
fix: Missed shadowing
AlejandroFernandezLuces Jun 12, 2024
eb02d17
fix: remove subplot in example
AlejandroFernandezLuces Jun 12, 2024
9eb770e
Apply suggestions from code review
AlejandroFernandezLuces Jun 13, 2024
ede6994
fix: remove pyvista import in example
AlejandroFernandezLuces Jun 13, 2024
cb88a24
fix: Docs
AlejandroFernandezLuces Jun 13, 2024
59e6f40
fix: Incorrect warning
AlejandroFernandezLuces Jun 13, 2024
2244b0b
fix: Remove import helper from __init__
AlejandroFernandezLuces Jun 13, 2024
78c1bf1
fix: Imports
AlejandroFernandezLuces Jun 13, 2024
6d98b2d
fix: import plotting if it has pyvista
AlejandroFernandezLuces Jun 14, 2024
cf45bd7
fix: minimal dependencies
AlejandroFernandezLuces Jun 14, 2024
5f3b2c2
fix: Add missing import
AlejandroFernandezLuces Jun 14, 2024
a8dda59
fix: Missing minimal setup
AlejandroFernandezLuces Jun 14, 2024
10130fe
fix: Tests
AlejandroFernandezLuces Jun 14, 2024
c357198
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jun 14, 2024
9d50e8b
fix: Rework plotting imports
AlejandroFernandezLuces Jun 14, 2024
2dda084
fix: remove unneeded import
AlejandroFernandezLuces Jun 14, 2024
e28febd
fix: plotting imports
AlejandroFernandezLuces Jun 14, 2024
d548e07
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 14, 2024
81ecece
fix: plotting typing
AlejandroFernandezLuces Jun 14, 2024
ef9273d
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 14, 2024
2c63038
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 14, 2024
7b2e39c
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jun 18, 2024
70a16e2
Merge branch 'main' into feat/common-plotter
germa89 Jun 18, 2024
b3241a5
Adding changelog entry: 2799.miscellaneous.md
pyansys-ci-bot Jun 18, 2024
6232cc6
Update doc/source/conf.py
AlejandroFernandezLuces Jun 20, 2024
1a63640
Update src/ansys/mapdl/core/plotting/plotting.py
AlejandroFernandezLuces Jun 20, 2024
7e43cd3
Update src/ansys/mapdl/core/plotting/plotting.py
AlejandroFernandezLuces Jun 20, 2024
f4454f5
Update src/ansys/mapdl/core/plotting/plotting.py
AlejandroFernandezLuces Jun 20, 2024
89f4db1
Update tests/conftest.py
AlejandroFernandezLuces Jun 20, 2024
fc4b922
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jun 20, 2024
0a9022f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 20, 2024
8a12a2d
Adding changelog entry: 2799.added.md
pyansys-ci-bot Jun 20, 2024
34d5fb2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 20, 2024
c6049d7
fix: Revert upper limit
AlejandroFernandezLuces Jun 20, 2024
d8d1789
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 20, 2024
3eaf472
fix: ratio, CHRGS
AlejandroFernandezLuces Jun 20, 2024
137fbf2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 20, 2024
dd7a973
fix: revert opacity
AlejandroFernandezLuces Jun 20, 2024
db5e896
fix: revert deleted comment
AlejandroFernandezLuces Jun 20, 2024
e267000
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jun 20, 2024
62d545d
fix: delete uneeded theme file
AlejandroFernandezLuces Jun 20, 2024
2c65ec0
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jun 21, 2024
717da34
fix: Remove chained calls to plotter
AlejandroFernandezLuces Jun 21, 2024
a76c253
fix: Missing plotter calls
AlejandroFernandezLuces Jul 1, 2024
4445c3f
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 1, 2024
13bca16
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 1, 2024
f05423b
fix: Remove beartype
AlejandroFernandezLuces Jul 1, 2024
29f93f6
chore: adding changelog file 2799.dependencies.md
pyansys-ci-bot Jul 1, 2024
f614ebd
fix: Add lazy imports due to minimal requirements
AlejandroFernandezLuces Jul 1, 2024
63ad5dd
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 1, 2024
758f721
fix: Parameter issues
AlejandroFernandezLuces Jul 1, 2024
7603612
fix: Add kwargs to plot
AlejandroFernandezLuces Jul 1, 2024
21699e0
fix: remove theme import from core
AlejandroFernandezLuces Jul 1, 2024
bfbfab4
fix: core init
AlejandroFernandezLuces Jul 1, 2024
e7d88cd
fix: Separate consts
AlejandroFernandezLuces Jul 1, 2024
5789619
fix: Consts
AlejandroFernandezLuces Jul 1, 2024
d662951
fix: wrong method
AlejandroFernandezLuces Jul 1, 2024
eafbca1
fix: Bug in screenshot
AlejandroFernandezLuces Jul 1, 2024
b4b60fa
fix: bug in assertion
AlejandroFernandezLuces Jul 1, 2024
6adf008
fix: multiple test fixes
AlejandroFernandezLuces Jul 1, 2024
917a637
fix: Warning no longer required
AlejandroFernandezLuces Jul 1, 2024
04abf6b
fix: plotter input test
AlejandroFernandezLuces Jul 1, 2024
91a59d5
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 2, 2024
72a3786
fix: picking tests fixes
AlejandroFernandezLuces Jul 2, 2024
af81279
TEMP: Comment test
AlejandroFernandezLuces Jul 2, 2024
7489470
fix: type checking
AlejandroFernandezLuces Jul 2, 2024
bf5a08c
Update the image cache
AlejandroFernandezLuces Jul 2, 2024
34c39ee
fix: codacy issues
AlejandroFernandezLuces Jul 2, 2024
6fd5ab6
fix: Add missing docstrings
AlejandroFernandezLuces Jul 2, 2024
bce6ed2
fix: remove duplicated import
AlejandroFernandezLuces Jul 2, 2024
3afb0ef
fix: remove {} defaults
AlejandroFernandezLuces Jul 2, 2024
d42e330
tmp: remove failing test
AlejandroFernandezLuces Jul 2, 2024
e45ec30
fix: kwargs defaults
AlejandroFernandezLuces Jul 2, 2024
ee059f0
fix: default kwargs
AlejandroFernandezLuces Jul 2, 2024
8bdbee7
fix: remove pyvista dependencies
AlejandroFernandezLuces Jul 2, 2024
96aaa8e
fix: Remove uneeded plot and plot_iter
AlejandroFernandezLuces Jul 2, 2024
a1e3d1b
fix: Improve dependency management in tests
AlejandroFernandezLuces Jul 2, 2024
569b8fa
fix: Change requires pyvista to visualization tool
AlejandroFernandezLuces Jul 2, 2024
23b2891
fix: labels font
AlejandroFernandezLuces Jul 3, 2024
fa99f25
fix: Use @require_dependency decorator
AlejandroFernandezLuces Jul 3, 2024
717a7f9
fix: revert unimplemented methods
AlejandroFernandezLuces Jul 3, 2024
f82d9aa
fix: Update cache
AlejandroFernandezLuces Jul 5, 2024
aa3e82e
fix: bug in legend check
AlejandroFernandezLuces Jul 5, 2024
7d4fcac
fix: Update cache
AlejandroFernandezLuces Jul 5, 2024
fd56b45
fix: requires import
AlejandroFernandezLuces Jul 5, 2024
ce18e94
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 8, 2024
957ccb2
Update the image cache
AlejandroFernandezLuces Jul 8, 2024
90e24d1
fix: bug in picker
AlejandroFernandezLuces Jul 8, 2024
f092f56
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 8, 2024
888f76f
doc: Change general_plotter to MapdlPlotter
AlejandroFernandezLuces Jul 8, 2024
c845e67
doc: Fix import in docs
AlejandroFernandezLuces Jul 8, 2024
fcfeca9
fix: Several small fixes
AlejandroFernandezLuces Jul 8, 2024
b02ccc4
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 9, 2024
f0317e6
fix: Docstring test
AlejandroFernandezLuces Jul 9, 2024
887b9cd
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 9, 2024
4911c23
Update the image cache
AlejandroFernandezLuces Jul 9, 2024
2205ec5
Merge branch 'main' into feat/common-plotter
germa89 Jul 9, 2024
3eee3f1
test: printing skipped tests
germa89 Jul 9, 2024
3348249
fix: pyvista requirements
germa89 Jul 9, 2024
548eb37
test: printing all output
germa89 Jul 9, 2024
d8caeee
Update the image cache
germa89 Jul 9, 2024
649d85f
Update pyproject.toml
AlejandroFernandezLuces Jul 9, 2024
95521ff
fix: revert pick test changes, revert hook deletion
AlejandroFernandezLuces Jul 9, 2024
c00f78d
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 9, 2024
ba7201e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 9, 2024
afff6bb
fix: Theme inheritance
AlejandroFernandezLuces Jul 9, 2024
74e5ad1
feat: fully support passing plotter
AlejandroFernandezLuces Jul 9, 2024
f772c4c
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 9, 2024
2cee161
fix: bad indentation
AlejandroFernandezLuces Jul 9, 2024
f84d84a
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 9, 2024
b4694dc
fix: Force arial in labels
AlejandroFernandezLuces Jul 9, 2024
eb3ea20
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 9, 2024
8668598
fix: pre-commit
AlejandroFernandezLuces Jul 9, 2024
9fce6e6
fix: Wrong legend
AlejandroFernandezLuces Jul 9, 2024
8477436
fix: update cache
AlejandroFernandezLuces Jul 9, 2024
47a71be
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 9, 2024
1537d64
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 10, 2024
be6ac17
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 10, 2024
1e35d88
Update the image cache
AlejandroFernandezLuces Jul 10, 2024
b89260e
feat: Add support for passing PyVista plotters
AlejandroFernandezLuces Jul 10, 2024
8b061d5
fix: Force arial and reset cache
AlejandroFernandezLuces Jul 10, 2024
985540a
Update the image cache
AlejandroFernandezLuces Jul 10, 2024
8108eb5
fix: Add missing docstring
AlejandroFernandezLuces Jul 10, 2024
ab67575
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 10, 2024
c614ce2
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 10, 2024
d08506a
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 10, 2024
db760f8
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 15, 2024
4b8b25d
fix: Simplify plotter selection
AlejandroFernandezLuces Jul 15, 2024
9b44b00
Merge branch 'feat/common-plotter' of https://github.com/pyansys/pyma…
AlejandroFernandezLuces Jul 15, 2024
d2cacd7
fix: Delete unused return, fix changelog label
AlejandroFernandezLuces Jul 15, 2024
6bc7004
chore: adding changelog file 2799.dependencies.md
pyansys-ci-bot Jul 15, 2024
fe9a6a0
chore: adding changelog file 2799.added.md
pyansys-ci-bot Jul 15, 2024
7c3bbd4
Merge branch 'main' into feat/common-plotter
AlejandroFernandezLuces Jul 16, 2024
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
2 changes: 1 addition & 1 deletion .devcontainer/codespaces-dev/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ansys-dpf-core==0.10.1
ansys-tools-visualization-interface==0.2.6
autopep8==2.3.1
matplotlib==3.9.0
pandas==2.2.2
Expand All @@ -9,6 +10,5 @@ pytest-memprof<0.3.0
pytest-pyvista==0.1.9
pytest-rerunfailures==14.0
pytest==8.2.2
pyvista==0.43.10
scipy==1.14.0
vtk==9.3.0
2 changes: 1 addition & 1 deletion .devcontainer/codespaces-docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.53.0
ansys-sphinx-theme==0.16.6
ansys-tools-visualization-interface==0.2.6
grpcio==1.64.1
imageio-ffmpeg==0.5.1
imageio==2.34.2
Expand All @@ -14,7 +15,6 @@ pyiges[full]==0.3.1
pypandoc==1.13
pytest-sphinx==0.6.3
pythreejs==2.4.2
pyvista[trame]==0.43.10
sphinx-autobuild==2024.4.16
sphinx-autodoc-typehints==1.25.2
sphinx-copybutton==0.5.2
Expand Down
3 changes: 1 addition & 2 deletions .devcontainer/devcontainer-local/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.53.0
ansys-sphinx-theme==0.16.6
ansys-tools-visualization-interface==0.2.6
autopep8==2.3.1
grpcio==1.64.1
imageio-ffmpeg==0.5.1
Expand All @@ -21,8 +22,6 @@ pytest-rerunfailures==14.0
pytest-sphinx==0.6.3
pytest==8.2.2
pythreejs==2.4.2
pyvista[jupyter]==0.43.10
pyvista==0.43.10
scipy==1.14.0
sphinx-autobuild==2024.4.16
sphinx-autodoc-typehints==1.25.2
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ updates:
- "matplotlib"
- "pexpect"
- "pyiges"
- "pyvista"
- "ansys-tools-visualization-interface"
- "scipy"
- "tqdm"
- "vtk"
Expand Down
1 change: 1 addition & 0 deletions doc/changelog.d/2799.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat: Adapt PyMAPDL to common plotter
2 changes: 1 addition & 1 deletion doc/source/api/plotting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Various PyMAPDL specific plotting commands.
.. autosummary::
:toctree: _autosummary

plotting.general_plotter
plotting.MapdlPlotter
plotting.MapdlTheme
Mapdl.aplot
Mapdl.eplot
Expand Down
6 changes: 5 additions & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from pathlib import Path
import warnings

import ansys.tools.visualization_interface as viz_interface
from ansys_sphinx_theme import ansys_favicon, get_version_match
import numpy as np
import pyvista
Expand All @@ -14,11 +15,14 @@
from ansys.mapdl import core as pymapdl
from ansys.mapdl.core import __version__

viz_interface.DOCUMENTATION_BUILD = True
pyvista.BUILDING_GALLERY = True
pyvista.OFF_SCREEN = True
AlejandroFernandezLuces marked this conversation as resolved.
Show resolved Hide resolved

# Manage errors
pyvista.set_error_output_file("errors.txt")

# Ensure that offscreen rendering is used for docs generation
pyvista.OFF_SCREEN = True

# must be less than or equal to the XVFB window size
try:
Expand Down
2 changes: 1 addition & 1 deletion doc/source/examples/extended_examples/gui/executable.rst
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ Add a PyVista plotting frame in the window
==========================================

Start by importing the `QtInteractor <https://qtdocs.pyvista.org/api_reference.html#qtinteractor>`_
class from the ``pyvistaqt`` package and the :class:`MapdlTheme <ansys.mapdl.core.theme.MapdlTheme>`
class from the ``pyvistaqt`` package and the :class:`MapdlTheme <ansys.mapdl.core.plotting.theme.MapdlTheme>`
class from the ``ansys-mapdl-core`` package:

.. code:: python
Expand Down
4 changes: 2 additions & 2 deletions doc/source/user_guide/plotting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ transfer the geometry to Python to visualize it:
- :func:`Mapdl.vplot() <ansys.mapdl.core.Mapdl.vplot>`
- :func:`Mapdl.eplot() <ansys.mapdl.core.Mapdl.eplot>`).

These methods rely on the :func:`ansys.mapdl.core.plotting.general_plotter`
These methods rely on the :class:`ansys.mapdl.core.plotting.visualizer.MapdlPlotter`
method. Combined with the MAPDL geometry commands, you can
generate and visualize geometry from scratch without opening the GUI
using the :func:`open_gui() <ansys.mapdl.core.Mapdl.open_gui>` method.
Expand Down Expand Up @@ -171,7 +171,7 @@ to view the XY plane with ``cpos='xy'``.
>>> mapdl.eplot(cpos="xy")

For all general plotting options, see the
:func:`ansys.mapdl.core.plotting.general_plotter` method.
:class:`ansys.mapdl.core.plotting.visualizer.MapdlPlotter` class.


Plotting boundary conditions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
#
# The plot is then shown and it recreates the native plot quite well.

from ansys.mapdl.core.theme import PyMAPDL_cmap
from ansys.mapdl.core.plotting.theme import PyMAPDL_cmap

plotter = pv.Plotter()

Expand Down
16 changes: 3 additions & 13 deletions examples/00-mapdl-examples/3d_notch.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

# sphinx_gallery_thumbnail_number = 3
import numpy as np
import pyvista as pv

from ansys.mapdl.core import launch_mapdl

Expand Down Expand Up @@ -88,30 +87,21 @@
# plate_with_hole_anum = mapdl.asba(rect_anum, circ_anum)
cut_area = mapdl.asba(rect_anum, "ALL") # cut all areas except the plate

plotter = pv.Plotter(shape=(1, 3))

plotter.subplot(0, 0)
mapdl.lsla("S")
mapdl.lplot(vtk=True, show_keypoint_numbering=True, plotter=plotter)
mapdl.lplot(vtk=True, show_keypoint_numbering=True)
mapdl.lsel("all")

# plot the area using vtk/pyvista
plotter.subplot(0, 1)
mapdl.aplot(
vtk=True, show_area_numbering=True, show_lines=True, cpos="xy", plotter=plotter
)
mapdl.aplot(vtk=True, show_area_numbering=True, show_lines=True, cpos="xy")
AlejandroFernandezLuces marked this conversation as resolved.
Show resolved Hide resolved

# Next, extrude the area to create volume
thickness = 0.01
mapdl.vext(cut_area, dz=thickness)

# Checking volume plot
plotter.subplot(0, 2)
mapdl.vplot(
vtk=True, show_lines=True, show_axes=True, smooth_shading=True, plotter=plotter
)
mapdl.vplot(vtk=True, show_lines=True, show_axes=True, smooth_shading=True)

plotter.show()

###############################################################################
# Meshing
Expand Down
5 changes: 3 additions & 2 deletions examples/00-mapdl-examples/geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

from ansys.mapdl import core as pymapdl
from ansys.mapdl.core import examples
from ansys.mapdl.core.plotting import MapdlTheme

mapdl = pymapdl.launch_mapdl()

Expand All @@ -68,7 +69,7 @@
# remotable (with 2021R1 and newer) interactive plotting. The common
# plotting methods (``kplot``, ``lplot``, ``aplot``, ``eplot``, etc.)
# all have compatible commands that use the
# :func:`ansys.mapdl.core.plotting.general_plotter` function. You can
# :class:`ansys.mapdl.core.plotting.visualizer.MapdlPlotter` class. You can
# configure this method with a variety of keyword arguments. For example:

mapdl.lplot(
Expand All @@ -88,7 +89,7 @@
# multiple plots. These theme parameters override any unset keyword
# arguments. For example:

my_theme = pymapdl.MapdlTheme()
my_theme = MapdlTheme()
my_theme.background = "white"
my_theme.cmap = "jet" # colormap
my_theme.axes.show = False
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ dependencies = [
"ansys-mapdl-reader>=0.51.7",
"ansys-math-core>=0.1.2",
"ansys-platform-instancemanagement~=1.0",
"ansys-tools-visualization-interface>=0.2.6",
"ansys-tools-path>=0.3.1",
"click>=8.1.3", # for CLI interface
"grpcio>=1.30.0", # tested up to grpcio==1.35
Expand All @@ -30,7 +31,6 @@ dependencies = [
"psutil>=5.9.4",
"pyansys-tools-versioning>=0.3.3",
"pyiges[full]>=0.3.1", # Since v0.3.0, the 'full' flag is needed in order to install 'geomdl'
"pyvista>=0.38.1",
germa89 marked this conversation as resolved.
Show resolved Hide resolved
"scipy>=1.3.0", # for sparse (consider optional?)
"tabulate>=0.8.0", # for cli plotting
"tqdm>=4.45.0",
Expand All @@ -54,11 +54,11 @@ classifiers = [
jupyter = [
"jupyterlab>=3",
"ipywidgets",
"pyvista[jupyter]",
AlejandroFernandezLuces marked this conversation as resolved.
Show resolved Hide resolved
]

tests = [
"ansys-dpf-core==0.10.1",
"ansys-tools-visualization-interface==0.2.6",
"autopep8==2.3.1",
"matplotlib==3.9.1",
"pandas==2.2.2",
Expand All @@ -69,13 +69,13 @@ tests = [
"pytest-pyvista==0.1.9",
"pytest-rerunfailures==14.0",
"pytest==8.2.2",
"pyvista==0.43.10",
"scipy==1.14.0",
"vtk==9.3.1",
]
doc = [
"ansys-dpf-core==0.10.1",
"ansys-mapdl-reader==0.53.0",
"ansys-tools-visualization-interface==0.2.6",
"ansys-sphinx-theme==0.16.6",
"grpcio==1.65.0",
"imageio-ffmpeg==0.5.1",
Expand All @@ -90,7 +90,6 @@ doc = [
"pypandoc==1.13",
"pytest-sphinx==0.6.3",
"pythreejs==2.4.2",
"pyvista[jupyter]==0.43.10",
"sphinx-autobuild==2024.4.16",
"sphinx-autodoc-typehints==1.25.2",
"sphinx-copybutton==0.5.2",
Expand Down
3 changes: 2 additions & 1 deletion src/ansys/mapdl/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,12 @@
from ansys.mapdl.core.mapdl_grpc import MapdlGrpc as Mapdl
from ansys.mapdl.core.misc import Information, Report, _check_has_ansys
from ansys.mapdl.core.pool import MapdlPool
from ansys.mapdl.core.theme import MapdlTheme, _apply_default_theme

_HAS_ANSYS = _check_has_ansys()

if _HAS_PYVISTA:
from ansys.mapdl.core.plotting.theme import _apply_default_theme

_apply_default_theme()

BUILDING_GALLERY = False
Expand Down
2 changes: 1 addition & 1 deletion src/ansys/mapdl/core/examples/examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"""pymapdl examples"""
import os

from ansys.mapdl.core.theme import PyMAPDL_cmap
from ansys.mapdl.core.plotting.theme import PyMAPDL_cmap

Check warning on line 26 in src/ansys/mapdl/core/examples/examples.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/mapdl/core/examples/examples.py#L26

Added line #L26 was not covered by tests

# get location of this folder and the example files
dir_path = os.path.dirname(os.path.realpath(__file__))
Expand Down
Loading
Loading