Anonymous avatar Anonymous committed 12a6700

abs. path for recent files
progressBar when loading all the annotation files

Comments (0)

Files changed (1)

     def updateGeneID2annotationfile(self):
         ## geneID is key, item is list of indexes in self.RecentAnnotations that have that geneID
+        self.progressBarInit()
         self.geneID2annotationfile = {}
         cn = 0
+        allcn = len(self.RecentAnnotations)
         for f in self.RecentAnnotations:
             if f not in self.genesInAnnotationFile.keys():
                 loadedAnnotation = cPickle.load(open(f, 'r'))
                     self.geneID2annotationfile[geneID] = tmpl
             cn += 1
+            self.progressBarSet(int(round(100.0*cn/allcn)))
+        self.progressBarFinished()
     ## this is called only when new data token is received
     def findMostAppropriateGeneIDandAnnotation(self):
         ## check if there are new annotation files present
         ## remove from self.geneID2annotationfile those not present in the RecentAnnotations list
-        self.updateGeneID2annotationfile() 
+        self.updateGeneID2annotationfile()
         ## for each attribute look how many genesID are there, that are also present in geneID2annotationfile
         ## if current self.geneIDattr has count 0
             for (li, liGOID) in self.goLVitem2GOID.items():
                 if liGOID == GOID:
                     self.goLV.setSelected(li, b)
+                    if b: self.goLV.ensureItemVisible(li)
     def viewSelectionChanged(self):
         geneToGOterm = {}
             startfile = lst[0]
         filename = QFileDialog.getOpenFileName(startfile, dialogText, None, dialogTitle)
         fn = str(filename)
+        fn = os.path.abspath(fn)
         if fn in lst: # if already in list, remove it
         lst.insert(0, fn)
         ## load if forced, or if index has changed
         ## if forced = 0 and index has not changed (still is 0) then don't reload the annotation data
         if forced == 1 or self.BGOaspectIndx <> 0 or self.GO == None:
-            print "1:", str(self.RecentGOaspects) + "," + str(self.BGOaspectIndx)
+            if DEBUG: print "1:", str(self.RecentGOaspects) + "," + str(self.BGOaspectIndx)
             self.GO, self.BGOaspectIndx = self.loadRemember(self.RecentGOaspects, self.GOaspectCombo, self.BGOaspectIndx)
-            print "2:", str(self.RecentGOaspects) + "," + str(self.BGOaspectIndx)
+            if DEBUG: print "2:", str(self.RecentGOaspects) + "," + str(self.BGOaspectIndx)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.