Commit 00516042 authored by Luke Campagnola's avatar Luke Campagnola
Browse files

Converted all old-style classes to new-style for PySide compatibility. (thanks Chris)

parent aca9c831
......@@ -3,7 +3,7 @@ from pyqtgraph.Qt import QtCore, QtGui
import weakref
import pyqtgraph.ptime as ptime
class MouseDragEvent:
class MouseDragEvent(object):
"""
Instances of this class are delivered to items in a :class:`GraphicsScene <pyqtgraph.GraphicsScene>` via their mouseDragEvent() method when the item is being mouse-dragged.
......@@ -144,7 +144,7 @@ class MouseDragEvent:
class MouseClickEvent:
class MouseClickEvent(object):
"""
Instances of this class are delivered to items in a :class:`GraphicsScene <pyqtgraph.GraphicsScene>` via their mouseClickEvent() method when the item is clicked.
......@@ -229,7 +229,7 @@ class MouseClickEvent:
class HoverEvent:
class HoverEvent(object):
"""
Instances of this class are delivered to items in a :class:`GraphicsScene <pyqtgraph.GraphicsScene>` via their hoverEvent() method when the mouse is hovering over the item.
This event class both informs items that the mouse cursor is nearby and allows items to
......
......@@ -317,7 +317,7 @@ def objectSize(obj, ignore=None, verbose=False, depth=0, recursive=False):
#print indent + ' -', k, len(refs)
return size
class GarbageWatcher:
class GarbageWatcher(object):
"""
Convenient dictionary for holding weak references to objects.
Mainly used to check whether the objects have been collect yet or not.
......@@ -356,7 +356,7 @@ class GarbageWatcher:
return self.objs[item]
class Profiler:
class Profiler(object):
"""Simple profiler allowing measurement of multiple time intervals.
Example:
......@@ -451,7 +451,7 @@ def lookup(oid, objects=None):
class ObjTracker:
class ObjTracker(object):
"""
Tracks all objects under the sun, reporting the changes between snapshots: what objects are created, deleted, and persistent.
This class is very useful for tracking memory leaks. The class goes to great (but not heroic) lengths to avoid tracking
......
......@@ -47,7 +47,7 @@ def setTracebackClearing(clear=True):
global clear_tracebacks
clear_tracebacks = clear
class ExceptionHandler:
class ExceptionHandler(object):
def __call__(self, *args):
## call original exception handler first (prints exception)
global original_excepthook, callbacks, clear_tracebacks
......
......@@ -7,7 +7,7 @@ from pyqtgraph.Point import Point
#from PySide import QtCore, QtGui
from .eq import *
class Terminal:
class Terminal(object):
def __init__(self, node, name, io, optional=False, multi=False, pos=None, renamable=False, removable=False, multiable=False, bypass=None):
"""
Construct a new terminal.
......
......@@ -2,7 +2,7 @@ from ..Qt import QtGui, QtCore
from ..Point import Point
class GraphicsWidgetAnchor:
class GraphicsWidgetAnchor(object):
"""
Class used to allow GraphicsWidgets to anchor to a specific position on their
parent.
......
......@@ -77,7 +77,7 @@ def makeSymbolPixmap(size, pen, brush, symbol):
img = renderSymbol(symbol, size, pen, brush)
return QtGui.QPixmap(img)
class SymbolAtlas:
class SymbolAtlas(object):
"""
Used to efficiently construct a single QPixmap containing all rendered symbols
for a ScatterPlotItem. This is required for fragment rendering.
......
......@@ -48,7 +48,7 @@ def axis(name=None, cols=None, values=None, units=None):
ax['cols'].append(col)
return ax
class sliceGenerator:
class sliceGenerator(object):
"""Just a compact way to generate tuples of slice objects."""
def __getitem__(self, arg):
return arg
......
......@@ -6,7 +6,7 @@ class CanceledError(Exception):
"""Raised when the progress dialog is canceled during a processing operation."""
pass
class Parallelize:
class Parallelize(object):
"""
Class for ultra-simple inline parallelization on multi-core CPUs
......@@ -233,7 +233,7 @@ class Parallelize:
self.progress[pid].append(i)
class Tasker:
class Tasker(object):
def __init__(self, parallelizer, process, tasks, kwds):
self.proc = process
self.par = parallelizer
......
......@@ -431,7 +431,7 @@ class RemoteEventHandler(object):
return LocalObjectProxy(obj)
class Request:
class Request(object):
"""
Request objects are returned when calling an ObjectProxy in asynchronous mode
or if a synchronous call has timed out. Use hasResult() to ask whether
......
......@@ -209,7 +209,7 @@ CompiledShaderPrograms = {}
def getShaderProgram(name):
return ShaderProgram.names[name]
class Shader:
class Shader(object):
def __init__(self, shaderType, code):
self.shaderType = shaderType
self.code = code
......@@ -260,7 +260,7 @@ class FragmentShader(Shader):
class ShaderProgram:
class ShaderProgram(object):
names = {}
def __init__(self, name, shaders, uniforms=None):
......
......@@ -665,7 +665,7 @@ class Parameter(QtCore.QObject):
self.sigTreeStateChanged.emit(self, changes)
class SignalBlocker:
class SignalBlocker(object):
def __init__(self, enterFn, exitFn):
self.enterFn = enterFn
self.exitFn = exitFn
......
......@@ -260,7 +260,7 @@ def makeThreadsafe(obj):
raise Exception("Not sure how to make object of type %s thread-safe" % str(type(obj)))
class Locker:
class Locker(object):
def __init__(self, lock):
self.lock = lock
self.lock.acquire()
......
......@@ -2,7 +2,7 @@ from pyqtgraph.Qt import QtGui, QtCore
__all__ = ['BusyCursor']
class BusyCursor:
class BusyCursor(object):
"""Class for displaying a busy mouse cursor during long operations.
Usage::
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment