diff --git a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py index a4652c9ff..b01e80bc8 100644 --- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py +++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py @@ -1299,6 +1299,8 @@ def draw_labels(self, panel, page): label_value.append(channel["label"]) label_value = " ".join(label_value) + elif prop_nf[0] in ["zoom"]: + label_value = str(panel["zoom"]) + " %" new_text.append(label_value if label_value else item.group()) last_idx = item.end() diff --git a/omero_figure/templates/figure/index.html b/omero_figure/templates/figure/index.html index 6eae81088..4e08093fd 100644 --- a/omero_figure/templates/figure/index.html +++ b/omero_figure/templates/figure/index.html @@ -605,6 +605,11 @@
The figure legend will be included in the PDF info page when the figure is diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js index 7e3c02a67..72df926f2 100644 --- a/src/js/models/panel_model.js +++ b/src/js/models/panel_model.js @@ -104,6 +104,7 @@ 'pixel_size_x_unit': data.pixel_size_x_unit, 'pixel_size_z_unit': data.pixel_size_z_unit, 'deltaT': data.deltaT, + 'zoom':data.zoom, }; // theT is not changed unless we have to... @@ -334,6 +335,12 @@ return (isNegative ? '-' : '') + text; }, + get_zoom_label_text: function() { + var text = "" + this.get('zoom') + " %" + return text; + }, + + get_name_label_text: function(property, format) { var text = ""; if (property === "image") { diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js index ca9f1599f..49265570c 100644 --- a/src/js/views/panel_view.js +++ b/src/js/views/panel_view.js @@ -228,6 +228,8 @@ label_value = self.model.get_view_label_text(prop_nf[0], format, precision); } else if (['channels', 'c'].includes(prop_nf[0])) { label_value = self.model.get_channels_label_text(); + } else if (['zoom'].includes(prop_nf[0])) { + label_value = self.model.get_zoom_label_text(); } //If label_value hasn't been created (invalid prop_nf[0]) diff --git a/src/templates/labels_form_inner_template.html b/src/templates/labels_form_inner_template.html index efb061fc7..166d52749 100644 --- a/src/templates/labels_form_inner_template.html +++ b/src/templates/labels_form_inner_template.html @@ -52,6 +52,9 @@