Fix filter and threshold values not loading correctly

package.json

@@ -1,6 +1,6 @@
 {
   "name": "AudioMoth-Config",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "The configuration app for the AudioMoth acoustic monitoring device.",
   "main": "main.js",
   "author": "openacousticdevices.info",

settings/uiFiltering.js

@@ -144,6 +144,22 @@ function updateFilterLabel () {
 
 }
 
+function calculateSliderPosition (thresholdValue) {
+
+    if (!compressionThresholdValues) calculateCompressionThresholdValues();
+
+    for (let i = 0; i < compressionThresholdValues.length; i++) {
+
+        if (compressionThresholdValues[i] === thresholdValue) {
+
+            return i * 32768 / (compressionThresholdValues.length - 1);
+
+        }
+
+    }
+
+}
+
 function calculateCompressionThresholdValues () {
 
     var i, j, step;
@@ -213,11 +229,11 @@ exports.setFilters = function (enabled, lowerSliderValue, higherSliderValue, fil
         switch (filterType) {
 
         case FILTER_LOW:
-            setLowPassSliderValue(lowerSliderValue);
+            setLowPassSliderValue(higherSliderValue);
             break;
 
         case FILTER_HIGH:
-            setHighPassSliderValue(higherSliderValue);
+            setHighPassSliderValue(lowerSliderValue);
             break;
 
         case FILTER_BAND:
@@ -226,22 +242,23 @@ exports.setFilters = function (enabled, lowerSliderValue, higherSliderValue, fil
 
         }
 
-        updateFilterLabel();
-
         for (i = 0; i < filterRadioButtons.length; i++) {
 
             filterRadioButtons[i].checked = (i === filterType);
 
         }
 
+        updateFilterLabel();
+
     }
 
 };
 
 exports.setAmplitudeThreshold = function (enabled, amplitudeThreshold) {
 
     amplitudeThresholdingCheckbox.checked = enabled;
-    amplitudeThresholdingSlider.setValue(amplitudeThreshold);
+
+    amplitudeThresholdingSlider.setValue(calculateSliderPosition(amplitudeThreshold));
 
 };
 
@@ -381,8 +398,6 @@ function updateFilterUI () {
         highPassMaxLabel.style.color = '';
         highPassMinLabel.style.color = '';
 
-        updateFilterSliders();
-        updateFilterLabel();
         filterLabel.style.color = '';
 
     } else {
@@ -410,8 +425,6 @@ function updateFilterUI () {
         filterLabel.textContent = 'Recordings will not be filtered.';
         filterLabel.style.color = 'grey';
 
-        updateFilterSliders();
-
     }
 
 }
@@ -486,7 +499,13 @@ function addRadioButtonListeners () {
 
     for (i = 0; i < filterRadioButtons.length; i++) {
 
-        filterRadioButtons[i].addEventListener('change', updateFilterUI);
+        filterRadioButtons[i].addEventListener('change', function () {
+
+            updateFilterUI();
+            updateFilterSliders();
+            updateFilterLabel();
+
+        });
 
     }
 
@@ -499,7 +518,12 @@ exports.prepareUI = function (changeFunction) {
     updateLifeDisplayOnChange = changeFunction;
 
     amplitudeThresholdingCheckbox.addEventListener('change', updateAmplitudeThresholdingUI);
-    filterCheckbox.addEventListener('change', updateFilterUI);
+    filterCheckbox.addEventListener('change', function () {
+
+        updateFilterUI();
+        updateFilterLabel();
+
+    });
 
     addRadioButtonListeners();
 

settings/uiSettings.js

@@ -139,7 +139,7 @@ exports.fillUI = function (settings) {
     uiFiltering.setFilters(settings.passFiltersEnabled, settings.lowerFilter, settings.higherFilter, settings.filterType);
     uiFiltering.updateFilterUI();
 
-    uiFiltering.setAmplitudeThreshold(settings.amplitudeThresholding, settings.amplitudeThreshold);
+    uiFiltering.setAmplitudeThreshold(settings.amplitudeThresholdingEnabled, settings.amplitudeThreshold);
     uiFiltering.updateAmplitudeThresholdingUI();
 
     durationInput.setValue(sleepDurationInput, settings.sleepDuration);