From 985aa8c8bb731f3bb7b0a0e3f0dac51fd0c669eb Mon Sep 17 00:00:00 2001 From: iejMac <61431446+iejMac@users.noreply.github.com> Date: Wed, 24 Feb 2021 22:50:27 -0800 Subject: [PATCH] working with snap (#20155) * changes * fixes * Update tools/plotjuggler/juggle.py Co-authored-by: Adeeb Shihadeh Co-authored-by: Adeeb Shihadeh old-commit-hash: 90ba43676ad34f0e676846013d7fea3263f0409c --- tools/plotjuggler/install.sh | 7 ++++--- tools/plotjuggler/juggle.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/plotjuggler/install.sh b/tools/plotjuggler/install.sh index b97bbf0408..3ad244f751 100755 --- a/tools/plotjuggler/install.sh +++ b/tools/plotjuggler/install.sh @@ -1,5 +1,6 @@ #!/bin/bash -e -wget https://github.com/commaai/PlotJuggler/releases/download/latest/bin.tar.gz -tar -xf bin.tar.gz -rm bin.tar.gz +sudo snap install plotjuggler +wget https://github.com/commaai/PlotJuggler/releases/download/latest/libDataLoadRlog.so.tar.gz +tar -xf libDataLoadRlog.so.tar.gz +rm libDataLoadRlog.so.tar.gz diff --git a/tools/plotjuggler/juggle.py b/tools/plotjuggler/juggle.py index fc03116bba..831180eb77 100755 --- a/tools/plotjuggler/juggle.py +++ b/tools/plotjuggler/juggle.py @@ -11,6 +11,7 @@ from selfdrive.test.process_replay.compare_logs import save_log from tools.lib.route import Route from tools.lib.logreader import LogReader +juggle_dir = os.path.dirname(os.path.realpath(__file__)) def load_segment(segment_name): print(f"Loading {segment_name}") @@ -30,8 +31,7 @@ def juggle_file(fn, dbc=None): if dbc: env["DBC_NAME"] = dbc - juggle_dir = os.path.dirname(os.path.realpath(__file__)) - subprocess.call(f"bin/plotjuggler -d {fn}", shell=True, env=env, cwd=juggle_dir) + subprocess.call(f"plotjuggler --plugin_folders {juggle_dir} -d {fn}", shell=True, env=env, cwd=juggle_dir) def juggle_route(route_name, segment_number, qlog): r = Route(route_name) @@ -65,7 +65,7 @@ def juggle_route(route_name, segment_number, qlog): pass break - tempfile = NamedTemporaryFile(suffix='.rlog') + tempfile = NamedTemporaryFile(suffix='.rlog', dir=juggle_dir) save_log(tempfile.name, all_data, compress=False) del all_data