LIMS-154: Enable display of all grid scan snapshots in full (#631)

* LIMS-154: Enable display of all grid scan snapshots in full * Avoid overwriting globally scoped variable n Co-authored-by: Guilherme Francisco <[email protected]> --------- Co-authored-by: Mark Williams <[email protected]> Co-authored-by: Guilherme Francisco <[email protected]>
DiamondLightSource · Sep 12, 2023 · d6c4ba5 · d6c4ba5
1 parent 5ec00f1
commit d6c4ba5
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/client/src/js/modules/dc/views/gridplot.js b/client/src/js/modules/dc/views/gridplot.js
@@ -25,9 +25,11 @@ define(['jquery', 'marionette',
             hmt: 'input[name=heatmap]',
             ty: 'select[name=type]',
             ty2: 'select[name=type2]',
+            ty3: 'select[name=type3]',
             xfm: '.xfm',
             flu: 'input[name=fluo]',
             el: 'select[name=element]',
+            sns: 'a[name=snapshots]',
         },
 
         events: {
@@ -36,6 +38,7 @@ define(['jquery', 'marionette',
 
             'change @ui.ty': 'setType',
             'change @ui.ty2': 'loadAttachment',
+            'change @ui.ty3': 'loadImage',
             'change @ui.hmt': 'setHM',
 
             'change @ui.flu': 'toggleFluo',
@@ -97,6 +100,7 @@ define(['jquery', 'marionette',
             this.offset_h = 0
             this.scale = 1
             this.current = -1
+            this.image_1_width = -1
 
             this.heatmapToggle = false
 
@@ -144,6 +148,28 @@ define(['jquery', 'marionette',
             }
         },
 
+        populateImageSelect: function() {
+            opts = []
+            for (let i=1; i<=4; i++) {
+                if (this.getOption('parent').get('X'+i)) {
+                    opts.push('<option value='+i+'>Image '+i+'</option>')
+                    if (i === 1) {
+                        // show button to view image full size
+                        this.ui.sns.append('<a class="button" href="'+app.apiurl+'/image/id/'+this.getOption('ID')+'/f/1/n/'+i+'"><i class="fa fa-arrows"></a>')
+                    } else {
+                        this.ui.sns.append('<a class="hidden" href="'+app.apiurl+'/image/id/'+this.getOption('ID')+'/f/1/n/'+i+'"></a>')
+                    }
+                }
+            }
+            if (opts.length > 1) {
+                this.ui.ty3.html(opts).show()
+            }
+        },
+
+        loadImage: function() {
+            var n = this.ui.ty3.val()
+            this.snapshot.load(app.apiurl+'/image/id/'+this.getOption('ID')+'/f/1/n/'+n)
+        },
 
         toggleFluo: function() {
             if (this.ui.flu.is(':checked')) {
@@ -251,11 +277,18 @@ define(['jquery', 'marionette',
             this.hasSnapshot = true
             this.$el.removeClass('loading')
             this.draw()
+            if (this.ui.ty3.val() == 1) {
+                this.image_1_width = this.snapshot.width
+            }
+            var n = this.ui.ty3.val()
+            this.ui.sns.magnificPopup({ type: 'image', delegate: 'a', gallery: { enabled:true } })
         },
 
         onRender: function() {
             this.ui.xfm.hide()
             this.ui.ty2.hide()
+            this.ui.ty3.hide()
+            this.populateImageSelect()
         },
 
 
@@ -324,6 +357,17 @@ define(['jquery', 'marionette',
                     h *= scalef
                 }
 
+                if (this.image_1_width > 0 && this.snapshot.width != this.image_1_width) {
+                    // Image size is different to image 1, so hide PIA results as they would be in the wrong location
+                    this.ui.ty.val(-1)
+                    this.ui.ty2.val('')
+                    this.ui.ty.prop('disabled', true)
+                    this.ui.ty2.prop('disabled', true)
+                } else {
+                    this.ui.ty.prop('disabled', false)
+                    this.ui.ty2.prop('disabled', false)
+                }
+
                 var cvratio = this.perceivedw / this.perceivedh
                 var snratio = w/h
 

diff --git a/client/src/js/templates/dc/gridplot.html b/client/src/js/templates/dc/gridplot.html
@@ -1,4 +1,7 @@
 <div class="controls">
+	<a name="snapshots"></a>
+	<select name="type3"></select>
+
 	<select name="type">
 		<option value="0">Spots</option>
 		<option value="1">Bragg</option>
@@ -13,4 +16,4 @@
 		<select name="element"></select>
 	</span>
 </div>
-<canvas></canvas>
+<canvas></canvas>