Commits

Aleš Erjavec committed 754ecbe

Fixed some more signal names.

Comments (0)

Files changed (8)

orange/OrangeCanvas/orngSignalManager.py

      'Data Table': 'Data',
      'Distance Matrix': 'Distances',
      'Distance matrix': 'Distances',
+     'Distances btw. Instances': 'Distances',
      'Example Subset': 'Data Subset',
      'Example Table': 'Data',
      'Examples': 'Data',
      'Examples A': 'Data A',
      'Examples B': 'Data B',
+     'Examples with Z-scores': 'Data with z-score',
      'Graph with ExampleTable': 'Graph with Data',
      'Input Data': 'Data',
      'Input Table': 'Data',
      'Instances': 'Data',
      'Items Distance Matrix': 'Distances',
      'Items Subset': 'Item Subset',
-     'Items to Mark': 'Marked Itenms',
+     'Items to Mark': 'Marked Items',
      'KNN Classifier': 'kNN Classifier',
      'Marked Examples': 'Marked Data',
      'Matching Examples': 'Merged Data',
+     'Merged Examples A+B': 'Merged Data A+B',
+     'Merged Examples B+A': 'Merged Data B+A',
      'Mismatching Examples': 'Mismatched Data',
      'Output Data': 'Data',
      'Output Table': 'Data',

orange/OrangeWidgets/Data/OWOutliers.py

         OWWidget.__init__(self, parent, signalManager, name, wantMainArea = 0)
 
         self.inputs = [("Data", ExampleTable, self.cdata),("Distances", orange.SymMatrix, self.cdistance)]
-        self.outputs = [("Outliers", ExampleTable), ("Inliers", ExampleTable), ("Examples with Z-scores", ExampleTable)]
+        self.outputs = [("Outliers", ExampleTable), ("Inliers", ExampleTable), ("Data with z-score", ExampleTable)]
                
         # Settings
         self.zscore = '4.0'
             for i, el in enumerate(zv):
                 self.newdata[i]["Z score"] = el            
 
-            self.send("Examples with Z-scores", self.newdata)
+            self.send("Data with z-score", self.newdata)
             
             filterout = orange.Filter_values(domain=self.newdata.domain)
             filterout["Z score"] = (orange.Filter_values.Greater, eval(self.zscore))
             self.send("Outliers", outliers)
             self.send("Inliers", inliers)
         else:
-            self.send("Examples with Z-scores", None)
+            self.send("Data with z-score", None)
             self.send("Outliers", None)
             self.send("Inliers", None)
   

orange/OrangeWidgets/Unsupervised/OWNetExplorer.py

         #self.contextHandlers = {"": DomainContextHandler("", [ContextField("attributes", selected="markerAttributes"), ContextField("attributes", selected="tooltipAttributes"), "color"])}
         self.inputs = [("Network", orngNetwork.Network, self.setGraph, Default), 
                        ("Items", orange.ExampleTable, self.setItems),
-                       ("Marked Itenms", orange.ExampleTable, self.markItems), 
+                       ("Marked Items", orange.ExampleTable, self.markItems), 
                        ("Item Subset", orange.ExampleTable, self.setExampleSubset), 
                        ("Vertex Distance", orange.SymMatrix, self.setVertexDistance)]
         

orange/OrangeWidgets/Unsupervised/OWNxExplorer.py

             self.inputs = [("Network", Orange.network.Graph, self.set_graph, Default),
                            ("Nx View", Orange.network.NxView, self.set_network_view),
                            ("Items", Orange.data.Table, self.setItems),
-                           ("Marked Itenms", Orange.data.Table, self.markItems), 
+                           ("Marked Items", Orange.data.Table, self.markItems), 
                            ("Item Subset", Orange.data.Table, self.setExampleSubset), 
                            ("Distances", Orange.core.SymMatrix, self.set_items_distance_matrix)]
             

orange/OrangeWidgets/Visualize Qt/OWLinProjQt.py

                        ("Features", AttributeList, self.setShownAttributes),
                        ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults),
                        ("VizRank Learner", orange.Learner, self.setVizRankLearner),
-                       ("Distances btw. Instances", orange.SymMatrix, self.setDistances)]
+                       ("Distances", orange.SymMatrix, self.setDistances)]
         self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList), ("FreeViz Learner", orange.Learner)]
 
         name_lower = name.lower()

orange/OrangeWidgets/Visualize Qt/OWNxExplorer3D.py

         self.inputs = [("Nx View", Orange.network.NxView, self.set_network_view),
                        ("Network", Orange.network.Graph, self.set_graph, Default),
                        ("Items", Orange.data.Table, self.setItems),
-                       ("Marked Itenms", Orange.data.Table, self.markItems), 
+                       ("Marked Items", Orange.data.Table, self.markItems), 
                        ("Item Subset", Orange.data.Table, self.setExampleSubset), 
                        ("Distances", Orange.core.SymMatrix, self.set_items_distance_matrix)]
 

orange/OrangeWidgets/Visualize Qt/OWNxExplorerQt.py

         self.inputs = [("Nx View", Orange.network.NxView, self.set_network_view),
                        ("Network", Orange.network.Graph, self.set_graph, Default),
                        ("Items", Orange.data.Table, self.setItems),
-                       ("Marked Itenms", Orange.data.Table, self.markItems), 
+                       ("Marked Items", Orange.data.Table, self.markItems), 
                        ("Item Subset", Orange.data.Table, self.setExampleSubset), 
                        ("Distances", Orange.core.SymMatrix, self.set_items_distance_matrix)]
         

orange/OrangeWidgets/Visualize/OWLinProj.py

                        ("Features", AttributeList, self.setShownAttributes),
                        ("Evaluation Results", orngTest.ExperimentResults, self.setTestResults),
                        ("VizRank Learner", orange.Learner, self.setVizRankLearner),
-                       ("Distances btw. Instances", orange.SymMatrix, self.setDistances)]
+                       ("Distances", orange.SymMatrix, self.setDistances)]
         self.outputs = [("Selected Data", ExampleTable), ("Other Data", ExampleTable), ("Features", AttributeList), ("FreeViz Learner", orange.Learner)]
 
         # local variables