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

merge with inp

Browse Source
This commit is contained in:
Luke Campagnola 2013-05-13 14:48:16 -04:00
commit 017adec032
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyqtgraph/imageview/ImageView.py
View File

@ -209,7 +209,7 @@ class ImageView(QtGui.QWidget):
*pos* Change the position of the displayed image *pos* Change the position of the displayed image
*scale* Change the scale of the displayed image *scale* Change the scale of the displayed image
*transform* Set the transform of the dispalyed image. This option overrides *pos* *transform* Set the transform of the displayed image. This option overrides *pos*
and *scale*. and *scale*.
============== ======================================================================= ============== =======================================================================
""" """
@ -271,8 +271,9 @@ class ImageView(QtGui.QWidget):
if levels is None and autoLevels: if levels is None and autoLevels:
self.autoLevels() self.autoLevels()
if levels is not None: ## this does nothing since getProcessedImage sets these values again. if levels is not None: ## this does nothing since getProcessedImage sets these values again.
self.levelMax = levels[1] #self.levelMax = levels[1]
self.levelMin = levels[0] #self.levelMin = levels[0]
self.setLevels(*levels)
if self.ui.roiBtn.isChecked(): if self.ui.roiBtn.isChecked():
self.roiChanged() self.roiChanged()

6
pyqtgraph/parametertree/ParameterItem.py
View File

@ -157,3 +157,9 @@ class ParameterItem(QtGui.QTreeWidgetItem):
## since destroying the menu in mid-action will cause a crash. ## since destroying the menu in mid-action will cause a crash.
QtCore.QTimer.singleShot(0, self.param.remove) QtCore.QTimer.singleShot(0, self.param.remove)
## for python 3 support, we need to redefine hash and eq methods.
def __hash__(self):
return id(self)
def __eq__(self, x):
return x is self

2
pyqtgraph/widgets/SpinBox.py
View File

@ -313,7 +313,7 @@ class SpinBox(QtGui.QAbstractSpinBox):
s = [D(-1), D(1)][n >= 0] ## determine sign of step s = [D(-1), D(1)][n >= 0] ## determine sign of step
val = self.val val = self.val
for i in range(abs(n)): for i in range(int(abs(n))):
if self.opts['log']: if self.opts['log']:
raise Exception("Log mode no longer supported.") raise Exception("Log mode no longer supported.")