rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated returned capture metadata

Browse source
This commit is contained in:
Joel Collins 2018-11-16 10:21:24 +00:00
parent 07c5c0115d
commit 9d46ac1ca5
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openflexure_microscope/api/static/main_v1.js
View file

@ -69,7 +69,7 @@ function updateCaptures(response) {
<div class="clearfix"> <div class="clearfix">
<div class="left-col"><img src="${element_uri}/download?thumbnail=true"></div> <div class="left-col"><img src="${element_uri}/download?thumbnail=true"></div>
<div class="right-col"> <div class="right-col">
<b>${element.file}</b><br> <b>${element.filename}</b><br>
<a href="${element_uri}/download" target="_blank">View</a> <a href="${element_uri}/download?as_attachment=true">Download</a> Delete <a href="${element_uri}/" target="_blank">JSON</a> <a href="${element_uri}/download" target="_blank">View</a> <a href="${element_uri}/download?as_attachment=true">Download</a> Delete <a href="${element_uri}/" target="_blank">JSON</a>
<br> <br>
</div> </div>

8
openflexure_microscope/camera/capture.py
View file

@ -144,16 +144,10 @@ class StreamObject(object):
'id': self.id, 'id': self.id,
'locked': self.locked, 'locked': self.locked,
'keep_on_disk': self.keep_on_disk, 'keep_on_disk': self.keep_on_disk,
'filename': self.filename,
'path': self.file, 'path': self.file,
'context_manager': self.context_manager,
} }
# Get file path
if self.file_exists:
d['file'] = self.filename
else:
d['file'] = None
# Check stream # Check stream
if self.stream_exists: if self.stream_exists:
d['stream'] = True d['stream'] = True