Changeset 11216:93e23bd7ec3e in orange


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:
91 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeWidgets/Classify/OWClassificationTree.py

    r11015 r11216  
    22<name>Classification Tree</name> 
    33<description>Classification tree learner/classifier.</description> 
    4 <icon>icons/ClassificationTree.png</icon> 
     4<icon>icons/ClassificationTree.svg</icon> 
    55<contact>Janez Demsar (janez.demsar(@at@)fri.uni-lj.si)</contact> 
    66<priority>30</priority> 
  • Orange/OrangeWidgets/Classify/OWClassificationTree.py

    r11096 r11216  
    3535        self.inputs = [("Data", ExampleTable, self.setData), 
    3636                       ("Preprocess", PreprocessedLearner, self.setPreprocessor)] 
    37          
     37 
    3838        self.outputs = [("Learner", Orange.classification.tree.TreeLearner), 
    39                         ("Classification Tree", Orange.classification.tree.TreeClassifier), 
    40                         ("Classification Tree Graph", Orange.network.Graph)] 
     39                        ("Classification Tree", Orange.classification.tree.TreeClassifier), ] 
    4140 
    4241        self.name = 'Classification Tree' 
     
    146145            self.classifier = None 
    147146 
    148         tree_graph = None 
    149         if self.classifier is not None: 
    150             tree_graph = self.classifier.to_network() 
    151  
    152147        self.send("Classification Tree", self.classifier) 
    153         self.send("Classification Tree Graph", tree_graph) 
    154  
    155148 
    156149    def measureChanged(self): 
  • Orange/OrangeWidgets/Classify/OWClassificationTreeGraph.py

    r11038 r11216  
    11"""<name>Classification Tree Graph</name> 
    22<description>Classification tree viewer (graph view).</description> 
    3 <icon>icons/ClassificationTreeGraph.png</icon> 
     3<icon>icons/ClassificationTreeGraph.svg</icon> 
    44<contact>Blaz Zupan (blaz.zupan(@at@)fri.uni-lj.si)</contact> 
    55<priority>2110</priority> 
  • Orange/OrangeWidgets/Classify/OWClassificationTreeGraph.py

    r11096 r11216  
    1818         
    1919    def setR(self, r): 
     20        self.prepareGeometryChange() 
    2021        self.r = r 
    2122         
  • 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 
  • setup.py

    r11014 r11216  
    640640             all_with_extension(path="doc/datasets", extensions=("tab", "csv", "basket")) +\ 
    641641             all_with_extension(path="testing/regression/tests_20", extensions=("net", "tab", "basket", "csv")), 
    642         "Orange.OrangeCanvas": ["icons/*.png", "orngCanvas.pyw", "WidgetTabs.txt"], 
    643         "Orange.OrangeWidgets": ["icons/*.png", "icons/backgrounds/*.png", "report/index.html"], 
    644         "Orange.OrangeWidgets.Associate": ["icons/*.png"], 
    645         "Orange.OrangeWidgets.Classify": ["icons/*.png"], 
    646         "Orange.OrangeWidgets.Data": ["icons/*.png"], 
    647         "Orange.OrangeWidgets.Evaluate": ["icons/*.png"], 
    648         "Orange.OrangeWidgets.Prototypes": ["icons/*.png"], 
    649         "Orange.OrangeWidgets.Regression": ["icons/*.png"], 
    650         "Orange.OrangeWidgets.Unsupervised": ["icons/*.png"], 
    651         "Orange.OrangeWidgets.Visualize": ["icons/*.png"], 
    652         "Orange.OrangeWidgets.Visualize Qt": ["icons/*.png"], 
     642        "Orange.OrangeCanvas": ["icons/*.png", "icons/*.svg", 
     643                                "orngCanvas.pyw", "WidgetTabs.txt"], 
     644        "Orange.OrangeCanvas.styles": ["*.qss", "orange/*.svg"], 
     645        "Orange.OrangeWidgets": ["icons/*.png", "icons/backgrounds/*.png", 
     646                                 "report/index.html"], 
     647        "Orange.OrangeWidgets.Associate": ["icons/*.png", "icons/*.svg"], 
     648        "Orange.OrangeWidgets.Classify": ["icons/*.png", "icons/*.svg"], 
     649        "Orange.OrangeWidgets.Data": ["icons/*.png", "icons/*.svg"], 
     650        "Orange.OrangeWidgets.Evaluate": ["icons/*.png", "icons/*.svg"], 
     651        "Orange.OrangeWidgets.Prototypes": ["icons/*.png", "icons/*.svg"], 
     652        "Orange.OrangeWidgets.Regression": ["icons/*.png", "icons/*.svg"], 
     653        "Orange.OrangeWidgets.Unsupervised": ["icons/*.png", "icons/*.svg"], 
     654        "Orange.OrangeWidgets.Visualize": ["icons/*.png", "icons/*.svg"], 
     655        "Orange.OrangeWidgets.Visualize Qt": ["icons/*.png", "icons/*.svg"], 
    653656        "Orange.OrangeWidgets.plot": ["*.gs", "*.vs"], 
    654657        "Orange.OrangeWidgets.plot.primitives": ["*.obj"], 
     
    747750# http://packages.python.org/distribute/setuptools.html#automatic-script-creation 
    748751ENTRY_POINTS = { 
     752    'gui_scripts': ( 
     753            'orange-canvas = Orange.OrangeCanvas.main:main', 
     754    ) 
    749755} 
    750756 
     
    776782        cmdclass = cmdclass, 
    777783        ext_modules = ext_modules, 
    778         scripts = ( 
    779             "bin/orange-canvas", 
    780         ), 
     784#        scripts = ( 
     785#            "bin/orange-canvas", 
     786#        ), 
    781787    ) 
    782788 
  • setup.py

    r11173 r11216  
    1 #!usr/bin/env python 
     1#!/usr/bin/env python2 
    22 
    33try: 
     
    639639            ["orangerc.cfg", "doc/style.css", "doc/widgets/*/*.*"] +\ 
    640640             all_with_extension(path="doc/datasets", extensions=("tab", "csv", "basket")) +\ 
    641              all_with_extension(path="doc/networks", extensions=("net", "tab")) +\ 
    642641             all_with_extension(path="testing/regression/tests_20", extensions=("net", "tab", "basket", "csv")), 
    643642        "Orange.OrangeCanvas": ["icons/*.png", "icons/*.svg", 
     
    739738        'PyQt4', 
    740739        'PyQwt', 
    741     ), 
    742     'NETWORK': ( 
    743         'networkx', 
    744740    ), 
    745741    'reST': ( 
Note: See TracChangeset for help on using the changeset viewer.