Merge pull request #67 from cneves/ticket/12037_makemovie_channeldefs

Allow passing extra channel rendering options to Make_Movie script (see ...

Author: joshmoore

omero/export_scripts/Make_Movie.py

@@ -67,12 +67,13 @@
 import numpy
 import omero.util.pixelstypetopython as pixelstypetopython
 from struct import unpack
-from omero.rtypes import wrap, rstring, rlong, rint, robject
+from omero.rtypes import wrap, rstring, rint, rlong, robject
 from omero.gateway import BlitzGateway
 from omero.constants.namespaces import NSCREATED
 from omero.constants.metadata import NSMOVIE
 
 from cStringIO import StringIO
+from types import StringTypes
 
 try:
     from PIL import Image, ImageDraw  # see ticket:2597
@@ -287,6 +288,8 @@ def validChannels(set, sizeC):
     if(len(set) == 0):
         return False
     for val in set:
+        if isinstance(val, StringTypes):
+            val = int(val.split('|')[0].split('$')[0])
         if(val < 0 or val > sizeC):
             return False
     return True
@@ -499,7 +502,21 @@ def writeMovie(commandArgs, conn):
         commandArgs["Scalebar"] = 0
 
     cRange = range(0, sizeC)
-    if "Channels" in commandArgs and \
+    cWindows = None
+    cColours = None
+    if "ChannelsExtended" in commandArgs and \
+            validChannels(commandArgs["ChannelsExtended"], sizeC):
+        cRange = []
+        cWindows = []
+        cColours = []
+        for c in commandArgs["ChannelsExtended"]:
+            m = re.match('^(?P<i>\d+)(\|(?P<ws>\d+)' +
+                         '\:(?P<we>\d+))?(\$(?P<c>.+))?$', c)
+            if m is not None:
+                cRange.append(int(m.group('i'))-1)
+                cWindows.append([float(m.group('ws')), float(m.group('we'))])
+                cColours.append(m.group('c'))
+    elif "Channels" in commandArgs and \
             validChannels(commandArgs["Channels"], sizeC):
         cRange = commandArgs["Channels"]
 
@@ -513,7 +530,9 @@ def writeMovie(commandArgs, conn):
             commandArgs["Show_Time"] = False
 
     frameNo = 1
-    omeroImage.setActiveChannels(map(lambda x: x+1, cRange))
+    omeroImage.setActiveChannels(map(lambda x: x+1, cRange),
+                                 cWindows,
+                                 cColours)
     renderingEngine = omeroImage._re
 
     overlayColour = (255, 255, 255)
@@ -689,7 +708,13 @@ def __init__(self, name, optional = False, out = False, description =
         scripts.List(
             "Channels",
             description="The selected channels",
-            grouping="5").ofType(rint(0)),
+            grouping="5.1").ofType(rint(0)),
+
+        scripts.List(
+            "ChannelsExtended",
+            description="The selected channels, with optional range"
+            " and colour. Takes precendence over Channels.",
+            grouping="5.2").ofType(rstring('')),
 
         scripts.Bool(
             "Show_Time",