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

bugfix for view linking, example update

Browse Source
This commit is contained in:
Luke Campagnola 2012-03-23 02:42:32 -04:00
parent 1489643a30
commit 3b2ef16071
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/linkedViews.py
View File

@ -35,7 +35,7 @@ win.nextRow()
p3 = win.addPlot(x=x, y=y, name="Plot3", title="Plot3 - X linked with Plot1") p3 = win.addPlot(x=x, y=y, name="Plot3", title="Plot3 - X linked with Plot1")
p4 = win.addPlot(x=x, y=y, name="Plot4", title="Plot4 - X and Y linked with Plot1") p4 = win.addPlot(x=x, y=y, name="Plot4", title="Plot4 - X and Y linked with Plot1")
p3.setLabel('left', "Label to test offset") p3.setLabel('left', "Label to test offset")
QtGui.QApplication.processEvents() #QtGui.QApplication.processEvents()
p3.setXLink(p1) p3.setXLink(p1)
p4.setXLink(p1) p4.setXLink(p1)
p4.setYLink(p1) p4.setYLink(p1)

8
graphicsItems/ViewBox/ViewBox.py
View File

@ -101,8 +101,8 @@ class ViewBox(GraphicsWidget):
self.rbScaleBox = QtGui.QGraphicsRectItem(0, 0, 1, 1) self.rbScaleBox = QtGui.QGraphicsRectItem(0, 0, 1, 1)
self.rbScaleBox.setPen(fn.mkPen((255,0,0), width=1)) self.rbScaleBox.setPen(fn.mkPen((255,0,0), width=1))
self.rbScaleBox.setBrush(fn.mkBrush(255,255,0,100)) self.rbScaleBox.setBrush(fn.mkBrush(255,255,0,100))
self.addItem(self.rbScaleBox)
self.rbScaleBox.hide() self.rbScaleBox.hide()
self.addItem(self.rbScaleBox)
self.axHistory = [] # maintain a history of zoom locations self.axHistory = [] # maintain a history of zoom locations
self.axHistoryPointer = -1 # pointer into the history. Allows forward/backward movement, not just "undo" self.axHistoryPointer = -1 # pointer into the history. Allows forward/backward movement, not just "undo"
@ -218,6 +218,8 @@ class ViewBox(GraphicsWidget):
self.updateAutoRange() self.updateAutoRange()
self.updateMatrix() self.updateMatrix()
self.sigStateChanged.emit(self) self.sigStateChanged.emit(self)
#self.linkedXChanged()
#self.linkedYChanged()
def viewRange(self): def viewRange(self):
return [x[:] for x in self.state['viewRange']] ## return copy return [x[:] for x in self.state['viewRange']] ## return copy
@ -467,7 +469,7 @@ class ViewBox(GraphicsWidget):
if view is not None: if view is not None:
getattr(view, signal).connect(slot) getattr(view, signal).connect(slot)
if view.autoRangeEnabled()[axis] is True: if view.autoRangeEnabled()[axis] is not False:
self.enableAutoRange(axis, False) self.enableAutoRange(axis, False)
slot() slot()
else: else:
@ -491,7 +493,7 @@ class ViewBox(GraphicsWidget):
def linkedViewChanged(self, view, axis): def linkedViewChanged(self, view, axis):
if self.linksBlocked: if self.linksBlocked or view is None:
return return
vr = view.viewRect() vr = view.viewRect()