From e0e0dd550bd146b466d1a1fed9216dbfd45c5ef6 Mon Sep 17 00:00:00 2001 From: afwilkin Date: Mon, 30 Oct 2023 06:10:49 -0700 Subject: [PATCH 1/6] adding option for download in qgc format --- app/tornado_handlers/download.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/tornado_handlers/download.py b/app/tornado_handlers/download.py index 5d414021d..229880c7d 100644 --- a/app/tornado_handlers/download.py +++ b/app/tornado_handlers/download.py @@ -68,11 +68,24 @@ def get_original_filename(default_value, new_file_suffix): self.set_header("Content-Type", "text/plain") self.set_header('Content-Disposition', 'inline; filename=params.txt') - delimiter = ', ' + delimiter = ' ' for param_key in param_keys: + self.write("1") + self.write(delimiter) + self.write("1") + self.write(delimiter) self.write(param_key) self.write(delimiter) self.write(str(ulog.initial_parameters[param_key])) + + #if the value is an int write a 6, if not write a 9 + if(type(ulog.initial_parameters[param_key]) == int): + self.write(delimiter) + self.write("6") + else: + self.write(delimiter) + self.write("9") + self.write('\n') elif download_type == '2': # download the kml file From b23da9b9d53a5f83c7ca4a5fac3a009f57950e92 Mon Sep 17 00:00:00 2001 From: afwilkin Date: Wed, 1 Nov 2023 16:55:36 -0700 Subject: [PATCH 2/6] adding QGC compatible parameters --- app/plot_app/templates/header.html | 2 + app/tornado_handlers/download.py | 85 ++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 15 deletions(-) diff --git a/app/plot_app/templates/header.html b/app/plot_app/templates/header.html index d7228fd09..8cb0679bc 100644 --- a/app/plot_app/templates/header.html +++ b/app/plot_app/templates/header.html @@ -56,7 +56,9 @@

