From 056a8a3289b04aa361ba4d0140d06c36b67b7cdb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 18:49:13 +0200
Subject: [PATCH] migrate waterfall settings away from tuples

---
 config_webrx.py     | 16 ++++++++--------
 htdocs/openwebrx.js |  4 ++--
 owrx/config.py      |  9 +++++++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index 1736cab..0508d7c 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -47,7 +47,7 @@ receiver_name = "[Callsign]"
 receiver_location = "Budapest, Hungary"
 receiver_asl = 200
 receiver_admin = "example@example.com"
-receiver_gps = { "lat": 47.000000, "lon": 19.000000)
+receiver_gps = {"lat": 47.000000, "lon": 19.000000}
 photo_title = "Panorama of Budapest from Schönherz Zoltán Dormitory"
 photo_desc = """
 You can add your own background photo and receiver information.<br />
@@ -254,21 +254,21 @@ sdrs = {
 waterfall_colors = [0x000000FF, 0x0000FFFF, 0x00FFFFFF, 0x00FF00FF, 0xFFFF00FF, 0xFF0000FF, 0xFF00FFFF, 0xFFFFFFFF]
 waterfall_min_level = -88  # in dB
 waterfall_max_level = -20
-waterfall_auto_level_margin = (5, 40)
+waterfall_auto_level_margin = {"min": 5, "max": 40}
 ### old theme by HA7ILM:
 # waterfall_colors = "[0x000000ff,0x2e6893ff, 0x69a5d0ff, 0x214b69ff, 0x9dc4e0ff,  0xfff775ff, 0xff8a8aff, 0xb20000ff]"
 # waterfall_min_level = -115 #in dB
 # waterfall_max_level = 0
-# waterfall_auto_level_margin = (20, 30)
+# waterfall_auto_level_margin = {"min": 20, "max": 30}
 ##For the old colors, you might also want to set [fft_voverlap_factor] to 0.
 
 # Note: When the auto waterfall level button is clicked, the following happens:
-#   [waterfall_min_level] = [current_min_power_level] - [waterfall_auto_level_margin[0]]
-#   [waterfall_max_level] = [current_max_power_level] + [waterfall_auto_level_margin[1]]
+#   [waterfall_min_level] = [current_min_power_level] - [waterfall_auto_level_margin["min"]]
+#   [waterfall_max_level] = [current_max_power_level] + [waterfall_auto_level_margin["max"]]
 #
-#   ___|____________________________________|____________________________________|____________________________________|___> signal power
-#        \_waterfall_auto_level_margin[0]_/ |__ current_min_power_level          | \_waterfall_auto_level_margin[1]_/
-#                                                      current_max_power_level __|
+#   ___|________________________________________|____________________________________|________________________________________|___> signal power
+#        \_waterfall_auto_level_margin["min"]_/ |__ current_min_power_level          | \_waterfall_auto_level_margin["max"]_/
+#                                                          current_max_power_level __|
 
 # === Experimental settings ===
 # Warning! The settings below are very experimental.
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 6029463..52770c6 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -171,8 +171,8 @@ function waterfallColorsDefault() {
 }
 
 function waterfallColorsAuto() {
-    e("openwebrx-waterfall-color-min").value = (waterfall_measure_minmax_min - waterfall_auto_level_margin[0]).toString();
-    e("openwebrx-waterfall-color-max").value = (waterfall_measure_minmax_max + waterfall_auto_level_margin[1]).toString();
+    e("openwebrx-waterfall-color-min").value = (waterfall_measure_minmax_min - waterfall_auto_level_margin.min).toString();
+    e("openwebrx-waterfall-color-max").value = (waterfall_measure_minmax_max + waterfall_auto_level_margin.max).toString();
     updateWaterfallColors(0);
 }
 
diff --git a/owrx/config.py b/owrx/config.py
index 10f0dd7..4aa1c8e 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -29,8 +29,13 @@ class ConfigMigrator(ABC):
 
 class ConfigMigratorVersion1(ConfigMigrator):
     def migrate(self, config):
-        gps = config["receiver_gps"]
-        config["receiver_gps"] = {"lat": gps[0], "lon": gps[1]}
+        if "receiver_gps" in config:
+            gps = config["receiver_gps"]
+            config["receiver_gps"] = {"lat": gps[0], "lon": gps[1]}
+
+        if "waterfall_auto_level_margin" in config:
+            levels = config["waterfall_auto_level_margin"]
+            config["waterfall_auto_level_margin"] = {"min": levels[0], "max": levels[1]}
 
         config["version"] = 2
         return config