Changeset 10499:9b589e80fab3 in orange


Ignore:
Timestamp:
03/12/12 17:57:02 (2 years ago)
Author:
Lan Zagar <lan.zagar@…>
Branch:
default
Children:
10500:be3ad5d2023c, 10541:90b19af8a3a5
Message:

Tentative fix for a bug (see #1137).

Location:
Orange/OrangeWidgets
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeWidgets/OWNxHist.py

    r10495 r10499  
    5050        ribg = OWGUI.widgetBox(boxGeneral, None, orientation="horizontal", addSpace=False) 
    5151        OWGUI.spin(ribg, self, "kNN", 0, 1000, 1, label="kNN   ", orientation='horizontal', callback=self.generateGraph, callbackOnReturn=1, controlWidth=100) 
    52         OWGUI.doubleSpin(ribg, self, "percentil", 0, 100, 0.1, label="Percentil", orientation='horizontal', callback=self.setPercentil, callbackOnReturn=1, controlWidth=100) 
     52        OWGUI.doubleSpin(ribg, self, "percentil", 0, 100, 0.1, label="Percentile", orientation='horizontal', callback=self.setPercentil, callbackOnReturn=1, controlWidth=100) 
    5353        ribg.layout().addStretch(1) 
    5454        # Options 
     
    254254        if matrix != None: 
    255255            matrix.items = self.graph.items() 
    256             self.graph_matrix = matrix 
     256        self.graph_matrix = matrix 
    257257 
    258258        if self.graph is None: 
  • Orange/OrangeWidgets/Unsupervised/OWNxFromDistances.py

    r9671 r10499  
    2424class OWNxFromDistances(OWWidget, OWNxHist): 
    2525    settingsList=["spinLowerThreshold", "spinUpperThreshold", "netOption",  
    26                   "dstWeight", "kNN", "andor", "excludeLimit"] 
     26                  "dstWeight", "kNN", "percentil", "andor", "excludeLimit"] 
    2727     
    2828    def __init__(self, parent=None, signalManager=None): 
     
    7979         
    8080    def sendSignals(self): 
    81         if self.graph != None: 
    82             #setattr(matrix, "items", self.graph.items) 
    83             self.matrix.items = self.graph.items() 
    84          
    8581        self.send("Network", self.graph) 
    86          
    87         if self.matrix: 
    88             self.send("Distances", self.matrix) 
    89              
     82        self.send("Distances", self.graph_matrix)     
    9083        if self.graph == None: 
    9184            self.send("Data", None) 
Note: See TracChangeset for help on using the changeset viewer.