Skip to content

Fix: plot autoscaling not being recognised #42

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

Merged
paulmueller merged 6 commits into from
Nov 5, 2025
Merged

Fix: plot autoscaling not being recognised #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc87cf8
setup: set setuptools section for debugging gui
Nov 5, 2025
a825245
setup: set new author in alphab order
Nov 5, 2025
b71f25a
fix: correctly get the plot checkState.value for autoscaling
Nov 5, 2025
638382f
ci: update actions matrix to newer py versions
Nov 5, 2025
e6fd918
ci: test out all latest py versions on gha
Nov 5, 2025
1dc7241
ci: limit pipelines to py310 and py311 for now
Nov 5, 2025
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 .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.10']
python-version: ['3.10', '3.11']
os: [macos-latest, ubuntu-latest, windows-latest]
env:
# Display must be available globally for linux to know where xvfb is
Expand Down
4 changes: 2 additions & 2 deletions pyjibe/fd/widget_plot_fd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def fd(self):

def mpl_curve_update(self, fdist):
"""Update the force-indentation curve"""
autoscale_x = self.fd.cb_mpl_rescale_plot_x.checkState() == 2
autoscale_y = self.fd.cb_mpl_rescale_plot_y.checkState() == 2
autoscale_x = self.fd.cb_mpl_rescale_plot_x.checkState().value == 2
autoscale_y = self.fd.cb_mpl_rescale_plot_y.checkState().value == 2
if autoscale_x:
rescale_x = None
else:
Expand Down
10 changes: 7 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ build-backend = "setuptools.build_meta"
name = "pyjibe"
authors = [
# In alphabetical order.
{name = "Eoghan O'Connell"},
{name = "Paul Müller"},
]
maintainers = [
Expand All @@ -25,13 +26,13 @@ classifiers = [
'Topic :: Scientific/Engineering :: Visualization',
'Intended Audience :: Science/Research'
]
license = {text = "GPL version 3.0 or later"}
license = { text = "GPL version 3.0 or later" }
dependencies = [
"afmformats>=0.18.0",
"nanite>=4.2.1",
# https://github.com/AFM-analysis/PyJibe/issues/32
"matplotlib>=3,<3.7.5", # NavigationToolbar2QT mod
"packaging", # for version checking during update
"matplotlib>=3,<3.7.5", # NavigationToolbar2QT mod
"packaging", # for version checking during update
"pyqt6",
]
dynamic = ["version"]
Expand All @@ -45,6 +46,9 @@ tracker = "https://github.com/AFM-analysis/PyJibe/Issues"
documentation = "https://pyjibe.readthedocs.io/en/stable/"
changelog = "https://pyjibe.readthedocs.io/en/stable/sec_changelog.html"

[tool.setuptools]
packages = ["pyjibe"]

[tool.setuptools_scm]
write_to = "pyjibe/_version.py"
version_scheme = "post-release"