Changeset 1064:cccc2cbcdf33 in orange-bioinformatics

Timestamp:

02/10/10 19:38:23 (3 years ago)

Author:

markotoplak

Branch:

default

Convert:

64a58deae5262f3588035188014bda98b62fb6e2

Message:

obiGO: added the usage of GMDicty along all gene matchers if the user is looking at dicty

Files:

• obiGO.py (modified) (1 diff)
• widgets/OWGOEnrichmentAnalysis.py (modified) (1 diff)

obiGO.py

@@ -491 +491 @@
         if not self.genematcher and self.taxid:
             import obiGene
-            self.genematcher = obiGene.matcher([obiGene.GMGO(self.taxid)] + ([obiGene.GMDicty()] if self.taxid == "352472"  else []))
+            self.genematcher = obiGene.matcher([[obiGene.GMGO(self.taxid)] + ([obiGene.GMDicty()] if self.taxid == "352472"  else [])])
         if self.genematcher:
             self.genematcher.set_targets(self.geneNames)

widgets/OWGOEnrichmentAnalysis.py

@@ -472 +472 @@
                 if use:
                     try:
-                        matchers.append(matcher(taxid))
+                        if taxid == "352472":
+                            matchers.append([matcher(taxid), obiGene.GMDicty()])
+                        else:
+                            matchers.append(matcher(taxid))
                     except Exception, ex:
                         print ex