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

Correctly include SI units for log AxisItems (#972)

Browse Source
This commit is contained in:
2xB 2019-09-13 06:58:49 +02:00 committed by Ogi Moore
parent bfd36dc203
commit 061a30e827
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pyqtgraph/graphicsItems/AxisItem.py
View File

@ -444,7 +444,11 @@ class AxisItem(GraphicsWidget):
def updateAutoSIPrefix(self):
if self.label.isVisible():
(scale, prefix) = fn.siScale(max(abs(self.range[0]*self.scale), abs(self.range[1]*self.scale)))
if self.logMode:
_range = 10**np.array(self.range)
else:
_range = self.range
(scale, prefix) = fn.siScale(max(abs(_range[0]*self.scale), abs(_range[1]*self.scale)))
if self.labelUnits == '' and prefix in ['k', 'm']: ## If we are not showing units, wait until 1e6 before scaling.
scale = 1.0
prefix = ''
@ -771,7 +775,7 @@ class AxisItem(GraphicsWidget):
return strings
def logTickStrings(self, values, scale, spacing):
return ["%0.1g"%x for x in 10 ** np.array(values).astype(float)]
return ["%0.1g"%x for x in 10 ** np.array(values).astype(float) * np.array(scale)]
def generateDrawSpecs(self, p):
"""