more formatting.

IQTLabs · Mar 8, 2024 · 3385aec · 3385aec
1 parent 06353f8
commit 3385aec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -2,9 +2,9 @@
     <head>
 	{% block head %}
 	<title>{% block title %}GamutRF{% endblock title %}</title>
-	<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+	<link rel="stylesheet" href="{{ url_for('static',filename='bootstrap.min.css') }}">
 	<link rel="stylesheet" type="text/css" href="{{ url_for('static',filename='styles/gamutrf.css') }}">
-	<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+	<script src="{{ url_for('static',filename='jquery.min.js') }}"></script>
 	{% endblock head %}
     </head>
     <body>

diff --git 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
@@ -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 = [
                 (