Ignore:
Timestamp:
01/18/12 10:56:15 (2 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
a367b01157310c282e7919193d767127e7829e26
Message:

Renamed widget channel names in line with the new naming rules/convention.
Added backwards compatibility in orngDoc loadDocument to enable loading of schemas saved before the change.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orange/OrangeWidgets/Unsupervised/OWHierarchicalClustering.py

    r9132 r9546  
    3636        OWWidget.__init__(self, parent, signalManager, 'Hierarchical Clustering', wantGraph=True) 
    3737         
    38         self.inputs = [("Distance matrix", orange.SymMatrix, self.set_matrix)] 
    39         self.outputs = [("Selected Examples", ExampleTable), ("Unselected Examples", ExampleTable), ("Centroids", ExampleTable)] 
     38        self.inputs = [("Distances", orange.SymMatrix, self.set_matrix)] 
     39        self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Centroids", ExampleTable)] 
    4040        self.linkage = [("Single linkage", orange.HierarchicalClustering.Single), 
    4141                        ("Average linkage", orange.HierarchicalClustering.Average), 
     
    253253            self.dendrogram.clear() 
    254254            self.labelCombo.clear() 
    255             self.send("Selected Examples", None) 
    256             self.send("Unselected Examples", None) 
     255            self.send("Selected Data", None) 
     256            self.send("Other Data", None) 
    257257            self.classificationBox.setDisabled(True) 
    258258            return 
     
    458458         
    459459        if not selected: 
    460             self.send("Selected Examples", None) 
    461             self.send("Unselected Examples", None) 
     460            self.send("Selected Data", None) 
     461            self.send("Other Data", None) 
    462462            self.send("Centroids", None) 
    463463            return 
     
    501501                self.unselectedExamples = orange.ExampleTable(unselected) if unselected else None 
    502502                 
    503             self.send("Selected Examples", self.selectedExamples) 
    504             self.send("Unselected Examples", self.unselectedExamples) 
     503            self.send("Selected Data", self.selectedExamples) 
     504            self.send("Other Data", self.unselectedExamples) 
    505505 
    506506            self.centroids = None 
Note: See TracChangeset for help on using the changeset viewer.