From 2a2f19b2d59d6f0fc6d32f4be5e446200eb822c9 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <>
Date: Fri, 23 Mar 2012 03:21:04 -0400
Subject: [PATCH] bugfixes
---
__init__.py | 13 ++++++++++++-
examples/Arrow.py | 1 +
examples/Draw.py | 1 +
examples/__main__.py | 12 ++++++------
exporters/Exporter.py | 2 +-
5 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/__init__.py b/__init__.py
index a8ae98de..360e217f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -112,7 +112,18 @@ def plot(*args, **kargs):
#w = PlotWindow()
#if len(args)+len(kargs) > 0:
#w.plot(*args, **kargs)
- w = PlotWindow(*args, **kargs)
+
+ pwArgList = ['title', 'label', 'name', 'left', 'right', 'top', 'bottom']
+ pwArgs = {}
+ dataArgs = {}
+ for k in kargs:
+ if k in pwArgList:
+ pwArgs[k] = kargs[k]
+ else:
+ dataArgs[k] = kargs[k]
+
+ w = PlotWindow(**pwArgs)
+ w.plot(*args, **dataArgs)
plots.append(w)
w.show()
return w
diff --git a/examples/Arrow.py b/examples/Arrow.py
index 446e243e..86f5c8c7 100755
--- a/examples/Arrow.py
+++ b/examples/Arrow.py
@@ -32,5 +32,6 @@ anim = a.makeAnimation(loop=-1)
anim.start()
## Start Qt event loop unless running in interactive mode or using pyside.
+import sys
if (sys.flags.interactive != 1) or not hasattr(QtCore, 'PYQT_VERSION'):
app.exec_()
diff --git a/examples/Draw.py b/examples/Draw.py
index 6a9b1323..e64b76b6 100644
--- a/examples/Draw.py
+++ b/examples/Draw.py
@@ -38,5 +38,6 @@ img.setDrawKernel(kern, mask=kern, center=(1,1), mode='add')
img.setLevels([0, 10])
## Start Qt event loop unless running in interactive mode or using pyside.
+import sys
if (sys.flags.interactive != 1) or not hasattr(QtCore, 'PYQT_VERSION'):
app.exec_()
diff --git a/examples/__main__.py b/examples/__main__.py
index 95c0ebae..95e948ff 100644
--- a/examples/__main__.py
+++ b/examples/__main__.py
@@ -24,22 +24,22 @@ examples = OrderedDict([
])),
('Widgets', OrderedDict([
('PlotWidget', 'PlotWidget.py'),
- ('SpinBox', '../widgets/SpinBox.py'),
+ #('SpinBox', '../widgets/SpinBox.py'),
('TreeWidget', '../widgets/TreeWidget.py'),
('DataTreeWidget', '../widgets/DataTreeWidget.py'),
('GradientWidget', '../widgets/GradientWidget.py'),
- ('TableWidget', '../widgets/TableWidget.py'),
+ #('TableWidget', '../widgets/TableWidget.py'),
('ColorButton', '../widgets/ColorButton.py'),
- ('CheckTable', '../widgets/CheckTable.py'),
- ('VerticalLabel', '../widgets/VerticalLabel.py'),
+ #('CheckTable', '../widgets/CheckTable.py'),
+ #('VerticalLabel', '../widgets/VerticalLabel.py'),
('JoystickButton', '../widgets/JoystickButton.py'),
])),
('ImageView', 'ImageView.py'),
('GraphicsScene', 'GraphicsScene.py'),
('Flowcharts', 'Flowchart.py'),
('ParameterTree', '../parametertree'),
- ('Canvas', '../canvas'),
- ('MultiPlotWidget', 'MultiPlotWidget.py'),
+ #('Canvas', '../canvas'),
+ #('MultiPlotWidget', 'MultiPlotWidget.py'),
])
path = os.path.abspath(os.path.dirname(__file__))
diff --git a/exporters/Exporter.py b/exporters/Exporter.py
index 1215e187..709926d4 100644
--- a/exporters/Exporter.py
+++ b/exporters/Exporter.py
@@ -115,7 +115,7 @@ class Exporter(object):
return preItems + rootItem + postItems
- def render(self, painter, sourcRect, targetRect, item=None):
+ def render(self, painter, targetRect, sourceRect, item=None):
#if item is None:
#item = self.item
--
GitLab