Skip to content

LIMS-2077: Individual grid scans show boxes for group of grid scans #1041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndg63276 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

LIMS-2077: Individual grid scans show boxes for group of grid scans #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/src/js/modules/dc/views/dcbase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ define(['marionette',
console.log('updateDCC', this.ui.dcglink, this.model)
if (this.model.get('DCC') > 1) {
this.$el.find('li.group').show()
this.$el.find('.gridsize2').show()
this.$el.find('.dcglink').show()
this.$el.find('.dclink').hide()
this.$el.find('.reprocess').hide()
Expand All @@ -95,6 +96,7 @@ define(['marionette',
}
} else {
this.$el.find('li.group').hide()
this.$el.find('.gridsize2').hide()
this.$el.find('.dcglink').hide()
this.$el.find('.dclink').show()
this.$el.find('.reprocess').show()
Expand Down
6 changes: 3 additions & 3 deletions client/src/js/modules/dc/views/grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ define(['marionette',
xrcholder: '.holder h1.xrc',
apholder: '.holder h1.ap',
gridsize: '.gridsize',
gridsize2: '.gridsize2',
},

toggleZoom: function(e) {
Expand Down Expand Up @@ -126,9 +127,8 @@ define(['marionette',
if (this.ui.bx.text) this.ui.by.text((gi.get('DY_MM')*1000).toFixed(0))

if (gi.get('STEPS_Y') > 10 && this.ui.zoom.show) this.ui.zoom.show()
var gridsize = gi.get('STEPS_X') + ' x ' + gi.get('STEPS_Y')
if (gi.get('STEPS_Z')) { gridsize += ' x ' + gi.get('STEPS_Z') }
this.ui.gridsize.html(gridsize)
this.ui.gridsize.html(gi.get('STEPS_X') + ' x ' + gi.get('STEPS_Y'))
if (gi.get('STEPS_Z')) { this.ui.gridsize2.html(' x ' + gi.get('STEPS_Z')) }
},

checkXRCandAP: function() {
Expand Down
2 changes: 1 addition & 1 deletion client/src/js/templates/dc/grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h1 class="title"></h1>
<li>Transmission: <%-TRANSMISSION%>%</li>
<li>Beamsize: <%-BSX%>x<%-BSY%>&mu;m</li>
<li>Boxsize: <span class="boxx"></span>x<span class="boxy"></span>&mu;m</li>
<li>Grid scan size: <span class="gridsize"></span></li>
<li>Grid scan size: <span class="gridsize"></span><span class="gridsize2"></span></li>
<li class="comment">Comment: <span class="COMMENTS"><%-COMMENTS%></span></li>
<% if (!STATE) { %><li>Status: <span class="b">Stopped</span></li><% } %>

Expand Down
Loading