summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2020-08-27 10:39:04 +0200
committerDaniel Friesel <daniel.friesel@uos.de>2020-08-27 10:39:04 +0200
commite64ec4bd8eef73af8051a0c833a8576ff610f51a (patch)
tree075dd559434d5dd8a1e138351e877629a03e7b87 /bin
parent9aeb58cb7c64446d76c597641acbfe81e5156e47 (diff)
Make lzma dependency optional, improve help and CSV export
Diffstat (limited to 'bin')
-rwxr-xr-xbin/dlog-viewer44
1 files changed, 15 insertions, 29 deletions
diff --git a/bin/dlog-viewer b/bin/dlog-viewer
index 98773ae..a4f8ba8 100755
--- a/bin/dlog-viewer
+++ b/bin/dlog-viewer
@@ -3,10 +3,6 @@
"""dlog-viewer - View and Convert Keysight .dlog Files
-USAGE
-
-dlog-viewer [--csv-export <file.csv>] [--plot] [--stat] <file.dlog>
-
DESCRIPTION
dlog-viewer loads voltage, current, and/or power measurements from .dlog files
@@ -17,19 +13,10 @@ This program is not affiliated with Keysight and has not been thoroughly
tested yet. Use at your own risk.
OPTIONS
-
- --csv-export <file.csv>
- Export measurements as CSV to <file.csv>
- --plot
- Draw plots of voltage/current/power over time
- --stat
- Print mean voltage, current, and power
-
"""
import argparse
import csv
-import lzma
import matplotlib.pyplot as plt
import numpy as np
import os
@@ -75,6 +62,7 @@ class DLog:
with open(filename, "rb") as f:
if ".xz" in filename:
+ import lzma
f = lzma.open(f)
while line != "</dlog>\n":
@@ -157,6 +145,19 @@ class DLog:
def print_stats(dlog):
+ if dlog.duration_deviates:
+ print(
+ "Measurement duration: {:f} of {:d} seconds at {:f} µs per sample".format(
+ dlog.observed_duration, dlog.planned_duration, dlog.interval * 1000000
+ )
+ )
+ else:
+ print(
+ "Measurement duration: {:d} seconds at {:f} µs per sample".format(
+ dlog.planned_duration, dlog.interval * 1000000
+ )
+ )
+
for channel in dlog.channels:
min_data = np.min(channel.data)
max_data = np.max(channel.data)
@@ -245,7 +246,7 @@ def export_csv(dlog, filename):
with open(filename, "w", newline="") as f:
writer = csv.writer(f)
channel_header = list(
- map(lambda x: f"Slot {x.slot} {x.unit} ({x.smu})", dlog.channels)
+ map(lambda x: f"{x.smu} in slot {x.slot} [{x.unit}]", dlog.channels)
)
writer.writerow(["Timestamp [s]"] + channel_header)
for row in range(rows):
@@ -273,23 +274,8 @@ def main():
args = parser.parse_args()
- print(args)
-
dlog = DLog(args.dlog_file)
- if dlog.duration_deviates:
- print(
- "Measurement duration: {:f} of {:d} seconds at {:f} µs per sample".format(
- dlog.observed_duration, dlog.planned_duration, dlog.interval * 1000000
- )
- )
- else:
- print(
- "Measurement duration: {:d} seconds at {:f} µs per sample".format(
- dlog.planned_duration, dlog.interval * 1000000
- )
- )
-
if args.stat:
print_stats(dlog)