Log File Parameters + Parameters (QGC) Parameters (non-default) + Parameters (non-default - QGC) {% if has_position_data %} KML Track {% endif %} diff --git a/app/tornado_handlers/download.py b/app/tornado_handlers/download.py index 229880c7d..3d7024328 100644 --- a/app/tornado_handlers/download.py +++ b/app/tornado_handlers/download.py @@ -60,7 +60,6 @@ def get_original_filename(default_value, new_file_suffix): print("DB access failed:", sys.exc_info()[0], sys.exc_info()[1]) return default_value - if download_type == '1': # download the parameters ulog = load_ulog_file(log_file_name) param_keys = sorted(ulog.initial_parameters.keys()) @@ -68,24 +67,11 @@ def get_original_filename(default_value, new_file_suffix): self.set_header("Content-Type", "text/plain") self.set_header('Content-Disposition', 'inline; filename=params.txt') - delimiter = ' ' + delimiter = ', ' for param_key in param_keys: - self.write("1") - self.write(delimiter) - self.write("1") - self.write(delimiter) self.write(param_key) self.write(delimiter) self.write(str(ulog.initial_parameters[param_key])) - - #if the value is an int write a 6, if not write a 9 - if(type(ulog.initial_parameters[param_key]) == int): - self.write(delimiter) - self.write("6") - else: - self.write(delimiter) - self.write("9") - self.write('\n') elif download_type == '2': # download the kml file @@ -168,6 +154,75 @@ def kml_colors(flight_mode): except: pass + elif download_type == '4': # download QGC parameters + ulog = load_ulog_file(log_file_name) + param_keys = sorted(ulog.initial_parameters.keys()) + + self.set_header("Content-Type", "text/plain") + self.set_header('Content-Disposition', 'inline; filename=vehicle.params') + + delimiter = ' ' + for param_key in param_keys: + self.write("1") + self.write(delimiter) + self.write("1") + self.write(delimiter) + self.write(param_key) + self.write(delimiter) + self.write(str(ulog.initial_parameters[param_key])) + + #if the value is an int write a 6, if not write a 9 + if(type(ulog.initial_parameters[param_key]) == int): + self.write(delimiter) + self.write("6") + else: + self.write(delimiter) + self.write("9") + + self.write('\n') + + elif download_type == '5': # download non-default parameters for QGC + ulog = load_ulog_file(log_file_name) + param_keys = sorted(ulog.initial_parameters.keys()) + + self.set_header("Content-Type", "text/plain") + self.set_header('Content-Disposition', 'inline; filename=vehicle-nondefault.params') + delimiter = ' ' + + # Use defaults from log if available + if ulog.has_default_parameters: + system_defaults = ulog.get_default_parameters(0) + airframe_defaults = ulog.get_default_parameters(1) + for param_key in param_keys: + try: + param_value = ulog.initial_parameters[param_key] + is_default = True + if param_key in airframe_defaults: + is_default = param_value == airframe_defaults[param_key] + elif param_key in system_defaults: + is_default = param_value == system_defaults[param_key] + + if not is_default: + self.write("1") + self.write(delimiter) + self.write("1") + self.write(delimiter) + self.write(param_key) + self.write(delimiter) + self.write(str(ulog.initial_parameters[param_key])) + + #if the value is an int write a 6, if not write a 9 + if(type(ulog.initial_parameters[param_key]) == int): + self.write(delimiter) + self.write("6") + else: + self.write(delimiter) + self.write("9") + + self.write('\n') + except: + pass + else: default_params = get_default_parameters() From 250e0033ab0e6cda1a732b02ec4b4dc46e2b1fd7 Mon Sep 17 00:00:00 2001 From: afwilkin Date: Wed, 1 Nov 2023 17:14:34 -0700 Subject: [PATCH 3/6] using wrong parameter for non-defualt qgc --- app/tornado_handlers/download.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tornado_handlers/download.py b/app/tornado_handlers/download.py index 3d7024328..4afd02da6 100644 --- a/app/tornado_handlers/download.py +++ b/app/tornado_handlers/download.py @@ -209,10 +209,10 @@ def kml_colors(flight_mode): self.write(delimiter) self.write(param_key) self.write(delimiter) - self.write(str(ulog.initial_parameters[param_key])) + self.write(str(param_value)) #if the value is an int write a 6, if not write a 9 - if(type(ulog.initial_parameters[param_key]) == int): + if(type(param_value) == int): self.write(delimiter) self.write("6") else: From e51759b7c0035703a0689b231b0581fcd7bed2f9 Mon Sep 17 00:00:00 2001 From: afwilkin Date: Fri, 24 Nov 2023 19:01:24 -0800 Subject: [PATCH 4/6] added download files and fixed PR comments --- app/plot_app/templates/header.html | 2 - app/tornado_handlers/download.py | 81 ++++++++---------------------- 2 files changed, 20 insertions(+), 63 deletions(-) diff --git a/app/plot_app/templates/header.html b/app/plot_app/templates/header.html index 8cb0679bc..d7228fd09 100644 --- a/app/plot_app/templates/header.html +++ b/app/plot_app/templates/header.html @@ -56,9 +56,7 @@

