Don't load RE for preview panel rdef

Author: will-moore

omeroweb/webclient/views.py

@@ -44,6 +44,7 @@
 
 from omeroweb.version import omeroweb_buildyear as build_year
 from omeroweb.version import omeroweb_version as omero_version
+from omeroweb.webgateway.util import get_rendering_def
 
 import omero
 import omero.scripts
@@ -1773,7 +1774,8 @@ def load_metadata_preview(request, c_type, c_id, conn=None, share_id=None, **kwa
 
     allRdefs = manager.image.getAllRenderingDefs()
     rdefs = {}
-    rdefId = manager.image.getRenderingDefId()
+    rdef = get_rendering_def(manager.image)
+    rdefId = rdef["id"] if rdef is not None else None
     # remove duplicates per user
     for r in allRdefs:
         ownerId = r["owner"]["id"]

omeroweb/webgateway/marshal.py

@@ -22,7 +22,6 @@
 import time
 import re
 import logging
-import traceback
 from future.utils import isbytes, bytes_to_native_str
 
 from omero.model.enums import PixelsTypeint8, PixelsTypeuint8, PixelsTypeint16
@@ -34,6 +33,8 @@
 from omero.rtypes import unwrap
 from omero_marshal import get_encoder
 
+from .util import get_rendering_def, load_re
+
 logger = logging.getLogger(__name__)
 
 # OMERO.insight point list regular expression
@@ -207,39 +208,6 @@ def channelMarshal(channel):
     return chan
 
 
-def load_re(image, rsp_dict=None):
-    rsp_dict = {} if rsp_dict is None else rsp_dict
-    reOK = False
-    try:
-        reOK = image._prepareRenderingEngine()
-        if not reOK:
-            rsp_dict["Error"] = "Failed to prepare Rendering Engine for imageMarshal"
-            logger.debug("Failed to prepare Rendering Engine for imageMarshal")
-    except omero.ConcurrencyException as ce:
-        backOff = ce.backOff
-        rsp_dict["ConcurrencyException"] = {"backOff": backOff}
-    except Exception as ex:  # Handle everything else.
-        rsp_dict["Exception"] = ex.message
-        logger.error(traceback.format_exc())
-    return reOK
-
-
-def get_rendering_def(image, rsp_dict):
-    # Try to get user's rendering def
-    exp_id = image._conn.getUserId()
-    rdefs = image.getAllRenderingDefs(exp_id)
-    if len(rdefs) == 0:
-        # try to create our own rendering settings
-        if load_re(image, rsp_dict):
-            rdefs = image.getAllRenderingDefs(exp_id)
-    # otherwise use owners
-    if len(rdefs) == 0:
-        owner_id = image.getDetails().getOwner().id
-        if owner_id != exp_id:
-            rdefs = image.getAllRenderingDefs(owner_id)
-
-    return rdefs[0] if len(rdefs) > 0 else None
-
 
 def imageMarshal(image, key=None, request=None):
     """

omeroweb/webgateway/util.py

@@ -23,6 +23,9 @@
 import shutil
 import logging
 
+import omero
+import traceback
+
 try:
     import long
 except ImportError:
@@ -238,3 +241,38 @@ def points_string_to_XY_list(string):
         x, y = xy.split(",")
         xyList.append((float(x.strip()), float(y.strip())))
     return xyList
+
+
+def load_re(image, rsp_dict=None):
+    rsp_dict = {} if rsp_dict is None else rsp_dict
+    reOK = False
+    try:
+        reOK = image._prepareRenderingEngine()
+        if not reOK:
+            # rsp_dict["Error"] = "Failed to prepare Rendering Engine for imageMarshal"
+            logger.debug("Failed to prepare Rendering Engine for imageMarshal")
+    except omero.ConcurrencyException as ce:
+        backOff = ce.backOff
+        # rsp_dict["ConcurrencyException"] = {"backOff": backOff}
+    except Exception as ex:  # Handle everything else.
+        # rsp_dict["Exception"] = ex.message
+        logger.error(traceback.format_exc())
+    return reOK
+
+
+def get_rendering_def(image, rsp_dict=None):
+    # rsp_dict allows errors to be added
+    # Try to get user's rendering def
+    exp_id = image._conn.getUserId()
+    rdefs = image.getAllRenderingDefs(exp_id)
+    if len(rdefs) == 0:
+        # try to create our own rendering settings
+        if load_re(image, rsp_dict):
+            rdefs = image.getAllRenderingDefs(exp_id)
+    # otherwise use owners
+    if len(rdefs) == 0:
+        owner_id = image.getDetails().getOwner().id
+        if owner_id != exp_id:
+            rdefs = image.getAllRenderingDefs(owner_id)
+
+    return rdefs[0] if len(rdefs) > 0 else None