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

Bugfix/documentation update #70

Merged
merged 3 commits into from
Jul 4, 2024
Merged

Bugfix/documentation update #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8cd134
Bug fix: Stage z shows incorrectly on initialization.
hannalee2 Jun 28, 2024
6e24b2b
Merge branch 'main' of https://github.com/AllenNeuralDynamics/parallax
hannalee2 Jul 4, 2024
d7e16a1
Update the link for conf.py
hannalee2 Jul 4, 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 .readthedocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build:

# Build from the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py
configuration: docs/source/conf.py

# Explicitly set the version of Python and its requirements
python:
Expand Down
2 changes: 1 addition & 1 deletion parallax/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import os

__version__ = "0.37.12"
__version__ = "0.37.13"

# allow multiple OpenMP instances
os.environ["KMP_DUPLICATE_LIB_OK"] = "True"
2 changes: 1 addition & 1 deletion parallax/stage_listener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def __init__(self, stage_info=None):
self.name = stage_info["Id"]
self.stage_x = stage_info["Stage_X"] * 1000
self.stage_y = stage_info["Stage_Y"] * 1000
self.stage_z = stage_info["Stage_Z"] * 1000
self.stage_z = 15000 - stage_info["Stage_Z"] * 1000
self.stage_x_global = None
self.stage_y_global = None
self.stage_z_global = None
Expand Down
Loading