Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

plotjuggler: fix layout param #23348

Merged
merged 1 commit into from
Jan 2, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/plotjuggler/juggle.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ def start_juggler(fn=None, dbc=None, layout=None):

extra_args = ""
if fn is not None:
extra_args += f"-d {fn}"
extra_args += f" -d {fn}"
if layout is not None:
extra_args += f"-l {layout}"
extra_args += f" -l {layout}"

subprocess.call(f'plotjuggler --plugin_folders {INSTALL_DIR} {extra_args}',
shell=True, env=env, cwd=juggle_dir)
cmd = f'plotjuggler --plugin_folders {INSTALL_DIR}{extra_args}'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove the space between INSTALL_DIR and extra_args?

Copy link
Member Author

@gregjhogan gregjhogan Jan 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because then we have a trailing space with no extra params or two spaces before the first param when there are extra params

subprocess.call(cmd, shell=True, env=env, cwd=juggle_dir)


def juggle_route(route_name, segment_number, segment_count, qlog, can, layout):
Expand Down