diff options
| author | Daniel Friesel <daniel.friesel@uos.de> | 2020-10-16 13:58:20 +0200 |
|---|---|---|
| committer | Daniel Friesel <daniel.friesel@uos.de> | 2020-10-16 13:58:20 +0200 |
| commit | 81082d00444d3bfd644f2417ef5c1a34d9569a28 (patch) | |
| tree | 613ddc91d6aeaa551062260e907e47f813d18bff /lib/loader.py | |
| parent | f5125e191ab1db62e4167b00f809dba20bc54b6f (diff) | |
Code aus Lennarts BA-repo
Diffstat (limited to 'lib/loader.py')
| -rw-r--r-- | lib/loader.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/loader.py b/lib/loader.py index fcd5490..568c98c 100644 --- a/lib/loader.py +++ b/lib/loader.py @@ -1638,8 +1638,8 @@ class EnergyTraceWithLogicAnalyzer: self.errors = list() def load_data(self, log_data): - from data.timing.SigrokInterface import SigrokResult - from data.energy.EnergyInterface import EnergyInterface + from dfatool.lennart.SigrokInterface import SigrokResult + from dfatool.lennart.EnergyInterface import EnergyInterface # Daten laden self.sync_data = SigrokResult.fromString(log_data[0]) @@ -1677,7 +1677,7 @@ class EnergyTraceWithLogicAnalyzer: for state_or_transition in trace["trace"]: names.append(state_or_transition["name"]) # print(names[:15]) - from data.processing.DataProcessor import DataProcessor + from dfatool.lennart.DataProcessor import DataProcessor dp = DataProcessor(sync_data=self.sync_data, energy_data=self.energy_data) dp.run() @@ -1741,8 +1741,8 @@ class EnergyTraceWithTimer(EnergyTraceWithLogicAnalyzer): super().__init__(voltage, state_duration, transition_names, with_traces) def load_data(self, log_data): - from data.timing.SigrokInterface import SigrokResult - from data.energy.EnergyInterface import EnergyInterface + from dfatool.lennart.SigrokInterface import SigrokResult + from dfatool.lennart.EnergyInterface import EnergyInterface # Daten laden self.sync_data = None @@ -1751,7 +1751,7 @@ class EnergyTraceWithTimer(EnergyTraceWithLogicAnalyzer): pass def analyze_states(self, traces, offline_index: int): - from data.timing.SigrokInterface import SigrokResult + from dfatool.lennart.SigrokInterface import SigrokResult self.sync_data = SigrokResult.fromTraces(traces) return super().analyze_states(traces, offline_index) |