Changeset 1878:8b1e95b04793 in orange-bioinformatics for orangecontrib/bio/widgets/OWHeatMap.py


Ignore:
Timestamp:
10/09/13 15:36:14 (6 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Parents:
1877:2a17616eb737 (diff), 1870:8993be909b62 (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 biolab/orange-bioinformatics into default

File:
1 edited

Legend:

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

    r1874 r1878  
    625625    def handleNewSignals(self): 
    626626        self.send('Examples', None) 
    627         self.error(0) 
    628627        if self.data: 
    629             if self.data.domain.has_discrete_attributes():  
    630                 self.error(0, "Data contains discrete attributes") 
    631             elif len(self.data.domain.features) == 1: 
    632                 self.error(0, "Cannot construct heatmap with only a single feature") 
    633             else: 
    634                 self.update_heatmaps() 
     628            self.update_heatmaps() 
    635629        else: 
    636630            self.clear() 
     
    12451239        if self.sorted_data: 
    12461240            if self.selected_rows: 
    1247                 examples = [self.sorted_data[i] for i in 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 
    12481247                data = orange.ExampleTable(examples) 
    12491248            else: 
Note: See TracChangeset for help on using the changeset viewer.