Commit 9d46ac1c authored by Joel Collins's avatar Joel Collins
Browse files

Updated returned capture metadata

parent 07c5c011

openflexure_microscope/api/static/main_v1.js

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ function updateCaptures(response) { 
        <div class="clearfix">

            <div class="left-col"><img src="${element_uri}/download?thumbnail=true"></div>

            <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>

                <br>

            </div>

openflexure_microscope/camera/capture.py

+1 −7
Original line number Diff line number Diff line
@@ -144,16 +144,10 @@ class StreamObject(object): 
            'id': self.id,

            'locked': self.locked,

            'keep_on_disk': self.keep_on_disk,

            'filename': self.filename,

            '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

        if self.stream_exists:

            d['stream'] = True