Skip to content

Split view merged 10109 (develop) #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshmoore merged 3 commits into from
Feb 15, 2013
Merged

Split view merged 10109 (develop) #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2523d97
Turn all channels OFF, then merged ON. See #10109
Jan 10, 2013
3eacf59
Split_View_Fig casts mergedColours map to int. See #10111
Jan 10, 2013
522edb5
ROI_Split_Fig casts mergedColours map to int. See #10111
Jan 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions omero/figure_scripts/ROI_Split_Figure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,15 @@ def getTags(name, tagsList, pdList):
cColourMap = commandArgs["Merged_Colours"]
for c in cColourMap:
rgb = cColourMap[c]
try:
rgb = int(rgb)
cIndex = int(c)
except ValueError:
print "Merged_Colours map should be index:rgbInt. Not %s:%s" % (c, rgb)
continue
rgba = imgUtil.RGBIntToRGBA(rgb)
mergedColours[int(c)] = rgba
mergedIndexes.append(int(c))
mergedColours[cIndex] = rgba
mergedIndexes.append(cIndex)
mergedIndexes.sort()
# make sure we have some merged channels
if len(mergedIndexes) == 0:
Expand Down
15 changes: 12 additions & 3 deletions omero/figure_scripts/Split_View_Figure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,10 @@ def getSplitView(conn, pixelIds, zStart, zEnd, splitIndexes, channelNames, colou



# turn on channels in mergedIndexes.
# turn on channels in mergedIndexes
for i in range(sizeC):
re.setActive(i, False) # Turn all off first
log("Turning on mergedIndexes: %s ..." % mergedIndexes)
for i in mergedIndexes:
if i >= sizeC:
channelMismatch = True
Expand Down Expand Up @@ -550,9 +553,15 @@ def getTags(name, tagsList, pdList):
cColourMap = scriptParams["Merged_Colours"]
for c in cColourMap:
rgb = cColourMap[c]
try:
rgb = int(rgb)
cIndex = int(c)
except ValueError:
print "Merged_Colours map should be index:rgbInt. Not %s:%s" % (c, rgb)
continue
rgba = imgUtil.RGBIntToRGBA(rgb)
mergedColours[int(c)] = rgba
mergedIndexes.append(int(c))
mergedColours[cIndex] = rgba
mergedIndexes.append(cIndex)
mergedIndexes.sort()
else:
mergedIndexes = range(sizeC)
Expand Down