From b6c99abb917ebda85d4f86748814ad512607ddf3 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Mon, 22 Aug 2022 15:51:40 +0200
Subject: [PATCH 01/32] DeltaT offset from T idx (1-based)

---
 .../scripts/omero/figure_scripts/Figure_To_Pdf.py        | 9 +++++++++
 1 file changed, 9 insertions(+)

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 53b422ef3..be37c0da5 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1174,6 +1174,15 @@ def draw_labels(self, panel, page):
                     else:
                         if timestamps and the_t < len(timestamps):
                             d_t = timestamps[the_t]
+                            tmp = expr[1].split("-")
+                            expr[1] = tmp[0]
+                            if len(tmp) > 1:
+                                try:
+                                    idx_ref = int(tmp[1])
+                                    if 1 <= idx_ref <= len(timestamps):
+                                        d_t -= timestamps[idx_ref-1]
+                                except ValueError:
+                                    continue
                         else:
                             d_t = 0
                         label_value = self.get_time_label_text(d_t, expr[1])

From e6bd374de60915eb7421c58ccda10b24d800d3b8 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Mon, 22 Aug 2022 16:07:28 +0200
Subject: [PATCH 02/32] JS DeltaT offset from T idx(1-based)

---
 src/js/models/panel_model.js | 7 ++++++-
 src/js/views/panel_view.js   | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index 56c7340a4..afaabd3f6 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -285,7 +285,7 @@
             return this.get('deltaT')[theT] || 0;
         },
 
