Changeset 10476:5f7f725a6660 in orange


Ignore:
Timestamp:
03/08/12 19:56:41 (2 years ago)
Author:
Matija Polajnar <matija.polajnar@…>
Branch:
default
Parents:
10475:61c2249d671f (diff), 10472:351e408d6aee (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:

Trivial merge.

Files:
7 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeWidgets/Visualize Qt/OWLinProjGraphQt.py

    r10466 r10476  
    697697            # We never have different sizes in LinProj 
    698698            self.main_curve.set_point_sizes([self.pointWidth]) 
    699          
     699 
     700OWLinProjGraph = graph_deprecator(OWLinProjGraph) 
    700701 
    701702 
  • Orange/OrangeWidgets/Visualize Qt/OWLinProjGraphQt.py

    r10475 r10476  
    558558        lastSave = getattr(self, "lastPicTeXSave", "C:\\") 
    559559        qfileName = QFileDialog.getSaveFileName(None, "Save to..", lastSave + "graph.pictex","PicTeX (*.pictex);;All files (*.*)") 
    560         fileName = str(qfileName) 
     560        fileName = unicode(qfileName) 
    561561        if fileName == "": 
    562562            return 
  • Orange/OrangeWidgets/Visualize/OWLinProjGraph.py

    r10466 r10476  
    720720        OWGraph.drawCanvas(self, painter) 
    721721 
     722OWLinProjGraph = graph_deprecator(OWLinProjGraph) 
    722723 
    723724if __name__== "__main__": 
  • Orange/OrangeWidgets/Visualize/OWLinProjGraph.py

    r10475 r10476  
    585585        lastSave = getattr(self, "lastPicTeXSave", "C:\\") 
    586586        qfileName = QFileDialog.getSaveFileName(None, "Save to..", lastSave + "graph.pictex","PicTeX (*.pictex);;All files (*.*)") 
    587         fileName = str(qfileName) 
     587        fileName = unicode(qfileName) 
    588588        if fileName == "": 
    589589            return 
Note: See TracChangeset for help on using the changeset viewer.