Changeset 1879:3e9c962d89f8 in orange-bioinformatics for orangecontrib/bio/widgets/OWHeatMap.py


Ignore:
Timestamp:
10/10/13 13:10:39 (6 months ago)
Author:
Marko Toplak <marko.toplak@…>
Branch:
default
Parents:
1872:5518b82614e3 (diff), 1878:8b1e95b04793 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged in ales_erjavec/orange-bioinformatics (pull request #2)

Move 'anonymous' _bioinformatics package into orangecontrib namespace

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orangecontrib/bio/widgets/OWHeatMap.py

    r1878 r1879  
    12391239        if self.sorted_data: 
    12401240            if self.selected_rows: 
    1241                 #bug if merge is used does not return enough genes 
    1242                 #examples = [self.sorted_data[i] for i in self.selected_rows] 
    1243  
    1244                 #uses Merge parameter, but does not work correctly for data with multiple classes 
    1245                 examples = [self.sorted_data[i*self.Merge+j] for i in self.selected_rows for j in range(self.Merge) if i*self.Merge+j < len(self.sorted_data)] 
    1246  
     1241                 
     1242                #obtain examples directly from the heatmap, so their order does not matter 
     1243 
     1244                rd = self.selection_manager.rows_to_heatmaps() 
     1245                hr = self.selection_manager._heatmap_ranges 
     1246 
     1247                examples = [] 
     1248                for row in self.selected_rows: 
     1249                    h = rd[row][0] 
     1250                    begin,_ = hr[h] 
     1251                    hm = h.heatmap 
     1252                    examples.extend(hm.examples[hm.exampleIndices[row-begin] : hm.exampleIndices[row+1-begin]]) 
     1253                     
    12471254                data = orange.ExampleTable(examples) 
     1255 
    12481256            else: 
    12491257                data = None 
Note: See TracChangeset for help on using the changeset viewer.