diff --git a/client/src/js/modules/dc/views/dcbase.js b/client/src/js/modules/dc/views/dcbase.js index 72c58aba2..328abe49c 100644 --- a/client/src/js/modules/dc/views/dcbase.js +++ b/client/src/js/modules/dc/views/dcbase.js @@ -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() @@ -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() diff --git a/client/src/js/modules/dc/views/grid.js b/client/src/js/modules/dc/views/grid.js index e3049c712..a56aed58b 100644 --- a/client/src/js/modules/dc/views/grid.js +++ b/client/src/js/modules/dc/views/grid.js @@ -46,6 +46,7 @@ define(['marionette', xrcholder: '.holder h1.xrc', apholder: '.holder h1.ap', gridsize: '.gridsize', + gridsize2: '.gridsize2', }, toggleZoom: function(e) { @@ -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() { diff --git a/client/src/js/templates/dc/grid.html b/client/src/js/templates/dc/grid.html index fe695c959..3ef68d31c 100644 --- a/client/src/js/templates/dc/grid.html +++ b/client/src/js/templates/dc/grid.html @@ -13,7 +13,7 @@

  • Transmission: <%-TRANSMISSION%>%
  • Beamsize: <%-BSX%>x<%-BSY%>μm
  • Boxsize: xμm
  • -
  • Grid scan size:
  • +
  • Grid scan size:
  • Comment: <%-COMMENTS%>
  • <% if (!STATE) { %>
  • Status: Stopped
  • <% } %>