diff options
| author | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2021-12-01 23:23:06 -0500 |
|---|---|---|
| committer | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2021-12-01 23:23:06 -0500 |
| commit | 5a3818857cf8b9ce7aa9ca66fef40e5cfa45f0ee (patch) | |
| tree | 5847bf8c727ec9ff17fbde084f4fa6f628ecad55 | |
| parent | 9f1c2db9d296dc17f86e1f22634a14063b1d0a72 (diff) | |
| download | qolab-5a3818857cf8b9ce7aa9ca66fef40e5cfa45f0ee.tar.gz qolab-5a3818857cf8b9ce7aa9ca66fef40e5cfa45f0ee.zip | |
redo DataTrace naming
| -rw-r--r-- | data/trace.py (renamed from datatrace.py) | 2 | ||||
| -rw-r--r-- | hardware/scope/sds1104x.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/datatrace.py b/data/trace.py index 7398695..9b14264 100644 --- a/datatrace.py +++ b/data/trace.py @@ -1,5 +1,5 @@ -class DataTrace: +class Trace: def __init__(self, descrStr): self.descr = descrStr self.x = None diff --git a/hardware/scope/sds1104x.py b/hardware/scope/sds1104x.py index 23ac1be..b1bbc11 100644 --- a/hardware/scope/sds1104x.py +++ b/hardware/scope/sds1104x.py @@ -4,7 +4,7 @@ Created by Eugeniy E. Mikhailov 2021/11/29 """ from hardware.scope import ScopeSCPI -from datatrace import DataTrace +from data.trace import Trace import re import numpy as np @@ -154,7 +154,7 @@ class SDS1104X(ScopeSCPI): def getTrace(self, chNum, availableNpnts=None, maxRequiredPoints=None): wfVoltage, availableNpnts = self.getWaveform( chNum, availableNpnts=availableNpnts, maxRequiredPoints=maxRequiredPoints) t = self.getTimeTrace(availableNpnts=availableNpnts, maxRequiredPoints=maxRequiredPoints) - tr = DataTrace( f'Ch{chNum}' ) + tr = Trace( f'Ch{chNum}' ) tr.xlabel = 'Time' tr.xunit = 'S' tr.ylabel = 'Voltage' |