ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Vector.__init__ improvements

Browse Source 
* added docstring
* fixed handling of QVector3D args (cannot list() them)
* refactor to no longer need return statements
This commit is contained in:
Martin 2020-08-05 11:31:51 -07:00
parent c8fc221e81
commit 9f996d041c
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pyqtgraph/Vector.py
View File

@ -12,35 +12,36 @@ class Vector(QtGui.QVector3D):
"""Extension of QVector3D which adds a few helpful methods."""
def __init__(self, *args):
"""
Handle additional constructions of a Vector
Parameters
----------
args
Could be any of:
* 3 numerics
* 2 numerics (`0` assumed for z)
* Either of the previous in a list-like collection
* 1 QSizeF (`0` assumed for z)
* 1 QPointF (`0` assumed for z)
* Any other valid QVector3D init args.
"""
init_args = args
if len(args) == 1:
if isinstance(args[0], QtCore.QSizeF):
x = float(args[0].width())
y = float(args[0].height())
z = 0
init_args = (float(args[0].width()), float(args[0].height()), 0)
elif isinstance(args[0], QtCore.QPoint) or isinstance(args[0], QtCore.QPointF):
x = float(args[0].x())
y = float(args[0].y())
z = 0
elif isinstance(args[0], QtGui.QVector3D):
x = args[0].x()
y = args[0].y()
z = args[0].z()
elif hasattr(args[0], '__getitem__'):
init_args = (float(args[0].x()), float(args[0].y()), 0)
elif hasattr(args[0], '__getitem__') and not isinstance(args[0], QtGui.QVector3D):
vals = list(args[0])
if len(vals) == 2:
x, y = vals
z = 0
elif len(vals) == 3:
x, y, z = vals
else:
raise ValueError('Cannot init Vector with sequence of length %d' % len(args[0]))
vals.append(0)
if len(vals) != 3:
raise Exception('Cannot init Vector with sequence of length %d' % len(args[0]))
init_args = vals
elif len(args) == 2:
x, y = args
z = 0
else:
x, y, z = args # Could raise ValueError
QtGui.QVector3D.__init__(self, x, y, z)
init_args = (args[0], args[1], 0)
QtGui.QVector3D.__init__(self, *init_args)
def __len__(self):
return 3