-        get_time_label_text: function(format) {
+        get_time_label_text: function(format, shift) {
             var pad = function(digit) {
                 var d = digit + "";
                 return d.length === 1 ? ("0"+d) : d;
@@ -294,7 +294,12 @@
                 deltaT = this.get('deltaT')[theT] || 0,
                 isNegative = (deltaT < 0),
                 text = "", h, m, s;
+
             deltaT = Math.abs(deltaT);
+            if (shift){
+                deltaT = deltaT - this.get('deltaT')[parseInt(shift)-1];
+            }
+
             if (format === "index") {
                 isNegative = false;
                 text = "" + (theT + 1);
diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js
index 7f0e9cdc5..fe0dbe5b0 100644
--- a/src/js/views/panel_view.js
+++ b/src/js/views/panel_view.js
@@ -199,7 +199,8 @@
                         expr = match[0].slice(1,-1).split(".");
                         var label_value = ""
                         if (['time', 't'].includes(expr[0])) {
-                            label_value = self.model.get_time_label_text(expr[1] ? expr[1] : "index");
+                            value = (expr[1] ? expr[1] : "index").split("-");
+                            label_value = self.model.get_time_label_text(value[0], value[1]);
                         } else if (['image', 'dataset'].includes(expr[0])){
                             label_value = self.model.get_name_label_text(expr[0], expr[1] ? expr[1] : "name");
                             //Escape the underscore for markdown

From 42449a2b05d13650d22071666a2a64b589b7ad38 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Mon, 22 Aug 2022 16:10:58 +0200
Subject: [PATCH 03/32] Renamed dT offset parameter

---
 src/js/models/panel_model.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index afaabd3f6..440273923 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -285,7 +285,7 @@
             return this.get('deltaT')[theT] || 0;
         },
 
-        get_time_label_text: function(format, shift) {
+        get_time_label_text: function(format, offset_idx) {
             var pad = function(digit) {
                 var d = digit + "";
                 return d.length === 1 ? ("0"+d) : d;
@@ -297,7 +297,7 @@
 
             deltaT = Math.abs(deltaT);
             if (shift){
-                deltaT = deltaT - this.get('deltaT')[parseInt(shift)-1];
+                deltaT = deltaT - this.get('deltaT')[parseInt(offset_idx)-1];
             }
 
             if (format === "index") {

From 0148cd4320e3beea1328605bdf97240d494acfd4 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Fri, 9 Sep 2022 10:30:04 +0200
Subject: [PATCH 04/32] Default to 0 when shift with no timestamps

---
 src/js/models/panel_model.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index 440273923..4a9a8b3d4 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -296,8 +296,8 @@
                 text = "", h, m, s;
 
             deltaT = Math.abs(deltaT);
-            if (shift){
-                deltaT = deltaT - this.get('deltaT')[parseInt(offset_idx)-1];
+            if (offset_idx){
+                deltaT = deltaT - this.get('deltaT')[parseInt(offset_idx)-1] || 0;
             }
 
             if (format === "index") {

From 7a10b1d964d74134f3bf4c69d3c1363afd203b80 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Fri, 9 Sep 2022 17:18:33 +0200
Subject: [PATCH 05/32] Added precision param to time and XYZWH labels

---
 .../omero/figure_scripts/Figure_To_Pdf.py     | 63 +++++++++++++------
 src/js/models/panel_model.js                  | 35 ++++++-----
 src/js/views/panel_view.js                    |  9 ++-
 3 files changed, 69 insertions(+), 38 deletions(-)

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 be37c0da5..797cd6907 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1087,34 +1087,36 @@ def get_crop_region(self, panel):
 
         return {'x': cropx, 'y': cropy, 'width': tile_w, 'height': tile_h}
 
-    def get_time_label_text(self, delta_t, format):
+    def get_time_label_text(self, delta_t, format, dec_prec):
         """ Gets the text for 'live' time-stamp labels """
         # format of "secs" by default
         is_negative = delta_t < 0
         delta_t = abs(delta_t)
-        text = "%d s" % int(round(delta_t))
+        npad = 2 + dec_prec + (dec_prec > 0)
         if format in ["milliseconds", "ms"]:
-            text = "%s ms" % int(round(delta_t * 1000))
+            text = "%.*f ms" % (dec_prec, delta_t * 1000)
         elif format in ["secs", "seconds", "s"]:
-            text = "%d s" % int(round(delta_t))
+            text = "%.*f s" % (dec_prec, delta_t)
         elif format in ["mins", "minutes", "m"]:
-            text = "%s mins" % int(round(delta_t / 60))
+            text = "%.*f mins" % (dec_prec, delta_t / 60)
         elif format in ["mins:secs", "m:s"]:
             m = int(delta_t // 60)
-            s = round(delta_t % 60)
-            text = "%s:%02d" % (m, s)
+            s = delta_t % 60
+            text = "%s:%0*.*f" % (m, npad, dec_prec, s)
         elif format in ["hrs:mins", "h:m"]:
             h = int(delta_t // 3600)
-            m = int(round((delta_t % 3600) / 60))
-            text = "%s:%02d" % (h, m)
+            m = (delta_t % 3600) / 60
+            text = "%s:%0*.*f" % (h, npad, dec_prec, m)
         elif format in ["hrs:mins:secs", "h:m:s"]:
             h = int(delta_t // 3600)
             m = (delta_t % 3600) // 60
-            s = round(delta_t % 60)
-            text = "%s:%02d:%02d" % (h, m, s)
+            s = delta_t % 60
+            text = "%s:%02d:%0*.*f" % (h, m, npad, dec_prec, s)
         else:  # Format unknown
             return ""
-        if text in ["0 s", "0:00", "0 mins", "0:00:00"]:
+        dec_str = "" if dec_prec == 0 else "." + "0" * dec_prec
+        if text in ["0"+dec_str+" s", "0:00"+dec_str,
+                    "0"+dec_str+" mins", "0:00:00"+dec_str]:
             is_negative = False
         return ('-' if is_negative else '') + text
 
@@ -1172,20 +1174,32 @@ def draw_labels(self, panel, page):
                     if len(expr) == 1 or expr[1] == "index":
                         label_value = str(the_t + 1)
                     else:
+                        tmp = expr[-1].split("-")
+                        expr[-1] = tmp[0]
                         if timestamps and the_t < len(timestamps):
                             d_t = timestamps[the_t]
-                            tmp = expr[1].split("-")
-                            expr[1] = tmp[0]
                             if len(tmp) > 1:
                                 try:
                                     idx_ref = int(tmp[1])
                                     if 1 <= idx_ref <= len(timestamps):
                                         d_t -= timestamps[idx_ref-1]
+                                    else:
+                                        d_t = 0
                                 except ValueError:
-                                    continue
+                                    d_t = 0
                         else:
                             d_t = 0
-                        label_value = self.get_time_label_text(d_t, expr[1])
+
+                        dec_prec = 0
+                        if len(expr) > 2:
+                            try:
+                                dec_prec = int(expr[2])
+                            except ValueError:
+                                dec_prec = 0
+
+                        label_value = self.get_time_label_text(d_t,
+                                                               expr[1],
+                                                               dec_prec)
 
                 elif expr[0] == "image":
                     format = expr[1] if len(expr) > 1 else "name"
@@ -1224,6 +1238,11 @@ def draw_labels(self, panel, page):
                     elif prop == "rot":
                         prop = "rotation"
 
+                    try:
+                        dec_prec = int(expr[2]) if len(expr) > 2 else 2
+                    except ValueError:
+                        dec_prec = 2  # Default is 2
+
                     if prop == "z":
                         size_z = panel.get('sizeZ')
                         pixel_size_z = panel.get('pixel_size_z')
@@ -1238,8 +1257,10 @@ def draw_labels(self, panel, page):
                                 label_value = (str(z_start + 1) + "-"
                                                + str(z_end + 1))
                             elif format == "unit" and size_z:
-                                z_start = f"{(z_start * pixel_size_z):.2f}"
-                                z_end = f"{(z_end * pixel_size_z):.2f}"
+                                z_start = "%.*f" % (dec_prec,
+                                                    (z_start * pixel_size_z))
+                                z_end = "%.*f" % (dec_prec,
+                                                  (z_end * pixel_size_z))
                                 label_value = (z_start + " " + z_symbol + " - "
                                                + z_end + " " + z_symbol)
                         else:
@@ -1248,7 +1269,8 @@ def draw_labels(self, panel, page):
                                 label_value = str(the_z + 1)
                             elif (format == "unit" and size_z
                                   and the_z < size_z):
-                                z_pos = f"{(the_z * pixel_size_z):.2f}"
+                                z_pos = "%.*f" % (dec_prec,
+                                                  (the_z * pixel_size_z))
                                 label_value = (z_pos + " " + z_symbol)
 
                     elif prop == "rotation":
@@ -1264,7 +1286,8 @@ def draw_labels(self, panel, page):
                                 scale = panel['pixel_size_x']
                             elif prop in ['y', 'height']:
                                 scale = panel['pixel_size_y']
-                            rounded = f"{(value * scale):.2f}"
+                            rounded = "%.*f" % (dec_prec,
+                                                (value * scale))
                             label_value = ("" + rounded +
                                            " " + panel['pixel_size_x_symbol'])
 
diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index 4a9a8b3d4..328cc3531 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -285,47 +285,49 @@
             return this.get('deltaT')[theT] || 0;
         },
 
-        get_time_label_text: function(format, offset_idx) {
+        get_time_label_text: function(format, offset_idx, dec_prec) {
             var pad = function(digit) {
                 var d = digit + "";
                 return d.length === 1 ? ("0"+d) : d;
             };
             var theT = this.get('theT'),
                 deltaT = this.get('deltaT')[theT] || 0,
-                isNegative = (deltaT < 0),
                 text = "", h, m, s;
 
-            deltaT = Math.abs(deltaT);
             if (offset_idx){
                 deltaT = deltaT - this.get('deltaT')[parseInt(offset_idx)-1] || 0;
             }
+            var isNegative = (deltaT < 0);
+            deltaT = Math.abs(deltaT);
 
+            var padlen = dec_prec>0 ? dec_places+3 : 2;
             if (format === "index") {
                 isNegative = false;
                 text = "" + (theT + 1);
             } else if (['milliseconds', 'ms'].includes(format)) {
-                text = Math.round(deltaT*1000) + " ms";
+                text = (deltaT*1000).toFixed(dec_prec) + " ms";
             } else if (['seconds', 'secs', 's'].includes(format)) {
-                text = Math.round(deltaT) + " s";
+                text = deltaT.toFixed(dec_prec) + " s";
             } else if (['minutes', 'mins', 'm'].includes(format)) {
-                text = Math.round(deltaT / 60) + " mins";
+                text = (deltaT / 60).toFixed(dec_prec) + " mins";
             } else if (["mins:secs", "m:s"].includes(format)) {
                 m = parseInt(deltaT / 60);
-                s = pad(Math.round(deltaT % 60));
+                s = ((deltaT % 60).toFixed(dec_prec)).padStart(padlen, "0");
                 text = m + ":" + s;
             } else if (["hrs:mins", "h:m"].includes(format)) {
                 h = parseInt(deltaT / 3600);
-                m = pad(Math.round((deltaT % 3600) / 60));
+                m = (((deltaT % 3600) / 60).toFixed(dec_prec)).padStart(padlen, "0");
                 text = h + ":" + m;
             } else if (["hrs:mins:secs", "h:m:s"].includes(format)) {
                 h = parseInt(deltaT / 3600);
                 m = pad(parseInt((deltaT % 3600) / 60));
-                s = pad(Math.round(deltaT % 60));
+                s = ((deltaT % 60).toFixed(dec_prec)).padStart(padlen, "0");
                 text = h + ":" + m + ":" + s;
             } else { // Format unknown
                 return ""
             }
-            if (["0 s", "0:00", "0 mins", "0:00:00"].indexOf(text) > -1) {
+            var dec_str = dec_prec>0 ? "."+"0".repeat(dec_prec) : "";
+            if (["0"+dec_str+" s", "0"+dec_str+" mins", "0:00"+dec_str, "0:00:00"+dec_str].indexOf(text) > -1) {
                 isNegative = false;
             }
             return (isNegative ? '-' : '') + text;
@@ -350,7 +352,7 @@
             return text;
         },
 
-        get_view_label_text: function(property, format) {
+        get_view_label_text: function(property, format, dec_prec) {
             if (format === "px") format = "pixel";
 
             if (property === "w") property = "width";
@@ -366,6 +368,9 @@
             z_size = this.get('pixel_size_z');
             z_size = z_size?z_size:0
 
+            dec_prec = parseInt(dec_prec)
+            dec_prec = dec_prec?dec_prec:2
+
             var text = "";
             if (property === "z") {
                 if (this.get('z_projection')) {
@@ -374,8 +379,8 @@
                     if (format === "pixel") {
                         text = "" + (start+1) + " - " + (end+1);
                     } else if (format === "unit"){
-                        start = (start * z_size).toFixed(2)
-                        end = (end * z_size).toFixed(2)
+                        start = (start * z_size).toFixed(dec_prec)
+                        end = (end * z_size).toFixed(dec_prec)
                         text = ""+ start +" "+ z_symbol
                                + " - " + end +" "+ z_symbol
                     }
@@ -385,7 +390,7 @@
                     if (format === "pixel") {
                         text = "" + (theZ + 1);
                     } else if (format === "unit"){
-                        text = ""+ (theZ * z_size).toFixed(2) +" "+ z_symbol
+                        text = ""+ (theZ * z_size).toFixed(dec_prec) +" "+ z_symbol
                     }
                 }
                 return text
@@ -398,7 +403,7 @@
                 return ""+parseInt(value);
             } else if (format === "unit") {
                 scale = ['x', 'width'].includes(property) ? x_size : y_size
-                text = ""+ (value * scale).toFixed(2) +" "+ x_symbol
+                text = ""+ (value * scale).toFixed(dec_prec) +" "+ x_symbol
             }
             return text
         },
diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js
index fe0dbe5b0..377f9e6f1 100644
--- a/src/js/views/panel_view.js
+++ b/src/js/views/panel_view.js
@@ -199,14 +199,17 @@
                         expr = match[0].slice(1,-1).split(".");
                         var label_value = ""
                         if (['time', 't'].includes(expr[0])) {
-                            value = (expr[1] ? expr[1] : "index").split("-");
-                            label_value = self.model.get_time_label_text(value[0], value[1]);
+                            tmp = expr[expr.length-1].split("-");
+                            expr[expr.length-1] = tmp[0];
+                            dec_prec = (expr[2] ? parseInt(expr[2]) : 0); // decimal places matters only when the format isn't default
+                            label_value = self.model.get_time_label_text(expr[1] ? expr[1] : "index", tmp[1], dec_prec);
                         } else if (['image', 'dataset'].includes(expr[0])){
                             label_value = self.model.get_name_label_text(expr[0], expr[1] ? expr[1] : "name");
                             //Escape the underscore for markdown
                             label_value = label_value.replaceAll("_", "\\_");
                         } else if (['x', 'y', 'z', 'width', 'height', 'w', 'h', 'rotation', 'rot'].includes(expr[0])){
-                            label_value = self.model.get_view_label_text(expr[0], expr[1] ? expr[1] : "pixel");
+                            dec_prec = (expr[2] ? parseInt(expr[2]) : 2); // decimal places matters only when the format isn't default
+                            label_value = self.model.get_view_label_text(expr[0], expr[1] ? expr[1] : "pixel", dec_prec);
                         } else if (['channels', 'c'].includes(expr[0])) {
                             label_value = self.model.get_channels_label_text();
                         }

From 33a41560b17b364ce69a5cab651d98735a7b90a9 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Mon, 12 Sep 2022 16:07:46 +0200
Subject: [PATCH 06/32] Refactoring code

---
 .../omero/figure_scripts/Figure_To_Pdf.py     | 48 +++++++++----------
 src/js/models/panel_model.js                  |  8 ++--
 src/js/views/panel_view.js                    |  8 ++--
 3 files changed, 33 insertions(+), 31 deletions(-)

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 797cd6907..c79d75597 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1167,35 +1167,37 @@ def draw_labels(self, panel, page):
                 expr = item.group()[1:-1].split(".")
                 label_value = ""
 
+                tmp = expr[-1].split("-")
+                expr[-1] = tmp[0]
+                ref_idx = None
+                if len(tmp) > 1:
+                    try:
+                        ref_idx = int(tmp[1])
+                    except ValueError:
+                        pass
+
+                dec_prec = 0
+                if len(expr) > 2:
+                    try:
+                        dec_prec = int(expr[2])
+                    except ValueError:
+                        pass
+
                 if expr[0] in ["time", "t"]:
                     the_t = panel['theT']
                     timestamps = panel.get('deltaT')
                     # default to index
                     if len(expr) == 1 or expr[1] == "index":
+                        if ref_idx is not None:
+                            the_t -= ref_idx
                         label_value = str(the_t + 1)
                     else:
-                        tmp = expr[-1].split("-")
-                        expr[-1] = tmp[0]
+                        d_t = 0
                         if timestamps and the_t < len(timestamps):
                             d_t = timestamps[the_t]
-                            if len(tmp) > 1:
-                                try:
-                                    idx_ref = int(tmp[1])
-                                    if 1 <= idx_ref <= len(timestamps):
-                                        d_t -= timestamps[idx_ref-1]
-                                    else:
-                                        d_t = 0
-                                except ValueError:
-                                    d_t = 0
-                        else:
-                            d_t = 0
-
-                        dec_prec = 0
-                        if len(expr) > 2:
-                            try:
-                                dec_prec = int(expr[2])
-                            except ValueError:
-                                dec_prec = 0
+                            if ref_idx is not None:
+                                if 1 <= ref_idx <= len(timestamps):
+                                    d_t -= timestamps[ref_idx-1]
 
                         label_value = self.get_time_label_text(d_t,
                                                                expr[1],
@@ -1238,10 +1240,8 @@ def draw_labels(self, panel, page):
                     elif prop == "rot":
                         prop = "rotation"
 
-                    try:
-                        dec_prec = int(expr[2]) if len(expr) > 2 else 2
-                    except ValueError:
-                        dec_prec = 2  # Default is 2
+                    # Set the default precision value (2) if not given
+                    dec_prec = dec_prec if len(expr) > 2 else 2
 
                     if prop == "z":
                         size_z = panel.get('sizeZ')
diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index 328cc3531..eff619bd5 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -285,7 +285,7 @@
             return this.get('deltaT')[theT] || 0;
         },
 
-        get_time_label_text: function(format, offset_idx, dec_prec) {
+        get_time_label_text: function(format, ref_idx, dec_prec) {
             var pad = function(digit) {
                 var d = digit + "";
                 return d.length === 1 ? ("0"+d) : d;
@@ -294,13 +294,13 @@
                 deltaT = this.get('deltaT')[theT] || 0,
                 text = "", h, m, s;
 
-            if (offset_idx){
-                deltaT = deltaT - this.get('deltaT')[parseInt(offset_idx)-1] || 0;
+            if (ref_idx){
+                deltaT = deltaT - this.get('deltaT')[parseInt(ref_idx)-1] || 0;
             }
             var isNegative = (deltaT < 0);
             deltaT = Math.abs(deltaT);
 
-            var padlen = dec_prec>0 ? dec_places+3 : 2;
+            var padlen = dec_prec>0 ? dec_prec+3 : 2;
             if (format === "index") {
                 isNegative = false;
                 text = "" + (theT + 1);
diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js
index 377f9e6f1..daeb36a11 100644
--- a/src/js/views/panel_view.js
+++ b/src/js/views/panel_view.js
@@ -198,11 +198,13 @@
                         var new_text = new_text + ljson.text.slice(last_idx, match.index);
                         expr = match[0].slice(1,-1).split(".");
                         var label_value = ""
+
+                        ref_idx = expr[expr.length-1].split("-");
+                        expr[expr.length-1] = ref_idx[0];
+
                         if (['time', 't'].includes(expr[0])) {
-                            tmp = expr[expr.length-1].split("-");
-                            expr[expr.length-1] = tmp[0];
                             dec_prec = (expr[2] ? parseInt(expr[2]) : 0); // decimal places matters only when the format isn't default
-                            label_value = self.model.get_time_label_text(expr[1] ? expr[1] : "index", tmp[1], dec_prec);
+                            label_value = self.model.get_time_label_text(expr[1] ? expr[1] : "index", ref_idx[1], dec_prec);
                         } else if (['image', 'dataset'].includes(expr[0])){
                             label_value = self.model.get_name_label_text(expr[0], expr[1] ? expr[1] : "name");
                             //Escape the underscore for markdown

From 146d300670db1cb51d0887add01039d3a9ed2ab5 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Mon, 12 Sep 2022 16:37:22 +0200
Subject: [PATCH 07/32] Bug fix in text between dynamic label

---
 omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 c79d75597..f7ea81b44 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1188,8 +1188,6 @@ def draw_labels(self, panel, page):
                     timestamps = panel.get('deltaT')
                     # default to index
                     if len(expr) == 1 or expr[1] == "index":
-                        if ref_idx is not None:
-                            the_t -= ref_idx
                         label_value = str(the_t + 1)
                     else:
                         d_t = 0
@@ -1299,7 +1297,7 @@ def draw_labels(self, panel, page):
                     label_value = " ".join(label_value)
 
                 new_text.append(label_value if label_value else item.group())
-                last_idx += item.end()
+                last_idx = item.end()
 
             new_text.append(l['text'][last_idx:])
             l['text'] = "".join(new_text)

From 18e6259ec8d4a7c7e851671ffd88273e17dc6976 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 13 Sep 2022 09:14:33 +0200
Subject: [PATCH 08/32] Dec prec bug fix

---
 omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 f7ea81b44..c7791f27f 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1176,7 +1176,7 @@ def draw_labels(self, panel, page):
                     except ValueError:
                         pass
 
-                dec_prec = 0
+                dec_prec = None
                 if len(expr) > 2:
                     try:
                         dec_prec = int(expr[2])
@@ -1197,6 +1197,9 @@ def draw_labels(self, panel, page):
                                 if 1 <= ref_idx <= len(timestamps):
                                     d_t -= timestamps[ref_idx-1]
 
+                        # Set the default precision value (0) if not given
+                        dec_prec = 0 if dec_prec is None else dec_prec
+
                         label_value = self.get_time_label_text(d_t,
                                                                expr[1],
                                                                dec_prec)
@@ -1239,7 +1242,7 @@ def draw_labels(self, panel, page):
                         prop = "rotation"
 
                     # Set the default precision value (2) if not given
-                    dec_prec = dec_prec if len(expr) > 2 else 2
+                    dec_prec = 2 if dec_prec is None else dec_prec
 
                     if prop == "z":
                         size_z = panel.get('sizeZ')

From c174fcb5606e50401ddaa763c9a62f07ade82402 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 13 Sep 2022 09:42:49 +0200
Subject: [PATCH 09/32] updated tip window

---
 omero_figure/templates/figure/index.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/omero_figure/templates/figure/index.html b/omero_figure/templates/figure/index.html
index be8960037..2f2dbe551 100644
--- a/omero_figure/templates/figure/index.html
+++ b/omero_figure/templates/figure/index.html
@@ -516,7 +516,7 @@ <h4 class="modal-title" id="addImagesLabel">Import from JSON</h4>
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                     <h4 class="modal-title">Label Formatting</h4>
                 </div>
-                <div class="modal-body" style="max-height:518px">
+                <div class="modal-body" style="max-height:542px">
                     <h4>Markdown formatting</h4>
                     <p>
                         You can use "Markdown" syntax to add formatting to plain text. For example,
@@ -580,6 +580,16 @@ <h4>Dynamic properties</h4>
                             <td>*Height*: **[height.pixel]**</td>
                             <td><i>Height</i>: <strong>300</strong></td>
                         </tr>
+                        <tr>
+                            <th>Time with decimal precision of 2</th>
+                            <td>Time (s): [t.secs.2]</td>
+                            <td>Time (s): 0.93 s</td>
+                        </tr>
+                        <tr>
+                            <th>Time with frame n°3 as the "zero"</th>
+                            <td>Time (ms): [t.ms-3]</td>
+                            <td>Time (ms): -58 ms</td>
+                        </tr>
                         <tr>
                             <th>Image ID</th>
                             <td>Image ID: [image.id]</td>

From 76f28976162b0b5004fe8d69b462489803671c2e Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 13 Sep 2022 10:01:00 +0200
Subject: [PATCH 10/32] updated format spec

---
 docs/figure_file_format.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/figure_file_format.rst b/docs/figure_file_format.rst
index 77cac2c44..e2094fe1e 100644
--- a/docs/figure_file_format.rst
+++ b/docs/figure_file_format.rst
@@ -129,6 +129,15 @@ Optional settings for each panel::
             "size": "12",
             "position": "topright",
             "color": "FFFFFF"
+        },
+        {
+            // for 'time', 'x', 'y', 'width' and 'height', decimal precision
+            // can be specified in 3rd position (here 2)
+            // 'time' can also be given a frame index as the zero timepoint after a '-' sign
+            "text": "Time (s): [time.secs.2-3]",
+            "size": "12",
+            "position": "topright",
+            "color": "FFFFFF"
         }
     ],
 

From a5a27ecd3c9d7cefc193edfc92406932e25f4b37 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 13 Sep 2022 11:35:08 +0200
Subject: [PATCH 11/32] limit behavior js/pdf fix

---
 src/js/models/panel_model.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index eff619bd5..10bb8c55e 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -295,7 +295,8 @@
                 text = "", h, m, s;
 
             if (ref_idx){
-                deltaT = deltaT - this.get('deltaT')[parseInt(ref_idx)-1] || 0;
+                shift = this.get('deltaT')[parseInt(ref_idx)-1];
+                deltaT = shift==null?deltaT:deltaT-shift;
             }
             var isNegative = (deltaT < 0);
             deltaT = Math.abs(deltaT);

From 0b9719d3985a18a9e1bd86555f0cf424bcf2f168 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 13 Sep 2022 11:42:41 +0200
Subject: [PATCH 12/32] Added label tests

---
 test/integration/test_figure_scripts.py | 91 ++++++++++++++++++++++++-
 1 file changed, 90 insertions(+), 1 deletion(-)

diff --git a/test/integration/test_figure_scripts.py b/test/integration/test_figure_scripts.py
index e35317785..c7796fbad 100644
--- a/test/integration/test_figure_scripts.py
+++ b/test/integration/test_figure_scripts.py
@@ -131,8 +131,11 @@ def get_panel_json(image, index, page_x):
                "radiusX": size_x/3, "radiusY": size_y/2, "rotation": 45,
                "strokeWidth": 10, "strokeColor": "#00FF00"}]
 
+    labels = (get_time_test_labels() + get_view_test_labels()
+              + get_obj_test_labels() + get_other_test_labels())
+
     img_json = {
-        "labels": [],
+        "labels": labels,
         "channels": [channel],
         "height": 100 * (index + 1),
         "width": 100 * (index + 1),
@@ -153,3 +156,89 @@ def get_panel_json(image, index, page_x):
         "theT": 0
     }
     return img_json
+
+
+def get_time_test_labels(size=12, position="top", color="000000"):
+    """Create test labels about the time"""
+    time_props = ["time", "t"]
+    time_formats = ["", ".index", ".milliseconds", ".ms", ".seconds", ".secs",
+                    ".s", ".minutes", ".mins", ".m", ".hrs:mins:secs",
+                    ".h:m:s", ".hrs:mins", ".h:m", ".mins:secs", ".m:s"]
+
+    dec_formats = ["", ".0", ".2", ".abc"]  # .abc for resilience test
+    ref_frames = ["", "-0", "-1", "-abc"]  # -0 and abc for resilience test
+
+    label_text = []
+    for prop in time_props:
+        tmp = [f"[{prop}{format}]" for format in time_formats]
+        label_text.append(" or ".join(tmp))
+    for dec_format in dec_formats:
+        tmp = [f"[t{dec_format}{ref_fr}]" for ref_fr in ref_frames]
+        label_text.append(" or ".join(tmp))
+        tmp = [f"[t.s{dec_format}{ref_fr}]" for ref_fr in ref_frames]
+        label_text.append(" or ".join(tmp))
+
+    labels = []
+    for text in label_text:
+        labels.append({"text": text, "size": size,
+                       "position": position, "color": color})
+    return labels
+
+
+def get_view_test_labels(size=12, position="top", color="000000"):
+    """Create test labels for about the view"""
+
+    view_props = ["x", "y", "z", "width", "w", "height", "h"]
+    view_formats = ["", ".pixel", ".px", ".unit"]
+
+    dec_formats = ["", ".0", ".2", ".abc"]  # .abc for resilience test
+
+    label_text = []
+    for prop in view_props:
+        tmp = [f"[{prop}{format}]" for format in view_formats]
+        label_text.append(" or ".join(tmp))
+    tmp = [f"[x{dec_format}]" for dec_format in dec_formats]
+    label_text.append(" or ".join(tmp))
+    tmp = [f"[x.unit{dec_format}]" for dec_format in dec_formats]
+    label_text.append(" or ".join(tmp))
+
+    labels = []
+    for text in label_text:
+        labels.append({"text": text, "size": size,
+                       "position": position, "color": color})
+    return labels
+
+
+def get_obj_test_labels(size=12, position="top", color="000000"):
+    """Create test labels for about the image or dataset"""
+
+    obj_props = ["image", "dataset"]
+    obj_formats = ["", ".id", ".name"]
+
+    label_text = []
+    for prop in obj_props:
+        tmp = [f"[{prop}{format}]" for format in obj_formats]
+        label_text.append(" or ".join(tmp))
+
+    labels = []
+    for text in label_text:
+        labels.append({"text": text, "size": size,
+                       "position": position, "color": color})
+    return labels
+
+
+def get_other_test_labels(size=12, position="top", color="000000"):
+    """Create test labels for other labels and markdown"""
+    other_props = ["rotation", "rot", "channels", "c"]
+    markdowns = ["", "*", "**"]
+
+    label_text = []
+    for prop in other_props:
+        tmp = [f"{md}[{prop}]{md}" for md in markdowns]
+        label_text.append(" or ".join(tmp))
+
+    labels = []
+    for text in label_text:
+        labels.append({"text": text, "size": size,
+                       "position": position, "color": color})
+    return labels

From f5c848f9da4a5e9d88837d1fc4cb03c99e7c1518 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 13 Sep 2022 11:53:37 +0200
Subject: [PATCH 13/32] dec_prec fix when 0 with a view property

---
 src/js/models/panel_model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index 10bb8c55e..35101c2ef 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -370,7 +370,7 @@
             z_size = z_size?z_size:0
 
             dec_prec = parseInt(dec_prec)
-            dec_prec = dec_prec?dec_prec:2
+            dec_prec = dec_prec==null?2:dec_prec; // 2 is the default precision
 
             var text = "";
             if (property === "z") {

From 64731623d297df0f47e49e2ce53b990fc4475cc0 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 13 Sep 2022 12:14:32 +0200
Subject: [PATCH 14/32] removed alias from label tips

---
 omero_figure/templates/figure/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/omero_figure/templates/figure/index.html b/omero_figure/templates/figure/index.html
index 2f2dbe551..6a27e554a 100644
--- a/omero_figure/templates/figure/index.html
+++ b/omero_figure/templates/figure/index.html
@@ -582,12 +582,12 @@ <h4>Dynamic properties</h4>
                         </tr>
                         <tr>
                             <th>Time with decimal precision of 2</th>
-                            <td>Time (s): [t.secs.2]</td>
+                            <td>Time (s): [time.seconds.2]</td>
                             <td>Time (s): 0.93 s</td>
                         </tr>
                         <tr>
                             <th>Time with frame n°3 as the "zero"</th>
-                            <td>Time (ms): [t.ms-3]</td>
+                            <td>Time (ms): [time.milliseconds-3]</td>
                             <td>Time (ms): -58 ms</td>
                         </tr>
                         <tr>

From 40b3ffac7dadada698492d71788f0a546151d6cf Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 13 Sep 2022 12:31:47 +0200
Subject: [PATCH 15/32] Removed bug fix for a separate PR

---
 omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c7791f27f..ba6b7ec6c 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1300,7 +1300,7 @@ def draw_labels(self, panel, page):
                     label_value = " ".join(label_value)
 
                 new_text.append(label_value if label_value else item.group())
-                last_idx = item.end()
+                last_idx += item.end()
 
             new_text.append(l['text'][last_idx:])
             l['text'] = "".join(new_text)

From 14a6167e8831d112d9bcaa4f29d79cda2bb583a6 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 14 Sep 2022 09:26:00 +0200
Subject: [PATCH 16/32] added mixed example to tips

---
 omero_figure/templates/figure/index.html | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/omero_figure/templates/figure/index.html b/omero_figure/templates/figure/index.html
index 6a27e554a..2c01efe04 100644
--- a/omero_figure/templates/figure/index.html
+++ b/omero_figure/templates/figure/index.html
@@ -581,14 +581,19 @@ <h4>Dynamic properties</h4>
                             <td><i>Height</i>: <strong>300</strong></td>
                         </tr>
                         <tr>
-                            <th>Time with decimal precision of 2</th>
-                            <td>Time (s): [time.seconds.2]</td>
-                            <td>Time (s): 0.93 s</td>
+                            <th>Width with decimal precision of 3</th>
+                            <td>Width: [width.unit.3]</td>
+                            <td>Width: 4.450 µm</td>
                         </tr>
                         <tr>
                             <th>Time with frame n°3 as the "zero"</th>
-                            <td>Time (ms): [time.milliseconds-3]</td>
-                            <td>Time (ms): -58 ms</td>
+                            <td>Time: [time.milliseconds-3]</td>
+                            <td>Time: -58 ms</td>
+                        </tr>
+                        <tr>
+                            <th>Time with decimal precision (2) and "zero" (3)</th>
+                            <td>Time: [time.seconds.2-3]</td>
+                            <td>Time: -0.058 s</td>
                         </tr>
                         <tr>
                             <th>Image ID</th>

From 0c44a121c5680a4a30b9c0ca7ddac1fc1da8c512 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 14 Sep 2022 10:58:31 +0200
Subject: [PATCH 17/32] Updated image JSON in test

---
 test/integration/test_figure_scripts.py | 39 ++++++++++++++++++-------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/test/integration/test_figure_scripts.py b/test/integration/test_figure_scripts.py
index c7796fbad..43db72baf 100644
--- a/test/integration/test_figure_scripts.py
+++ b/test/integration/test_figure_scripts.py
@@ -134,26 +134,43 @@ def get_panel_json(image, index, page_x):
     labels = (get_time_test_labels() + get_view_test_labels()
               + get_obj_test_labels() + get_other_test_labels())
 
+    # This works if we have Units support (OMERO 5.1)
+    px = image.getPrimaryPixels().getPhysicalSizeX()
+    py = image.getPrimaryPixels().getPhysicalSizeY()
+    pz = image.getPrimaryPixels().getPhysicalSizeZ()
     img_json = {
-        "labels": labels,
-        "channels": [channel],
-        "height": 100 * (index + 1),
+        "imageId": image.getId().getValue(),
+        "name": "test_image",  # image.getName().getValue()
         "width": 100 * (index + 1),
-        "sizeT": pix.getSizeT().val,
+        "height": 100 * (index + 1),
         "sizeZ": pix.getSizeZ().val,
+        "theZ": 0,
+        "sizeT": pix.getSizeT().val,
+        "theT": 0,
+        # rdef -> used at panel creation then deleted
+        "channels": [channel],
         "orig_width": size_x,
         "orig_height": size_y,
+        "x": page_x,
+        "y": index * 200,
+        'datasetName': "TestDataset",
+        'datasetId': 123,
+        'pixel_size_x': px.getValue(),
+        'pixel_size_y': py.getValue(),
+        'pixel_size_z': None if pz is None else pz.getValue(),
+        'pixel_size_x_symbol': px.getSymbol(),
+        'pixel_size_z_symbol': None if pz is None else pz.getSymbol(),
+        'pixel_size_x_unit': str(px.getUnit()),
+        'pixel_size_z_unit': None if pz is None else str(pz.getUnit()),
+        'deltaT': [],
+        "zoom": 100 + (index * 50),
         "dx": 0,
         "dy": 0,
+        "labels": labels,
         "rotation": 100 * index,
-        "imageId": image.getId().getValue(),
-        "name": "test_image",
-        "zoom": 100 + (index * 50),
+        "rotation_symbol": '\xB0',
+        "max_export_dpi": 1000,
         "shapes": shapes,
-        "y": index * 200,
-        "x": page_x,
-        "theZ": 0,
-        "theT": 0
     }
     return img_json
 

From 3f05340ba5e9bcbbe7a998fa382c5a951459d4ed Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 14 Sep 2022 10:59:07 +0200
Subject: [PATCH 18/32] z.unit label bug fix for 2d images

---
 omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 1 +
 1 file changed, 1 insertion(+)

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 ba6b7ec6c..78dc2c156 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1250,6 +1250,7 @@ def draw_labels(self, panel, page):
                         z_symbol = panel.get('pixel_size_z_symbol')
                         if pixel_size_z is None:
                             pixel_size_z = 0
+                            z_symbol = "\xB5m"
 
                         if ("z_projection" in panel.keys()
                            and panel["z_projection"]):

From 29d0fe1ef6ee942d432801ce3afeea21e9d80db1 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 14 Sep 2022 12:00:43 +0200
Subject: [PATCH 19/32] 0 default on X.unit when px size not set

---
 omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 ++++--
 src/js/models/panel_model.js                               | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

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 78dc2c156..38dfe6d7f 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1285,9 +1285,11 @@ def draw_labels(self, panel, page):
                             label_value = str(int(value))
                         elif format == "unit":
                             if prop in ['x', 'width']:
-                                scale = panel['pixel_size_x']
+                                scale = panel.get('pixel_size_x')
                             elif prop in ['y', 'height']:
-                                scale = panel['pixel_size_y']
+                                scale = panel.get('pixel_size_y')
+                            if scale is None:
+                                scale = 0
                             rounded = "%.*f" % (dec_prec,
                                                 (value * scale))
                             label_value = ("" + rounded +
diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index 35101c2ef..f8bb432f2 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -368,6 +368,8 @@
             y_size = this.get('pixel_size_y');
             z_size = this.get('pixel_size_z');
             z_size = z_size?z_size:0
+            x_size = x_size?x_size:0
+            y_size = y_size?y_size:0
 
             dec_prec = parseInt(dec_prec)
             dec_prec = dec_prec==null?2:dec_prec; // 2 is the default precision

From 55891b7c3c9777c2aaf156337360d661e3d4e4ae Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 14 Sep 2022 12:15:35 +0200
Subject: [PATCH 20/32] test json None px_size handling

---
 test/integration/test_figure_scripts.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/test_figure_scripts.py b/test/integration/test_figure_scripts.py
index 43db72baf..67bd38304 100644
--- a/test/integration/test_figure_scripts.py
+++ b/test/integration/test_figure_scripts.py
@@ -155,12 +155,12 @@ def get_panel_json(image, index, page_x):
         "y": index * 200,
         'datasetName': "TestDataset",
         'datasetId': 123,
-        'pixel_size_x': px.getValue(),
-        'pixel_size_y': py.getValue(),
+        'pixel_size_x': None if px is None else px.getValue(),
+        'pixel_size_y': None if py is None else py.getValue(),
         'pixel_size_z': None if pz is None else pz.getValue(),
-        'pixel_size_x_symbol': px.getSymbol(),
+        'pixel_size_x_symbol': '\xB5m' if px is None else px.getSymbol(),
         'pixel_size_z_symbol': None if pz is None else pz.getSymbol(),
-        'pixel_size_x_unit': str(px.getUnit()),
+        'pixel_size_x_unit': None if px is None else str(px.getUnit()),
         'pixel_size_z_unit': None if pz is None else str(pz.getUnit()),
         'deltaT': [],
         "zoom": 100 + (index * 50),

From cbee1da6dada920ba4d48c2eb8c982b179c0ec19 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 14 Sep 2022 13:48:07 +0200
Subject: [PATCH 21/32] improved label tip description

---
 omero_figure/templates/figure/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/omero_figure/templates/figure/index.html b/omero_figure/templates/figure/index.html
index 2c01efe04..817c530c9 100644
--- a/omero_figure/templates/figure/index.html
+++ b/omero_figure/templates/figure/index.html
@@ -586,14 +586,14 @@ <h4>Dynamic properties</h4>
                             <td>Width: 4.450 µm</td>
                         </tr>
                         <tr>
-                            <th>Time with frame n°3 as the "zero"</th>
+                            <th>Time relative to the 3rd frame</th>
                             <td>Time: [time.milliseconds-3]</td>
                             <td>Time: -58 ms</td>
                         </tr>
                         <tr>
-                            <th>Time with decimal precision (2) and "zero" (3)</th>
+                            <th>Time with decimal precision 2, relative to the 3rd frame</th>
                             <td>Time: [time.seconds.2-3]</td>
-                            <td>Time: -0.058 s</td>
+                            <td>Time: -0.06 s</td>
                         </tr>
                         <tr>
                             <th>Image ID</th>

From c3318df89e88971e1e55510fa58ae8496fe7bf61 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 14 Sep 2022 13:55:48 +0200
Subject: [PATCH 22/32] Prettifying conditional operators

---
 docs/figure_file_format.rst  |  2 +-
 src/js/models/panel_model.js | 14 +++++++-------
 src/js/views/panel_view.js   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/figure_file_format.rst b/docs/figure_file_format.rst
index e2094fe1e..aaf5c1ac2 100644
--- a/docs/figure_file_format.rst
+++ b/docs/figure_file_format.rst
@@ -133,7 +133,7 @@ Optional settings for each panel::
         {
             // for 'time', 'x', 'y', 'width' and 'height', decimal precision
             // can be specified in 3rd position (here 2)
-            // 'time' can also be given a frame index as the zero timepoint after a '-' sign
+            // 'time' can be relative to a frame, specified after a '-' sign (here 3)
             "text": "Time (s): [time.secs.2-3]",
             "size": "12",
             "position": "topright",
diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index f8bb432f2..f29c290b0 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -277,7 +277,7 @@
                     else text = text + " " + c.label
                 }
             });
-            return text?text:" ";
+            return text ? text : " ";
         },
 
         getDeltaT: function() {
@@ -296,7 +296,7 @@
 
             if (ref_idx){
                 shift = this.get('deltaT')[parseInt(ref_idx)-1];
-                deltaT = shift==null?deltaT:deltaT-shift;
+                deltaT = shift==null ? deltaT : deltaT-shift;
             }
             var isNegative = (deltaT < 0);
             deltaT = Math.abs(deltaT);
@@ -363,16 +363,16 @@
             
             x_symbol = this.get('pixel_size_x_symbol');
             z_symbol = this.get('pixel_size_z_symbol');
-            z_symbol = z_symbol?z_symbol:x_symbol // Using x symbol when z not defined
+            z_symbol = z_symbol ? z_symbol : x_symbol // Using x symbol when z not defined
             x_size = this.get('pixel_size_x');
             y_size = this.get('pixel_size_y');
             z_size = this.get('pixel_size_z');
-            z_size = z_size?z_size:0
-            x_size = x_size?x_size:0
-            y_size = y_size?y_size:0
+            z_size = z_size ? z_size : 0
+            x_size = x_size ? x_size : 0
+            y_size = y_size ? y_size : 0
 
             dec_prec = parseInt(dec_prec)
-            dec_prec = dec_prec==null?2:dec_prec; // 2 is the default precision
+            dec_prec = dec_prec==null ? 2 : dec_prec; // 2 is the default precision
 
             var text = "";
             if (property === "z") {
diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js
index daeb36a11..f1b704526 100644
--- a/src/js/views/panel_view.js
+++ b/src/js/views/panel_view.js
@@ -218,7 +218,7 @@
 
                         //If label_value hasn't been created (invalid expr[0])
                         //  or is empty (invalid expr[1]), the expr is kept unmodified
-                        new_text = new_text + (label_value?label_value:match[0]); 
+                        new_text = new_text + (label_value ? label_value : match[0]);
                         last_idx = match.index + match[0].length;
                     }
                     ljson.text = new_text + ljson.text.slice(last_idx);

From 59a4ca76827fc493549365e2ea6f7961d39b7632 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 4 Oct 2022 16:36:40 +0200
Subject: [PATCH 23/32] Label-parameter format change to readable

---
 .../omero/figure_scripts/Figure_To_Pdf.py     | 66 +++++++++----------
 src/js/views/panel_view.js                    | 45 ++++++++-----
 test/integration/test_figure_scripts.py       | 19 +++---
 3 files changed, 72 insertions(+), 58 deletions(-)

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 50644b45a..bd5b89bad 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -29,6 +29,7 @@
 from math import atan2, atan, sin, cos, sqrt, radians, floor, ceil
 from copy import deepcopy
 import re
+from collections import defaultdict
 
 from omero.model import ImageAnnotationLinkI, ImageI, LengthI
 import omero.scripts as scripts
@@ -1164,48 +1165,45 @@ def draw_labels(self, panel, page):
             last_idx = 0
             for item in parse_re.finditer(l['text']):
                 new_text.append(l['text'][last_idx:item.start()])
-                expr = item.group()[1:-1].split(".")
                 label_value = ""
 
-                tmp = expr[-1].split("-")
-                expr[-1] = tmp[0]
-                ref_idx = None
-                if len(tmp) > 1:
+                expr = item.group()[1:-1].split(";")
+                prop_nf = expr[0].strip().split(".")
+                param_dict = defaultdict(lambda: None)
+                for value in expr[1:]:
                     try:
-                        ref_idx = int(tmp[1])
+                        kv = value.split("=")
+                        if len(kv)>1:
+                            param_dict[kv[0].strip()] = int(kv[1].strip())
                     except ValueError:
                         pass
 
-                dec_prec = None
-                if len(expr) > 2:
-                    try:
-                        dec_prec = int(expr[2])
-                    except ValueError:
-                        pass
+                offset = param_dict["offset"]
+                precision = param_dict["precision"]
 
-                if expr[0] in ["time", "t"]:
+                if prop_nf[0] in ["time", "t"]:
                     the_t = panel['theT']
                     timestamps = panel.get('deltaT')
                     # default to index
-                    if len(expr) == 1 or expr[1] == "index":
+                    if len(prop_nf) == 1 or prop_nf[1] == "index":
                         label_value = str(the_t + 1)
                     else:
                         d_t = 0
                         if timestamps and the_t < len(timestamps):
                             d_t = timestamps[the_t]
-                            if ref_idx is not None:
-                                if 1 <= ref_idx <= len(timestamps):
-                                    d_t -= timestamps[ref_idx-1]
+                            if offset is not None:
+                                if 1 <= offset <= len(timestamps):
+                                    d_t -= timestamps[offset-1]
 
                         # Set the default precision value (0) if not given
-                        dec_prec = 0 if dec_prec is None else dec_prec
+                        precision = 0 if precision is None else precision
 
                         label_value = self.get_time_label_text(d_t,
-                                                               expr[1],
-                                                               dec_prec)
+                                                               prop_nf[1],
+                                                               precision)
 
-                elif expr[0] == "image":
-                    format = expr[1] if len(expr) > 1 else "name"
+                elif prop_nf[0] == "image":
+                    format = prop_nf[1] if len(prop_nf) > 1 else "name"
                     if format == "name":
                         label_value = panel['name'].split('/')[-1]
                     elif format == "id":
@@ -1213,8 +1211,8 @@ def draw_labels(self, panel, page):
                     # Escaping "_" for markdown
                     label_value = label_value.replace("_", "\\_")
 
-                elif expr[0] == "dataset":
-                    format = expr[1] if len(expr) > 1 else "name"
+                elif prop_nf[0] == "dataset":
+                    format = prop_nf[1] if len(prop_nf) > 1 else "name"
                     if format == "name":
                         if panel['datasetName']:
                             label_value = panel['datasetName']
@@ -1228,12 +1226,12 @@ def draw_labels(self, panel, page):
                     # Escaping "_" for markdown
                     label_value = label_value.replace("_", "\\_")
 
-                elif expr[0] in ['x', 'y', 'z', 'width', 'height',
-                                 'w', 'h', 'rotation', 'rot']:
-                    format = expr[1] if len(expr) > 1 else "pixel"
+                elif prop_nf[0] in ['x', 'y', 'z', 'width', 'height',
+                                    'w', 'h', 'rotation', 'rot']:
+                    format = prop_nf[1] if len(prop_nf) > 1 else "pixel"
                     if format == "px":
                         format = "pixel"
-                    prop = expr[0]
+                    prop = prop_nf[0]
                     if prop == "w":
                         prop = "width"
                     elif prop == "h":
@@ -1242,7 +1240,7 @@ def draw_labels(self, panel, page):
                         prop = "rotation"
 
                     # Set the default precision value (2) if not given
-                    dec_prec = 2 if dec_prec is None else dec_prec
+                    precision = 2 if precision is None else precision
 
                     if prop == "z":
                         size_z = panel.get('sizeZ')
@@ -1259,9 +1257,9 @@ def draw_labels(self, panel, page):
                                 label_value = (str(z_start + 1) + "-"
                                                + str(z_end + 1))
                             elif format == "unit" and size_z:
-                                z_start = "%.*f" % (dec_prec,
+                                z_start = "%.*f" % (precision,
                                                     (z_start * pixel_size_z))
-                                z_end = "%.*f" % (dec_prec,
+                                z_end = "%.*f" % (precision,
                                                   (z_end * pixel_size_z))
                                 label_value = (z_start + " " + z_symbol + " - "
                                                + z_end + " " + z_symbol)
@@ -1271,7 +1269,7 @@ def draw_labels(self, panel, page):
                                 label_value = str(the_z + 1)
                             elif (format == "unit" and size_z
                                   and the_z < size_z):
-                                z_pos = "%.*f" % (dec_prec,
+                                z_pos = "%.*f" % (precision,
                                                   (the_z * pixel_size_z))
                                 label_value = (z_pos + " " + z_symbol)
 
@@ -1290,12 +1288,12 @@ def draw_labels(self, panel, page):
                                 scale = panel.get('pixel_size_y')
                             if scale is None:
                                 scale = 0
-                            rounded = "%.*f" % (dec_prec,
+                            rounded = "%.*f" % (precision,
                                                 (value * scale))
                             label_value = ("" + rounded +
                                            " " + panel['pixel_size_x_symbol'])
 
-                elif expr[0] in ["channels", "c"]:
+                elif prop_nf[0] in ["channels", "c"]:
                     label_value = []
                     for channel in panel["channels"]:
                         if channel["active"]:
diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js
index f1b704526..c8b167032 100644
--- a/src/js/views/panel_view.js
+++ b/src/js/views/panel_view.js
@@ -196,28 +196,41 @@
                     var last_idx = 0;
                     for (const match of matches) {// Loops on the match to replace in the ljson.text the expression by their values
                         var new_text = new_text + ljson.text.slice(last_idx, match.index);
-                        expr = match[0].slice(1,-1).split(".");
-                        var label_value = ""
 
-                        ref_idx = expr[expr.length-1].split("-");
-                        expr[expr.length-1] = ref_idx[0];
-
-                        if (['time', 't'].includes(expr[0])) {
-                            dec_prec = (expr[2] ? parseInt(expr[2]) : 0); // decimal places matters only when the format isn't default
-                            label_value = self.model.get_time_label_text(expr[1] ? expr[1] : "index", ref_idx[1], dec_prec);
-                        } else if (['image', 'dataset'].includes(expr[0])){
-                            label_value = self.model.get_name_label_text(expr[0], expr[1] ? expr[1] : "name");
+                        // Label parsing in three steps:
+                        //   - split label type.format from other parameters (;)
+                        //   - split label type and format (.)
+                        //   - grab other parameters (key=value)
+                        expr = match[0].slice(1,-1).split(";");
+                        prop_nf = expr[0].trim().split(".")
+                        param_dict = {};
+                        expr.slice(1).forEach(function(value) {
+                            kv = value.split("=");
+                            if (kv.length > 1) {
+                                param_dict[kv[0].trim()] = parseInt(kv[1].trim());
+                            }
+                        });
+
+                        var label_value = "";
+                        if (['time', 't'].includes(prop_nf[0])) {
+                            format = prop_nf[1] ? prop_nf[1] : "index";
+                            precision = param_dict["precision"] ? param_dict["precision"] : 0; // decimal places default to 0
+                            label_value = self.model.get_time_label_text(format, param_dict["offset"], precision);
+                        } else if (['image', 'dataset'].includes(prop_nf[0])){
+                            format = prop_nf[1] ? prop_nf[1] : "name";
+                            label_value = self.model.get_name_label_text(prop_nf[0], format);
                             //Escape the underscore for markdown
                             label_value = label_value.replaceAll("_", "\\_");
-                        } else if (['x', 'y', 'z', 'width', 'height', 'w', 'h', 'rotation', 'rot'].includes(expr[0])){
-                            dec_prec = (expr[2] ? parseInt(expr[2]) : 2); // decimal places matters only when the format isn't default
-                            label_value = self.model.get_view_label_text(expr[0], expr[1] ? expr[1] : "pixel", dec_prec);
-                        } else if (['channels', 'c'].includes(expr[0])) {
+                        } else if (['x', 'y', 'z', 'width', 'height', 'w', 'h', 'rotation', 'rot'].includes(prop_nf[0])){
+                            format = prop_nf[1] ? prop_nf[1] : "pixel";
+                            precision = param_dict["precision"] ? param_dict["precision"] : 2; // decimal places default to 2
+                            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();
                         }
 
-                        //If label_value hasn't been created (invalid expr[0])
-                        //  or is empty (invalid expr[1]), the expr is kept unmodified
+                        //If label_value hasn't been created (invalid prop_nf[0])
+                        //  or is empty (invalid prop_nf[1]), the expression is kept intact
                         new_text = new_text + (label_value ? label_value : match[0]);
                         last_idx = match.index + match[0].length;
                     }
diff --git a/test/integration/test_figure_scripts.py b/test/integration/test_figure_scripts.py
index 67bd38304..55d0ef685 100644
--- a/test/integration/test_figure_scripts.py
+++ b/test/integration/test_figure_scripts.py
@@ -182,17 +182,19 @@ def get_time_test_labels(size=12, position="top", color="000000"):
                     ".s", ".minutes", ".mins", ".m", ".hrs:mins:secs",
                     ".h:m:s", ".hrs:mins", ".h:m", ".mins:secs", ".m:s"]
 
-    dec_formats = ["", ".0", ".2", ".abc"]  # .abc for resilience test
-    ref_frames = ["", "-0", "-1", "-abc"]  # -0 and abc for resilience test
+    precisions = ["", ";precision=0", ";precision=2",
+                  " ; precision  = abc "]  # abc and spaces for resilience test
+    offsets = ["", ";offset=0", ";offset=1",
+               " ; offset = abc "]  # 0, abc and spaces for resilience test
 
     label_text = []
     for prop in time_props:
         tmp = [f"[{prop}{format}]" for format in time_formats]
         label_text.append(" or ".join(tmp))
-    for dec_format in dec_formats:
-        tmp = [f"[t{dec_format}{ref_fr}]" for ref_fr in ref_frames]
+    for precision in precisions:
+        tmp = [f"[t{precision}{offset}]" for offset in offsets]
         label_text.append(" or ".join(tmp))
-        tmp = [f"[t.s{dec_format}{ref_fr}]" for ref_fr in ref_frames]
+        tmp = [f"[t.s{precision}{offset}]" for offset in offsets]
         label_text.append(" or ".join(tmp))
 
     labels = []
@@ -208,15 +210,16 @@ def get_view_test_labels(size=12, position="top", color="000000"):
     view_props = ["x", "y", "z", "width", "w", "height", "h"]
     view_formats = ["", ".pixel", ".px", ".unit"]
 
-    dec_formats = ["", ".0", ".2", ".abc"]  # .abc for resilience test
+    precisions = ["", ";precision=0", ";precision=2",
+                  "; precision = abc "]  # abc and spaces for resilience test
 
     label_text = []
     for prop in view_props:
         tmp = [f"[{prop}{format}]" for format in view_formats]
         label_text.append(" or ".join(tmp))
-    tmp = [f"[x{dec_format}]" for dec_format in dec_formats]
+    tmp = [f"[x{precision}]" for precision in precisions]
     label_text.append(" or ".join(tmp))
-    tmp = [f"[x.unit{dec_format}]" for dec_format in dec_formats]
+    tmp = [f"[x.unit{precision}]" for precision in precisions]
     label_text.append(" or ".join(tmp))
 
     labels = []

From d8c2580c7e7a81f27b46aac24fc7706571de6983 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Tue, 4 Oct 2022 16:49:18 +0200
Subject: [PATCH 24/32] style fix

---
 omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bd5b89bad..0ad423c5e 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1173,7 +1173,7 @@ def draw_labels(self, panel, page):
                 for value in expr[1:]:
                     try:
                         kv = value.split("=")
-                        if len(kv)>1:
+                        if len(kv) > 1:
                             param_dict[kv[0].strip()] = int(kv[1].strip())
                     except ValueError:
                         pass

From 377c6201195b2342f30935b2c641318eee449ddf Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 5 Oct 2022 14:58:14 +0200
Subject: [PATCH 25/32] X/Y with precision 0 bug fix

---
 src/js/views/panel_view.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js
index c8b167032..d5c8a08ef 100644
--- a/src/js/views/panel_view.js
+++ b/src/js/views/panel_view.js
@@ -214,7 +214,7 @@
                         var label_value = "";
                         if (['time', 't'].includes(prop_nf[0])) {
                             format = prop_nf[1] ? prop_nf[1] : "index";
-                            precision = param_dict["precision"] ? param_dict["precision"] : 0; // decimal places default to 0
+                            precision = param_dict["precision"] !== null ? param_dict["precision"] : 0; // decimal places default to 0
                             label_value = self.model.get_time_label_text(format, param_dict["offset"], precision);
                         } else if (['image', 'dataset'].includes(prop_nf[0])){
                             format = prop_nf[1] ? prop_nf[1] : "name";
@@ -223,7 +223,7 @@
                             label_value = label_value.replaceAll("_", "\\_");
                         } else if (['x', 'y', 'z', 'width', 'height', 'w', 'h', 'rotation', 'rot'].includes(prop_nf[0])){
                             format = prop_nf[1] ? prop_nf[1] : "pixel";
-                            precision = param_dict["precision"] ? param_dict["precision"] : 2; // decimal places default to 2
+                            precision = param_dict["precision"] !== null ? param_dict["precision"] : 2; // decimal places default to 2
                             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();

From 98e4439796cd1695ca13a94927dc0809287a8900 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 5 Oct 2022 17:20:50 +0200
Subject: [PATCH 26/32] Changed tip window on label parameter

---
 omero_figure/templates/figure/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/omero_figure/templates/figure/index.html b/omero_figure/templates/figure/index.html
index 817c530c9..5666bdc2a 100644
--- a/omero_figure/templates/figure/index.html
+++ b/omero_figure/templates/figure/index.html
@@ -582,17 +582,17 @@ <h4>Dynamic properties</h4>
                         </tr>
                         <tr>
                             <th>Width with decimal precision of 3</th>
-                            <td>Width: [width.unit.3]</td>
+                            <td>Width: [width.unit; precision=3]</td>
                             <td>Width: 4.450 µm</td>
                         </tr>
                         <tr>
                             <th>Time relative to the 3rd frame</th>
-                            <td>Time: [time.milliseconds-3]</td>
+                            <td>Time: [time.milliseconds; offset=3]</td>
                             <td>Time: -58 ms</td>
                         </tr>
                         <tr>
-                            <th>Time with decimal precision 2, relative to the 3rd frame</th>
-                            <td>Time: [time.seconds.2-3]</td>
+                            <th>Time with decimal precision 2, <br/>relative to the 3rd frame</th>
+                            <td>Time: [time.seconds; precision=2; offset=3]</td>
                             <td>Time: -0.06 s</td>
                         </tr>
                         <tr>

From 711920bafa1d3a529295fcc594c2b015267ca876 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 5 Oct 2022 17:30:08 +0200
Subject: [PATCH 27/32] Bug fix of default view label precision

---
 src/js/views/panel_view.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js
index d5c8a08ef..44110d874 100644
--- a/src/js/views/panel_view.js
+++ b/src/js/views/panel_view.js
@@ -214,7 +214,7 @@
                         var label_value = "";
                         if (['time', 't'].includes(prop_nf[0])) {
                             format = prop_nf[1] ? prop_nf[1] : "index";
-                            precision = param_dict["precision"] !== null ? param_dict["precision"] : 0; // decimal places default to 0
+                            precision = param_dict["precision"] !== undefined ? param_dict["precision"] : 0; // decimal places default to 0
                             label_value = self.model.get_time_label_text(format, param_dict["offset"], precision);
                         } else if (['image', 'dataset'].includes(prop_nf[0])){
                             format = prop_nf[1] ? prop_nf[1] : "name";
@@ -223,7 +223,7 @@
                             label_value = label_value.replaceAll("_", "\\_");
                         } else if (['x', 'y', 'z', 'width', 'height', 'w', 'h', 'rotation', 'rot'].includes(prop_nf[0])){
                             format = prop_nf[1] ? prop_nf[1] : "pixel";
-                            precision = param_dict["precision"] !== null ? param_dict["precision"] : 2; // decimal places default to 2
+                            precision = param_dict["precision"] !== undefined ? param_dict["precision"] : 2; // decimal places default to 2
                             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();

From 0c5cf6ddeb7f08a66ce88eac328a0be812371bd6 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Wed, 5 Oct 2022 17:35:04 +0200
Subject: [PATCH 28/32] Updated doc

---
 docs/figure_file_format.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/figure_file_format.rst b/docs/figure_file_format.rst
index aaf5c1ac2..e6039c65b 100644
--- a/docs/figure_file_format.rst
+++ b/docs/figure_file_format.rst
@@ -132,9 +132,9 @@ Optional settings for each panel::
         },
         {
             // for 'time', 'x', 'y', 'width' and 'height', decimal precision
-            // can be specified in 3rd position (here 2)
-            // 'time' can be relative to a frame, specified after a '-' sign (here 3)
-            "text": "Time (s): [time.secs.2-3]",
+            // parameter can be passed (here 2)
+            // 'time' can also be passed an offset parameter (relative to a frame, here n°3)
+            "text": "Time (s): [time.secs; precision=2; offset=3]",
             "size": "12",
             "position": "topright",
             "color": "FFFFFF"

From b06c9d208e517870fa9859cdbf978332cc73eb2a Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Thu, 6 Oct 2022 14:52:15 +0200
Subject: [PATCH 29/32] More pythony key in dict handling

---
 omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 0ad423c5e..8fdb9d41f 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -29,7 +29,6 @@
 from math import atan2, atan, sin, cos, sqrt, radians, floor, ceil
 from copy import deepcopy
 import re
-from collections import defaultdict
 
 from omero.model import ImageAnnotationLinkI, ImageI, LengthI
 import omero.scripts as scripts
@@ -1169,7 +1168,7 @@ def draw_labels(self, panel, page):
 
                 expr = item.group()[1:-1].split(";")
                 prop_nf = expr[0].strip().split(".")
-                param_dict = defaultdict(lambda: None)
+                param_dict = {}
                 for value in expr[1:]:
                     try:
                         kv = value.split("=")
@@ -1178,8 +1177,8 @@ def draw_labels(self, panel, page):
                     except ValueError:
                         pass
 
-                offset = param_dict["offset"]
-                precision = param_dict["precision"]
+                offset = param_dict.get("offset", None)
+                precision = param_dict.get("precision", None)
 
                 if prop_nf[0] in ["time", "t"]:
                     the_t = panel['theT']

From 765df8cec34741302446fb252e9874507da533e2 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Thu, 13 Oct 2022 10:46:14 +0200
Subject: [PATCH 30/32] Initializing variables explicitly

---
 src/js/models/panel_model.js | 22 +++++++++++-----------
 src/js/views/panel_view.js   | 11 ++++++-----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index f29c290b0..e4fb540bf 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -295,7 +295,7 @@
                 text = "", h, m, s;
 
             if (ref_idx){
-                shift = this.get('deltaT')[parseInt(ref_idx)-1];
+                var shift = this.get('deltaT')[parseInt(ref_idx)-1];
                 deltaT = shift==null ? deltaT : deltaT-shift;
             }
             var isNegative = (deltaT < 0);
@@ -361,12 +361,12 @@
             else if (property === "rot") property = "rotation";
 
             
-            x_symbol = this.get('pixel_size_x_symbol');
-            z_symbol = this.get('pixel_size_z_symbol');
+            var x_symbol = this.get('pixel_size_x_symbol'),
+                z_symbol = this.get('pixel_size_z_symbol');
             z_symbol = z_symbol ? z_symbol : x_symbol // Using x symbol when z not defined
-            x_size = this.get('pixel_size_x');
-            y_size = this.get('pixel_size_y');
-            z_size = this.get('pixel_size_z');
+            var x_size = this.get('pixel_size_x'),
+                y_size = this.get('pixel_size_y'),
+                z_size = this.get('pixel_size_z');
             z_size = z_size ? z_size : 0
             x_size = x_size ? x_size : 0
             y_size = y_size ? y_size : 0
@@ -377,8 +377,8 @@
             var text = "";
             if (property === "z") {
                 if (this.get('z_projection')) {
-                    start = this.get('z_start');
-                    end = this.get('z_end');
+                    var start = this.get('z_start'),
+                        end = this.get('z_end');
                     if (format === "pixel") {
                         text = "" + (start+1) + " - " + (end+1);
                     } else if (format === "unit"){
@@ -398,14 +398,14 @@
                 }
                 return text
             }
-            viewport = this.getViewportAsRect();
-            value = viewport[property];
+
+            var value = this.getViewportAsRect()[property];
             if (property === "rotation") {
                 return ""+parseInt(value)+"°";
             } else if (format === "pixel") {
                 return ""+parseInt(value);
             } else if (format === "unit") {
-                scale = ['x', 'width'].includes(property) ? x_size : y_size
+                var scale = ['x', 'width'].includes(property) ? x_size : y_size
                 text = ""+ (value * scale).toFixed(dec_prec) +" "+ x_symbol
             }
             return text
diff --git a/src/js/views/panel_view.js b/src/js/views/panel_view.js
index 44110d874..55be217e4 100644
--- a/src/js/views/panel_view.js
+++ b/src/js/views/panel_view.js
@@ -201,17 +201,18 @@
                         //   - split label type.format from other parameters (;)
                         //   - split label type and format (.)
                         //   - grab other parameters (key=value)
-                        expr = match[0].slice(1,-1).split(";");
-                        prop_nf = expr[0].trim().split(".")
-                        param_dict = {};
+                        var expr = match[0].slice(1,-1).split(";");
+                        var prop_nf = expr[0].trim().split(".");
+                        var param_dict = {};
                         expr.slice(1).forEach(function(value) {
-                            kv = value.split("=");
+                            var kv = value.split("=");
                             if (kv.length > 1) {
                                 param_dict[kv[0].trim()] = parseInt(kv[1].trim());
                             }
                         });
 
-                        var label_value = "";
+                        var label_value = "",
+                            format, precision;
                         if (['time', 't'].includes(prop_nf[0])) {
                             format = prop_nf[1] ? prop_nf[1] : "index";
                             precision = param_dict["precision"] !== undefined ? param_dict["precision"] : 0; // decimal places default to 0

From fd5c4277eed33d6d4b0648214b66d5b1314c2a44 Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Thu, 13 Oct 2022 10:58:43 +0200
Subject: [PATCH 31/32] Bug fix, dataset ID

---
 omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8fdb9d41f..d7007d09a 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1219,7 +1219,7 @@ def draw_labels(self, panel, page):
                             label_value = "No/Many Datasets"
                     elif format == "id":
                         if panel['datasetId']:
-                            label_value = panel['datasetName']
+                            label_value = str(panel['datasetId'])
                         else:
                             label_value = "null"
                     # Escaping "_" for markdown

From eac902e6e09ea2408bf849c7964b08aec84bb06b Mon Sep 17 00:00:00 2001
From: Tom-TBT <tom.boissonnet@hhu.de>
Date: Thu, 3 Nov 2022 11:02:59 +0100
Subject: [PATCH 32/32] Style and stability adjustments

---
 .../scripts/omero/figure_scripts/Figure_To_Pdf.py  |  2 +-
 omero_figure/templates/figure/index.html           |  2 +-
 src/js/models/panel_model.js                       | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

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 d7007d09a..ff79e737a 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1087,7 +1087,7 @@ def get_crop_region(self, panel):
 
         return {'x': cropx, 'y': cropy, 'width': tile_w, 'height': tile_h}
 
-    def get_time_label_text(self, delta_t, format, dec_prec):
+    def get_time_label_text(self, delta_t, format, dec_prec=0):
         """ Gets the text for 'live' time-stamp labels """
         # format of "secs" by default
         is_negative = delta_t < 0
diff --git a/omero_figure/templates/figure/index.html b/omero_figure/templates/figure/index.html
index 5666bdc2a..6eae81088 100644
--- a/omero_figure/templates/figure/index.html
+++ b/omero_figure/templates/figure/index.html
@@ -583,7 +583,7 @@ <h4>Dynamic properties</h4>
                         <tr>
                             <th>Width with decimal precision of 3</th>
                             <td>Width: [width.unit; precision=3]</td>
-                            <td>Width: 4.450 µm</td>
+                            <td>Width: 4.450 &#181;m</td>
                         </tr>
                         <tr>
                             <th>Time relative to the 3rd frame</th>
diff --git a/src/js/models/panel_model.js b/src/js/models/panel_model.js
index e4fb540bf..7e3c02a67 100644
--- a/src/js/models/panel_model.js
+++ b/src/js/models/panel_model.js
@@ -294,7 +294,7 @@
                 deltaT = this.get('deltaT')[theT] || 0,
                 text = "", h, m, s;
 
-            if (ref_idx){
+            if (ref_idx) {
                 var shift = this.get('deltaT')[parseInt(ref_idx)-1];
                 deltaT = shift==null ? deltaT : deltaT-shift;
             }
@@ -343,7 +343,7 @@
                     var pathnames = this.get('name').split('/');
                     text = pathnames[pathnames.length-1];
                 }
-            } else if (property === "dataset"){
+            } else if (property === "dataset") {
                 if (format === "id") {
                     text = ""+this.get('datasetId');
                 } else if (format === "name") {
@@ -381,7 +381,7 @@
                         end = this.get('z_end');
                     if (format === "pixel") {
                         text = "" + (start+1) + " - " + (end+1);
-                    } else if (format === "unit"){
+                    } else if (format === "unit") {
                         start = (start * z_size).toFixed(dec_prec)
                         end = (end * z_size).toFixed(dec_prec)
                         text = ""+ start +" "+ z_symbol
@@ -392,7 +392,7 @@
                     var theZ = this.get('theZ');
                     if (format === "pixel") {
                         text = "" + (theZ + 1);
-                    } else if (format === "unit"){
+                    } else if (format === "unit") {
                         text = ""+ (theZ * z_size).toFixed(dec_prec) +" "+ z_symbol
                     }
                 }
@@ -460,9 +460,9 @@
             this.save('channels', chs);
         },
 
-        toggle_channel: function(cIndex, active){
+        toggle_channel: function(cIndex, active ) {
 
-            if (typeof active == "undefined"){
+            if (typeof active == "undefined") {
                 active = !this.get('channels')[cIndex].active;
             }
             this.save_channel(cIndex, 'active', active);
@@ -517,7 +517,7 @@
         // a resize of the rectangle x1, y1, w1, h1 => x2, y2, w2, h2
         // will resize the Panels within it in proportion.
         // This might be during a drag, or drag-stop (save=true)
-        multiselectdrag: function(x1, y1, w1, h1, x2, y2, w2, h2, save){
+        multiselectdrag: function(x1, y1, w1, h1, x2, y2, w2, h2, save) {
 
             var shift_x = function(startX) {
                 return ((startX - x1)/w1) * w2 + x2;