Log File Parameters - Parameters (QGC) Parameters (non-default) - Parameters (non-default - QGC) {% if has_position_data %} KML Track {% endif %} diff --git a/app/tornado_handlers/download.py b/app/tornado_handlers/download.py index 4afd02da6..497ba1e5b 100644 --- a/app/tornado_handlers/download.py +++ b/app/tornado_handlers/download.py @@ -64,14 +64,28 @@ def get_original_filename(default_value, new_file_suffix): ulog = load_ulog_file(log_file_name) param_keys = sorted(ulog.initial_parameters.keys()) - self.set_header("Content-Type", "text/plain") - self.set_header('Content-Disposition', 'inline; filename=params.txt') + self.set_header('Content-Type', 'application/octet-stream') + self.set_header("Content-Description", "File Transfer") + self.set_header('Content-Disposition', 'attachment; filename=vehicle.params') - delimiter = ', ' + delimiter = ' ' for param_key in param_keys: + self.write("1") #sysid + self.write(delimiter) + self.write("1") #compid + self.write(delimiter) self.write(param_key) self.write(delimiter) self.write(str(ulog.initial_parameters[param_key])) + + #if the value is an int write a 6, if not write a 9 + if(type(ulog.initial_parameters[param_key]) == int): + self.write(delimiter) + self.write("6") + else: + self.write(delimiter) + self.write("9") + self.write('\n') elif download_type == '2': # download the kml file @@ -129,64 +143,9 @@ def kml_colors(flight_mode): ulog = load_ulog_file(log_file_name) param_keys = sorted(ulog.initial_parameters.keys()) - self.set_header("Content-Type", "text/plain") - self.set_header('Content-Disposition', 'inline; filename=params.txt') - delimiter = ', ' - - # Use defaults from log if available - if ulog.has_default_parameters: - system_defaults = ulog.get_default_parameters(0) - airframe_defaults = ulog.get_default_parameters(1) - for param_key in param_keys: - try: - param_value = ulog.initial_parameters[param_key] - is_default = True - if param_key in airframe_defaults: - is_default = param_value == airframe_defaults[param_key] - elif param_key in system_defaults: - is_default = param_value == system_defaults[param_key] - - if not is_default: - self.write(param_key) - self.write(delimiter) - self.write(str(param_value)) - self.write('\n') - except: - pass - - elif download_type == '4': # download QGC parameters - ulog = load_ulog_file(log_file_name) - param_keys = sorted(ulog.initial_parameters.keys()) - - self.set_header("Content-Type", "text/plain") - self.set_header('Content-Disposition', 'inline; filename=vehicle.params') - - delimiter = ' ' - for param_key in param_keys: - self.write("1") - self.write(delimiter) - self.write("1") - self.write(delimiter) - self.write(param_key) - self.write(delimiter) - self.write(str(ulog.initial_parameters[param_key])) - - #if the value is an int write a 6, if not write a 9 - if(type(ulog.initial_parameters[param_key]) == int): - self.write(delimiter) - self.write("6") - else: - self.write(delimiter) - self.write("9") - - self.write('\n') - - elif download_type == '5': # download non-default parameters for QGC - ulog = load_ulog_file(log_file_name) - param_keys = sorted(ulog.initial_parameters.keys()) - - self.set_header("Content-Type", "text/plain") - self.set_header('Content-Disposition', 'inline; filename=vehicle-nondefault.params') + self.set_header('Content-Type', 'application/octet-stream') + self.set_header("Content-Description", "File Transfer") + self.set_header('Content-Disposition', 'attachment; filename=non-default.params') delimiter = ' ' # Use defaults from log if available From 142cbc8bfdfe28b8d5a98886399d0751c030f07a Mon Sep 17 00:00:00 2001 From: afwilkin Date: Sun, 3 Dec 2023 20:12:56 -0800 Subject: [PATCH 5/6] formatting changes --- README.md | 2 ++ app/tornado_handlers/download.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d762ae1cb..7675cca96 100644 --- a/README.md +++ b/README.md @@ -208,3 +208,5 @@ chmod u+x init-letsencrypt.sh ## Contributing Contributions are welcome! Just open a pull request with detailed description why the changes are needed, or open an issue for bugs, feature requests, etc... + +Feel free to run `./run_pylint.sh` before PR to ensure CICD checks pass on your code. diff --git a/app/tornado_handlers/download.py b/app/tornado_handlers/download.py index 497ba1e5b..df1f8dca0 100644 --- a/app/tornado_handlers/download.py +++ b/app/tornado_handlers/download.py @@ -79,7 +79,7 @@ def get_original_filename(default_value, new_file_suffix): self.write(str(ulog.initial_parameters[param_key])) #if the value is an int write a 6, if not write a 9 - if(type(ulog.initial_parameters[param_key]) == int): + if isinstance(ulog.initial_parameters[param_key]) == int: self.write(delimiter) self.write("6") else: @@ -171,7 +171,7 @@ def kml_colors(flight_mode): self.write(str(param_value)) #if the value is an int write a 6, if not write a 9 - if(type(param_value) == int): + if isinstance(param_value) == int: self.write(delimiter) self.write("6") else: From 52da3f9af10500b56bcd27be8f922fe790a9c0c4 Mon Sep 17 00:00:00 2001 From: afwilkin Date: Sun, 3 Dec 2023 20:17:35 -0800 Subject: [PATCH 6/6] correct implementation of isinstance --- app/tornado_handlers/download.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tornado_handlers/download.py b/app/tornado_handlers/download.py index df1f8dca0..484c5a2a6 100644 --- a/app/tornado_handlers/download.py +++ b/app/tornado_handlers/download.py @@ -79,7 +79,7 @@ def get_original_filename(default_value, new_file_suffix): self.write(str(ulog.initial_parameters[param_key])) #if the value is an int write a 6, if not write a 9 - if isinstance(ulog.initial_parameters[param_key]) == int: + if isinstance(ulog.initial_parameters[param_key], int): self.write(delimiter) self.write("6") else: @@ -171,7 +171,7 @@ def kml_colors(flight_mode): self.write(str(param_value)) #if the value is an int write a 6, if not write a 9 - if isinstance(param_value) == int: + if isinstance(param_value, int): self.write(delimiter) self.write("6") else: