Merge branch 'develop' of https://github.com/SiLab-Bonn/pyqtgraph into SiLab-Bonn-develop

2016-01-02 10:11:05 -08:00 · 2016-01-02 10:11:05 -08:00 · 15ba9e67e6
commit 15ba9e67e6
parent 215b39a59d 37367c8ac5
1 changed files with 1 additions and 1 deletions
--- a/pyqtgraph/functions.py
+++ b/pyqtgraph/functions.py
@ -826,7 +826,7 @@ def rescaleData(data, scale, offset, dtype=None):
        #p = np.poly1d([scale, -offset*scale])
        #data = p(data).astype(dtype)
        d2 = data-offset
-        d2 *= scale
+        d2 = np.multiply(d2, scale)
        data = d2.astype(dtype)
    return data