remove option to include Sunrise data

Also clean up commented code.
QutEcoacoustics · Mar 25, 2019 · 21d8925 · 21d8925
1 parent b9fe5db
commit 21d8925
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 46 deletions.
diff --git a/src/AudioAnalysisTools/Indices/IndexDisplay.cs b/src/AudioAnalysisTools/Indices/IndexDisplay.cs
@@ -59,8 +59,7 @@ public static Bitmap DrawImageOfSummaryIndices(
             FileInfo csvFile,
             string titleText,
             TimeSpan indexCalculationDuration,
-            DateTimeOffset? recordingStartDate,
-            FileInfo sunriseDataFile = null)
+            DateTimeOffset? recordingStartDate)
         {
             if (!csvFile.Exists)
             {
@@ -96,7 +95,6 @@ public static Bitmap DrawImageOfSummaryIndices(
             var backgroundColour = Color.White;
             foreach (string key in dictionaryOfSummaryIndices.Keys)
             {
-                string correctKey = key;
                 if (!listOfIndexProperties.ContainsKey(key))
                 {
                     if (verbose)
@@ -107,7 +105,7 @@ public static Bitmap DrawImageOfSummaryIndices(
                     continue;
                 }
 
-                IndexProperties ip = listOfIndexProperties[correctKey];
+                IndexProperties ip = listOfIndexProperties[key];
                 if (!ip.DoDisplay)
                 {
                     continue;

diff --git a/src/AudioAnalysisTools/Indices/InitialiseIndexProperties.cs b/src/AudioAnalysisTools/Indices/InitialiseIndexProperties.cs
@@ -114,46 +114,5 @@ public static Dictionary<string, IndexProperties> GetDictionaryOfSummaryIndexPro
 
             return dict;
         }
-
-        /*
-        public static Dictionary<string, string> GetKeyTranslationDictionary()
-        {
-            var dict = new Dictionary<string, string>
-            {
-                { "IndexCount", "RankOrder" },
-                { "COUNT", "RankOrder" },
-                { "START-MIN", "StartMinute" },
-                { "SEGMENT-DUR", "AnalysisIdealSegmentDuration" },
-                { "hiSIG-AMPL", "HighAmplitudeIndex" },
-                { "CLIPPING", "ClippingIndex" },
-                { "SIGNAL-AMPL", "AvSignalAmplitude" },
-                { "BKGROUND", "BackgroundNoise" },
-                { "SNR", "SNR" },
-                { "SNR-ACTIVE", "AvSNRActive" },
-                { "AvSNROfActiveFrames", "AvSNRActive" },
-                { "ACTIVITY", "Activity" },
-                { "EVENTS-RATE", "EventsPerSec" },
-                { "avEVENT-DUR", "AvEventDuration" },
-                { "HF-CVR", "HF_CVR" },
-                { "MF-CVR", "MF_CVR" },
-                { "LF-CVR", "LF_CVR" },
-                { "H-TEMP", "Htemp" },
-                { "Htemporal", "Htemp" },
-                { "H-PEAK", "Hpeak" },
-                { "H-SPG", "HAvSpectrum" },
-                { "H-VAR", "HVarSpectrum" },
-                { "ACI", "AcousticComplexity" },
-                { "CLUSTER-COUNT", "ClusterCount" },
-                { "avCLUST-DUR", "AvClusterDuration" },
-                { "3GRAM-COUNT", "3GramCount" },
-                { "SPT-RATE", "SPTPerSec" },
-                { "avSPT-DUR", "AvSPTDuration" },
-                { "RAIN", "RainIndex" },
-                { "CICADA", "CicadaIndex" },
-            };
-
-            return dict;
-        }
-        */
     }
 }
diff --git a/src/AudioAnalysisTools/LongDurationSpectrograms/LDSpectrogramStitching.cs b/src/AudioAnalysisTools/LongDurationSpectrograms/LDSpectrogramStitching.cs
@@ -159,7 +159,7 @@ public static void DrawSummaryIndexFiles(
             FileInfo indexPropertiesConfigFileInfo,
             DirectoryInfo opDir,
             SiteDescription siteDescription,
-            FileInfo sunriseDatafile = null,
+            FileInfo sunriseDatafile = null, // no longer supported
             List<GapsAndJoins> erroneousSegments = null, // info if have fatal errors i.e. no signal
             bool verbose = false)
         {