Permalink
Browse files

removing annotation counter from listImagesInDataset, see #8557 ref #…

…5514
  • Loading branch information...
1 parent d627baf commit fd505bf65cee584948f7b1934909a995973ef41f @aleksandra-tarkowska committed Apr 18, 2012
Showing with 3 additions and 15 deletions.
  1. +3 −15 components/tools/OmeroWeb/omeroweb/webclient/controller/container.py
@@ -315,24 +315,12 @@ def listImagesInDataset(self, did, eid=None, page=None):
self.experimenter = self.conn.getObject("Experimenter", eid)
im_list = list(self.conn.listImagesInDataset(oid=did, eid=eid, page=page))
- # Not displaying annotation icons (same as Insight). #5514.
- #im_list_with_counters = list()
-
- #im_ids = [im.id for im in im_list]
- #if len(im_ids) > 0:
- # im_annotation_counter = self.conn.getCollectionCount("Image", "annotationLinks", im_ids)
-
- # for im in im_list:
- # im.annotation_counter = im_annotation_counter.get(im.id)
- # im_list_with_counters.append(im)
-
- im_list_with_counters = im_list
- im_list_with_counters.sort(key=lambda x: x.getName().lower())
- self.containers = {'images': im_list_with_counters}
+ im_list.sort(key=lambda x: x.getName().lower())
+ self.containers = {'images': im_list}
self.c_size = self.conn.getCollectionCount("Dataset", "imageLinks", [long(did)])[long(did)]
if page is not None:
- self.paging = self.doPaging(page, len(im_list_with_counters), self.c_size)
+ self.paging = self.doPaging(page, len(im_list), self.c_size)
def listContainerHierarchy(self, eid=None):
if eid is not None:

0 comments on commit fd505bf

Please sign in to comment.