Changeset 5062:00c36ec5820e in orange


Ignore:
Timestamp:
08/04/08 14:40:29 (6 years ago)
Author:
miha <miha.stajdohar@…>
Branch:
default
Convert:
5f6077528916ddf8168cf919272fad983a61c235
Message:

mark by input signal moved to radio button

File:
1 edited

Legend:

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

    r5025 r5062  
    155155         
    156156        ribg = OWGUI.radioButtonsInBox(self.markTab, self, "hubs", [], "Method", callback = self.setMarkMode) 
    157         OWGUI.appendRadioButton(ribg, self, "hubs", "Mark vertices given in the input signal", callback = self.setMarkMode) 
     157        OWGUI.appendRadioButton(ribg, self, "hubs", "None", callback = self.setMarkMode) 
    158158        OWGUI.appendRadioButton(ribg, self, "hubs", "Find vertices which label contain", callback = self.setMarkMode) 
    159159        self.ctrlMarkSearchString = OWGUI.lineEdit(OWGUI.indentedBox(ribg), self, "markSearchString", callback=self.setSearchStringTimer, callbackOnType=True) 
     
    180180        #self.markInputBox = OWGUI.widgetBox(self.markTab, "Mark by input signal", orientation="vertical") 
    181181        #self.markInputBox.setEnabled(False) 
     182        self.markInputRadioButton = OWGUI.appendRadioButton(ribg, self, "hubs", "Mark vertices given in the input signal", callback = self.setMarkMode) 
     183        ib = OWGUI.indentedBox(ribg) 
    182184        self.markInput = 0 
    183         self.markInputCombo = OWGUI.comboBox(self.markTab, self, "markInput", box = "Mark by input signal", callback=self.setMarkInput) 
    184         self.markInputCombo.box.setEnabled(False) 
     185        self.markInputCombo = OWGUI.comboBox(ib, self, "markInput", callback=(lambda h=9: self.setMarkMode(h))) 
     186        self.markInputRadioButton.setEnabled(False) 
    185187         
    186188        T = OWToolbars.NavigateSelectToolbar 
     
    350352 
    351353        if hubs == 0: 
    352             #print "mark on input" 
     354            self.graph.setMarkedVertices([]) 
     355            self.graph.replot() 
    353356            return 
    354357         
     
    407410            self.graph.setMarkedVertices(sortedIdx[:cutP]) 
    408411            self.graph.replot() 
     412        elif hubs == 9: 
     413            self.setMarkInput() 
    409414        
    410415    def testRefresh(self): 
     
    587592    def markItems(self, items): 
    588593        self.markInputCombo.clear() 
    589         self.markInputCombo.box.setEnabled(False) 
     594        self.markInputRadioButton.setEnabled(False) 
    590595        self.markInputItems = items 
    591596         
     
    605610                    if orgVar.varType == mrkVar.varType and orgVar.varType == orange.VarTypes.String: 
    606611                        self.markInputCombo.addItem(self.icons[orgVar.varType], unicode(orgVar.name)) 
    607                         self.markInputCombo.box.setEnabled(True) 
    608                  
    609         self.setMarkInput() 
     612                        self.markInputRadioButton.setEnabled(True) 
     613                 
     614                        self.setMarkMode(9) 
    610615               
    611616    def setExampleSubset(self, subset): 
Note: See TracChangeset for help on using the changeset viewer.