Changeset 9547:f0b0d86b42b3 in orange


Ignore:
Timestamp:
01/18/12 12:05:25 (2 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
a21409cc8cb8eaad2287c10f651b5b7833f49f7a
Message:

Fixed inputs/outputs

names.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orange/OrangeWidgets/Data/OWMergeData.py

    r9546 r9547  
    2525 
    2626        # set channels 
    27         self.inputs = [("Data", ExampleTable, self.onDataAInput), 
    28                        ("Data", ExampleTable, self.onDataBInput)] 
    29          
    30         self.outputs = [("Merged Examples A+B", ExampleTable), 
    31                         ("Merged Examples B+A", ExampleTable)] 
     27        self.inputs = [("Data A", ExampleTable, self.onDataAInput), 
     28                       ("Data B", ExampleTable, self.onDataBInput)] 
     29         
     30        self.outputs = [("Merged Data A+B", ExampleTable), 
     31                        ("Merged Data B+A", ExampleTable)] 
    3232 
    3333        # data 
     
    172172        if self.dataA and self.dataB and self.varA and self.varB: 
    173173            try: 
    174                 self.send("Merged Examples A+B", self.merge(self.dataA, self.dataB, self.varA[0], self.varB[0])) 
    175                 self.send("Merged Examples B+A", self.merge(self.dataB, self.dataA, self.varB[0], self.varA[0])) 
     174                self.send("Merged Data A+B", self.merge(self.dataA, self.dataB, self.varA[0], self.varB[0])) 
     175                self.send("Merged Data B+A", self.merge(self.dataB, self.dataA, self.varB[0], self.varA[0])) 
    176176            except orange.KernelException, ex: 
    177177                self.error(0, "Cannot merge the two tables (%r)" % str(ex)) 
    178178        else: 
    179             self.send("Merged Examples A+B", None) 
    180             self.send("Merged Examples B+A", None) 
     179            self.send("Merged Data A+B", None) 
     180            self.send("Merged Data B+A", None) 
    181181 
    182182    ############################################################################################################################################################ 
Note: See TracChangeset for help on using the changeset viewer.