From 3385aecdec8cbcf177ea23016c50099527c7cbed Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Fri, 8 Mar 2024 03:28:14 +0000 Subject: [PATCH] more formatting. --- docker/Dockerfile.waterfall | 2 ++ gamutrfwaterfall/gamutrfwaterfall/templates/base.html | 4 ++-- gamutrfwaterfall/gamutrfwaterfall/waterfall.py | 2 -- gamutrfwaterfall/tests/test_waterfall.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile.waterfall b/docker/Dockerfile.waterfall index 9ed587bd..fed5f6d8 100644 --- a/docker/Dockerfile.waterfall +++ b/docker/Dockerfile.waterfall @@ -45,6 +45,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y -q \ libev4 \ libcairo2 \ python3 +COPY --from=installer /root/bootstrap/dist/css/bootstrap.min.css /gamutrfwaterfall/static +COPY --from=installer /root/jquery/node_modules/jquery/dist/jquery.min.js /gamutrfwaterfall/static COPY --from=installer /root/.local /root/.local COPY --from=installer /usr/local /usr/local COPY --from=installer /gamutrflib /gamutrflib diff --git a/gamutrfwaterfall/gamutrfwaterfall/templates/base.html b/gamutrfwaterfall/gamutrfwaterfall/templates/base.html index 056773bd..564b99c3 100644 --- a/gamutrfwaterfall/gamutrfwaterfall/templates/base.html +++ b/gamutrfwaterfall/gamutrfwaterfall/templates/base.html @@ -2,9 +2,9 @@ {% block head %} {% block title %}GamutRF{% endblock title %} - + - + {% endblock head %} diff --git a/gamutrfwaterfall/gamutrfwaterfall/waterfall.py b/gamutrfwaterfall/gamutrfwaterfall/waterfall.py index cb199e86..081c0653 100644 --- a/gamutrfwaterfall/gamutrfwaterfall/waterfall.py +++ b/gamutrfwaterfall/gamutrfwaterfall/waterfall.py @@ -1280,11 +1280,9 @@ def serve_waterfall_img(self): return send_from_directory(self.tempdir, self.savefig_file) def config_form(self): - logging.info(f"\n\n{self.config_vars}\n\n") for var in self.config_vars: self.config_vars[var] = request.form.get(var, self.config_vars[var]) write_scanner_args(self.config_vars_path, self.config_vars) - logging.info(f"\n\n{self.config_vars}\n\n") reset = request.form.get("reset", None) if reset == "reset": reconf_query_str = "&".join( diff --git a/gamutrfwaterfall/tests/test_waterfall.py b/gamutrfwaterfall/tests/test_waterfall.py index 2958bc33..d59fd6aa 100755 --- a/gamutrfwaterfall/tests/test_waterfall.py +++ b/gamutrfwaterfall/tests/test_waterfall.py @@ -40,9 +40,9 @@ def read_buff(self, scan_fres): for i in range(rows) ] ) - df.loc[ - (df.freq >= self.peak_min) & (df.freq <= self.peak_max), "db" - ] = self.peak_val + df.loc[(df.freq >= self.peak_min) & (df.freq <= self.peak_max), "db"] = ( + self.peak_val + ) df["freq"] /= 1e6 self.serve_results = [ (