Skip to content

Commit 6f35582

Browse files
authored
Merge pull request #135 from scipp/fix-instrument-view
Fix instrument view
2 parents 625a184 + 6fe0c81 commit 6f35582

12 files changed

+87
-45
lines changed

docs/user-guide/dream/dream-instrument-view.ipynb

+5-4
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@
154154
},
155155
"outputs": [],
156156
"source": [
157-
"full_view[2].controls[\"tof\"][\"slider\"].value = 35"
157+
"full_view[2].controls[\"tof\"][\"slider\"].value = 35\n",
158+
"full_view[1].toolbar.tools[\"autoscale\"].click()"
158159
]
159160
},
160161
{
@@ -206,7 +207,8 @@
206207
},
207208
"outputs": [],
208209
"source": [
209-
"mantle_view[1].controls[\"tof\"][\"slider\"].value = 43"
210+
"mantle_view[1].controls[\"tof\"][\"slider\"].value = 43\n",
211+
"mantle_view[0].toolbar.tools[\"autoscale\"].click()"
210212
]
211213
},
212214
{
@@ -246,8 +248,7 @@
246248
"mimetype": "text/x-python",
247249
"name": "python",
248250
"nbconvert_exporter": "python",
249-
"pygments_lexer": "ipython3",
250-
"version": "3.10.14"
251+
"pygments_lexer": "ipython3"
251252
}
252253
},
253254
"nbformat": 4,

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies = [
3535
"essreduce>=25.02.4",
3636
"graphviz",
3737
"numpy",
38-
"plopp",
38+
"plopp>=25.03.0",
3939
"pythreejs",
4040
"sciline>=24.06.0",
4141
"scipp>=24.09.1",

requirements/base.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dask
66
essreduce>=25.02.4
77
graphviz
88
numpy
9-
plopp
9+
plopp>=25.03.0
1010
pythreejs
1111
sciline>=24.06.0
1212
scipp>=24.09.1

requirements/base.txt

+19-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:bd57e2addebc398f9de7064eb2a5c993a359ba46
1+
# SHA1:af7d2d7a93f0ecc6c2914fa96f82f7aef8510e44
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -23,33 +23,37 @@ cycler==0.12.1
2323
# via matplotlib
2424
dask==2025.2.0
2525
# via -r base.in
26-
decorator==5.1.1
26+
decorator==5.2.1
2727
# via ipython
2828
dnspython==2.7.0
2929
# via email-validator
3030
email-validator==2.2.0
3131
# via scippneutron
32-
essreduce==25.2.4
32+
essreduce==25.3.0
3333
# via -r base.in
34+
exceptiongroup==1.2.2
35+
# via ipython
3436
executing==2.2.0
3537
# via stack-data
3638
fonttools==4.56.0
3739
# via matplotlib
38-
fsspec==2025.2.0
40+
fsspec==2025.3.0
3941
# via dask
4042
graphviz==0.20.3
4143
# via -r base.in
42-
h5py==3.12.1
44+
h5py==3.13.0
4345
# via
4446
# scippneutron
4547
# scippnexus
4648
idna==3.10
4749
# via email-validator
50+
importlib-metadata==8.6.1
51+
# via dask
4852
importlib-resources==6.5.2
4953
# via tof
5054
ipydatawidgets==4.3.5
5155
# via pythreejs
52-
ipython==8.32.0
56+
ipython==8.34.0
5357
# via ipywidgets
5458
ipywidgets==8.1.5
5559
# via
@@ -62,10 +66,12 @@ jupyterlab-widgets==3.0.13
6266
kiwisolver==1.4.8
6367
# via matplotlib
6468
lazy-loader==0.4
65-
# via scippneutron
69+
# via
70+
# plopp
71+
# scippneutron
6672
locket==1.0.0
6773
# via partd
68-
matplotlib==3.10.0
74+
matplotlib==3.10.1
6975
# via
7076
# mpltoolbox
7177
# plopp
@@ -100,7 +106,7 @@ pexpect==4.9.0
100106
# via ipython
101107
pillow==11.1.0
102108
# via matplotlib
103-
plopp==24.10.0
109+
plopp==25.3.0
104110
# via
105111
# -r base.in
106112
# scippneutron
@@ -139,7 +145,7 @@ scipp==25.2.0
139145
# scippneutron
140146
# scippnexus
141147
# tof
142-
scippneutron==25.2.0
148+
scippneutron==25.2.1
143149
# via
144150
# -r base.in
145151
# essreduce
@@ -175,9 +181,12 @@ traittypes==0.2.1
175181
# via ipydatawidgets
176182
typing-extensions==4.12.2
177183
# via
184+
# ipython
178185
# pydantic
179186
# pydantic-core
180187
wcwidth==0.2.13
181188
# via prompt-toolkit
182189
widgetsnbextension==4.0.13
183190
# via ipywidgets
191+
zipp==3.21.0
192+
# via importlib-metadata

requirements/basetest.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ certifi==2025.1.31
99
# via requests
1010
charset-normalizer==3.4.1
1111
# via requests
12+
exceptiongroup==1.2.2
13+
# via pytest
1214
idna==3.10
1315
# via requests
1416
iniconfig==2.0.0
@@ -27,7 +29,7 @@ pluggy==1.5.0
2729
# via pytest
2830
pooch==1.8.2
2931
# via -r basetest.in
30-
pytest==8.3.4
32+
pytest==8.3.5
3133
# via -r basetest.in
3234
python-dateutil==2.9.0.post0
3335
# via pandas
@@ -37,6 +39,8 @@ requests==2.32.3
3739
# via pooch
3840
six==1.17.0
3941
# via python-dateutil
42+
tomli==2.2.1
43+
# via pytest
4044
tzdata==2025.1
4145
# via pandas
4246
urllib3==2.3.0

requirements/ci.txt

+9-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# pip-compile-multi
77
#
8-
cachetools==5.5.1
8+
cachetools==5.5.2
99
# via tox
1010
certifi==2025.1.31
1111
# via requests
@@ -44,9 +44,15 @@ requests==2.32.3
4444
# via -r ci.in
4545
smmap==5.0.2
4646
# via gitdb
47-
tox==4.24.1
47+
tomli==2.2.1
48+
# via
49+
# pyproject-api
50+
# tox
51+
tox==4.24.2
4852
# via -r ci.in
53+
typing-extensions==4.12.2
54+
# via tox
4955
urllib3==2.3.0
5056
# via requests
51-
virtualenv==20.29.2
57+
virtualenv==20.29.3
5258
# via tox

requirements/dev.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async-lru==2.0.4
2626
# via jupyterlab
2727
cffi==1.17.1
2828
# via argon2-cffi-bindings
29-
copier==9.5.0
29+
copier==9.6.0
3030
# via -r dev.in
3131
dunamai==1.23.0
3232
# via copier
@@ -75,7 +75,7 @@ overrides==7.7.0
7575
# via jupyter-server
7676
pathspec==0.12.1
7777
# via copier
78-
pip-compile-multi==2.7.1
78+
pip-compile-multi==2.8.0
7979
# via -r dev.in
8080
pip-tools==7.4.1
8181
# via pip-compile-multi
@@ -85,7 +85,7 @@ prometheus-client==0.21.1
8585
# via jupyter-server
8686
pycparser==2.22
8787
# via cffi
88-
python-json-logger==3.2.1
88+
python-json-logger==3.3.0
8989
# via jupyter-events
9090
questionary==2.1.0
9191
# via copier

requirements/docs.txt

+10-11
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ certifi==2025.1.31
2828
# via requests
2929
charset-normalizer==3.4.1
3030
# via requests
31-
debugpy==1.8.12
31+
debugpy==1.8.13
3232
# via ipykernel
3333
defusedxml==0.7.1
3434
# via nbconvert
@@ -46,9 +46,9 @@ imagesize==1.4.1
4646
# via sphinx
4747
ipykernel==6.29.5
4848
# via -r docs.in
49-
ipympl==0.9.6
49+
ipympl==0.9.7
5050
# via -r docs.in
51-
jinja2==3.1.5
51+
jinja2==3.1.6
5252
# via
5353
# myst-parser
5454
# nbconvert
@@ -85,7 +85,7 @@ mdit-py-plugins==0.4.2
8585
# via myst-parser
8686
mdurl==0.1.2
8787
# via markdown-it-py
88-
mistune==3.1.1
88+
mistune==3.1.2
8989
# via nbconvert
9090
myst-parser==4.0.1
9191
# via -r docs.in
@@ -98,7 +98,7 @@ nbformat==5.10.4
9898
# nbclient
9999
# nbconvert
100100
# nbsphinx
101-
nbsphinx==0.9.6
101+
nbsphinx==0.9.7
102102
# via -r docs.in
103103
nest-asyncio==1.6.0
104104
# via ipykernel
@@ -114,7 +114,7 @@ pooch==1.8.2
114114
# via -r docs.in
115115
psutil==7.0.0
116116
# via ipykernel
117-
pyarrow==19.0.0
117+
pyarrow==19.0.1
118118
# via -r docs.in
119119
pybtex==0.24.0
120120
# via
@@ -126,7 +126,7 @@ pydata-sphinx-theme==0.16.1
126126
# via -r docs.in
127127
pytz==2025.1
128128
# via pandas
129-
pyzmq==26.2.1
129+
pyzmq==26.3.0
130130
# via
131131
# ipykernel
132132
# jupyter-client
@@ -138,7 +138,7 @@ requests==2.32.3
138138
# via
139139
# pooch
140140
# sphinx
141-
rpds-py==0.22.3
141+
rpds-py==0.23.1
142142
# via
143143
# jsonschema
144144
# referencing
@@ -178,6 +178,8 @@ sphinxcontrib-serializinghtml==2.0.0
178178
# via sphinx
179179
tinycss2==1.4.0
180180
# via bleach
181+
tomli==2.2.1
182+
# via sphinx
181183
tornado==6.4.2
182184
# via
183185
# ipykernel
@@ -190,6 +192,3 @@ webencodings==0.5.1
190192
# via
191193
# bleach
192194
# tinycss2
193-
194-
# The following packages are considered to be unsafe in a requirements file:
195-
# setuptools

0 commit comments

Comments
 (0)