From 4c6b0def2da27635e593192ba1a2a604a824f6ab Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Thu, 18 Mar 2021 22:12:59 +0100
Subject: [PATCH] show an error message when a power plot request cannot be
fulfilled
---
bin/dlog-viewer | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/bin/dlog-viewer b/bin/dlog-viewer
index 7600446..fd5b923 100755
--- a/bin/dlog-viewer
+++ b/bin/dlog-viewer
@@ -583,11 +583,17 @@ def main():
export_json(dlog, args.json_export, extra_data)
if args.plot:
- if args.plot == "P" and dlog.all_data_slots_have_power():
- if args.pelt:
- show_power_plot(dlog, changepoints)
+ if args.plot == "P":
+ if dlog.all_data_slots_have_power():
+ if args.pelt:
+ show_power_plot(dlog, changepoints)
+ else:
+ show_power_plot(dlog)
else:
- show_power_plot(dlog)
+ print(
+ "Error: power plot requested, but neither power nor voltage*current readings present.",
+ file=sys.stderr,
+ )
elif args.plot == "all":
show_raw_plot(dlog)
else:
--
GitLab