Changeset 3554:a81dd2ff54f8 in orange


Ignore:
Timestamp:
04/18/07 16:03:05 (7 years ago)
Author:
polz <polz@…>
Branch:
default
Convert:
fa674820628bb1b1a309243b14e1e737f5ae0e3b
Message:

* empty log message *

Location:
orange
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • orange/OrangeWidgets/ColorPalette.py

    r3551 r3554  
    22from qttable import * 
    33from qtcanvas import * 
    4 import qwt 
     4try: 
     5    import qwt 
     6except: 
     7    import Qwt4 as qwt 
    58import math 
    69from OWWidget import * 
  • orange/OrangeWidgets/OWDlgs.py

    r3513 r3554  
    22from OWBaseWidget import * 
    33import OWGUI, OWGraphTools, OWTools 
    4 from qwt import QwtPlot 
     4try: 
     5   from qwt import QwtPlot 
     6except: 
     7   from Qwt4 import QwtPlot 
     8 
    59from qtcanvas import QCanvas 
    610from ColorPalette import * 
  • orange/OrangeWidgets/OWGUI.py

    r3551 r3554  
    488488 
    489489def qwtHSlider(widget, master, value, box=None, label=None, labelWidth=None, minValue=1, maxValue=10, step=0.1, precision=1, callback=None, logarithmic=0, ticks=0, maxWidth=80, tooltip = None, debuggingEnabled = 1): 
    490     import qwt 
     490    try: 
     491        from qwt import * 
     492    except: 
     493        from Qwt4 import * 
    491494    init = master.getdeepattr(value) 
    492495    if box: 
  • orange/OrangeWidgets/OWGraph.py

    r3551 r3554  
    66from qt import * 
    77from OWTools import * 
    8 from qwt import * 
     8try: 
     9    from qwt import * 
     10except: 
     11    from Qwt4 import * 
    912import qtcanvas, orange, math 
    1013from OWGraphTools import *      # color palletes, user defined curves, ... 
  • orange/OrangeWidgets/OWGraphTools.py

    r3545 r3554  
    11from qt import * 
    2 from qwt import * 
     2try: 
     3    from qwt import * 
     4except: 
     5    from Qwt4 import * 
     6 
    37#from Numeric import * 
    48#from OWGraphTools import * 
  • orange/setup.py

    r3553 r3554  
    7575 
    7676try: 
    77     import Qwt4 
     77    try: 
     78        import Qwt4 
     79    except: 
     80        import qwt 
    7881    gotQwt = "n/a" 
    7982except: 
Note: See TracChangeset for help on using the changeset viewer.