Merge branch 'sample-size-sim' into 'v3'

Simulate a rectangular sample

Closes #516

See merge request openflexure/openflexure-microscope-server!401
This commit is contained in:
Joe Knapper 2025-10-07 10:09:37 +00:00
commit dae5b816cc
3 changed files with 78 additions and 24 deletions

View file

@ -33,7 +33,7 @@ def thing_server():
server = lt.ThingServer(settings_folder=temp_folder.name)
server.add_thing(
SimulatedCamera(
shape=(240, 320, 3), canvas_shape=(960, 1240, 3), frame_interval=0.01
shape=(240, 320, 3), canvas_shape=(1000, 1500, 3), frame_interval=0.01
),
"/camera/",
)

View file

@ -60,7 +60,7 @@ def test_add_static_file(filename, allow_cache, mocker):
# the wrapped function should return the file response
response = wrapped()
assert isinstance(response, FileResponse)
assert response.path == "bar/" + filename
assert response.path == os.path.join("bar", filename)
# The file response headers always have some standard data, and if the file is
# allowed to be cached it should also have the no_cache data
for key, value in serve_static_files.NO_CACHE_HEADERS.items():