Ignore:
Timestamp:
11/30/12 16:15:30 (17 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Parents:
11215:a55eaa72e6ef (diff), 11045:a66a74b38e91 (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 from upstream (biolab/orange).

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeWidgets/Data/OWPythonScript.py

    r11012 r11216  
    22<name>Python Script</name> 
    33<description>Executes python script.</description> 
    4 <icon>icons/PythonScript.png</icon> 
     4<icon>icons/PythonScript.svg</icon> 
    55<contact>Miha Stajdohar (miha.stajdohar(@at@)gmail.com)</contact>  
    66<priority>3150</priority> 
  • Orange/OrangeWidgets/Data/OWPythonScript.py

    r11096 r11216  
    266266        OWWidget.__init__(self, parent, signalManager, 'Python Script') 
    267267         
    268         self.inputs = [("in_data", ExampleTable, self.setExampleTable), ("in_distance", orange.SymMatrix, self.setDistanceMatrix), ("in_network", Orange.network.Graph, self.setNetwork), ("in_learner", orange.Learner, self.setLearner), ("in_classifier", orange.Classifier, self.setClassifier)] 
    269         self.outputs = [("out_data", ExampleTable), ("out_distance", orange.SymMatrix), ("out_network", Orange.network.Graph), ("out_learner", orange.Learner), ("out_classifier", orange.Classifier, Dynamic)] 
    270          
     268        self.inputs = [("in_data", ExampleTable, self.setExampleTable), ("in_distance", orange.SymMatrix, self.setDistanceMatrix), ("in_learner", orange.Learner, self.setLearner), ("in_classifier", orange.Classifier, self.setClassifier)] 
     269        self.outputs = [("out_data", ExampleTable), ("out_distance", orange.SymMatrix), ("out_learner", orange.Learner), ("out_classifier", orange.Classifier, Dynamic)] 
     270 
     271        try: 
     272            self.inputs.append(("in_network", Orange.network.Graph, self.setNetwork)) 
     273            self.outputs.append(("out_network", Orange.network.Graph)) 
     274        except: 
     275            pass 
     276 
    271277        self.in_data = None 
    272278        self.in_network = None 
Note: See TracChangeset for help on using the changeset viewer.