Changeset 8992:b1a1d009f23b in orange


Ignore:
Timestamp:
09/20/11 14:10:22 (3 years ago)
Author:
miha <miha.stajdohar@…>
Branch:
default
Convert:
3752b4ebf8ceef9725b4674416ad94d10d2582b4
Message:
 
Location:
orange/OrangeWidgets/Visualize Qt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orange/OrangeWidgets/Visualize Qt/OWNxCanvasQt.py

    r8881 r8992  
    679679         
    680680        self.graph = graph 
    681         self.networkCurve = NetworkCurve() if curve is None else curve 
     681        self.networkCurve = NetworkCurve() if curve is None else curve() 
    682682        self.add_custom_curve(self.networkCurve) 
    683683         
  • orange/OrangeWidgets/Visualize Qt/OWNxExplorerQt.py

    r8915 r8992  
    190190        self.vertexSizeCombo.addItem("(none)") 
    191191         
    192         ib = OWGUI.widgetBox(self.verticesTab, "Node labels | tooltips", orientation="vertical", addSpace = False) 
    193         OWGUI.spin(ib, self, "fontSize", 4, 30, 1, label="Set font size:", callback = self.set_font_size) 
    194         hb = OWGUI.widgetBox(ib, orientation="horizontal", addSpace = False) 
     192        self.attBox = OWGUI.widgetBox(self.verticesTab, "Node labels | tooltips", orientation="vertical", addSpace = False) 
     193        OWGUI.spin(self.attBox, self, "fontSize", 4, 30, 1, label="Set font size:", callback = self.set_font_size) 
     194        hb = OWGUI.widgetBox(self.attBox, orientation="horizontal", addSpace = False) 
    195195        self.attListBox = OWGUI.listBox(hb, self, "markerAttributes", "attributes", selectionMode=QListWidget.MultiSelection, callback=self.clickedAttLstBox) 
    196196        self.tooltipListBox = OWGUI.listBox(hb, self, "tooltipAttributes", "attributes", selectionMode=QListWidget.MultiSelection, callback=self.clickedTooltipLstBox)         
    197         OWGUI.spin(ib, self, "networkCanvas.trim_label_words", 0, 5, 1, label='Trim label words to', callback=self.clickedAttLstBox) 
     197        OWGUI.spin(self.attBox, self, "networkCanvas.trim_label_words", 0, 5, 1, label='Trim label words to', callback=self.clickedAttLstBox) 
    198198         
    199199        ib = OWGUI.widgetBox(self.edgesTab, "General", orientation="vertical") 
     
    927927        self.set_items_distance_matrix(None) 
    928928         
    929     def set_graph(self, graph): 
     929    def set_graph(self, graph, curve=None): 
    930930        self.information() 
    931931        self.error() 
     
    955955        self.number_of_edges_label = self.graph.number_of_edges() 
    956956         
    957         self.networkCanvas.set_graph(self.graph, items=self.graph_base.items(), links=self.graph_base.links()) 
     957        self.networkCanvas.set_graph(self.graph, curve, items=self.graph_base.items(), links=self.graph_base.links()) 
    958958         
    959959        if self._items is not None and 'x' in self._items.domain and 'y' in self._items.domain: 
Note: See TracChangeset for help on using the changeset viewer.