diff --git a/src/AnalysisPrograms/Sandpit.cs b/src/AnalysisPrograms/Sandpit.cs index 43768fd4c..d25c0bae3 100644 --- a/src/AnalysisPrograms/Sandpit.cs +++ b/src/AnalysisPrograms/Sandpit.cs @@ -325,8 +325,8 @@ public static void Audio2CsvOverOneFile() //string configPath = @"C:\Work\GitHub\audio-analysis\AudioAnalysis\AnalysisConfigFiles\Towsey.Acoustic.yml"; // Test on STANDARD 24-HOUR RECORDING - string recordingPath = @"C:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_061652.wav"; - string outputPath = @"C:\Ecoacoustics\Output\Test\Test24HourRecording\TasmanIslandMez\07"; + string recordingPath = @"C:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_071652.wav"; + string outputPath = @"C:\Ecoacoustics\Output\Test\Test24HourRecording\TasmanIslandMez\08"; string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\Towsey.Acoustic.yml"; // Ivan Campos recordings diff --git a/src/AudioAnalysisTools/Indices/IndexDisplay.cs b/src/AudioAnalysisTools/Indices/IndexDisplay.cs index c3b979b5b..d088ebd38 100644 --- a/src/AudioAnalysisTools/Indices/IndexDisplay.cs +++ b/src/AudioAnalysisTools/Indices/IndexDisplay.cs @@ -27,11 +27,11 @@ public static class IndexDisplay private static readonly ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// - /// Uses a dictionary of index properties to draw an image of summary index tracks + /// Uses a dictionary of index properties to draw an image of summary index tracks. /// - /// file containing the summary indices - /// indexPropertiesConfig - /// image title + /// file containing the summary indices. + /// indexPropertiesConfig. + /// image title. /// The index Calculation Duration. /// The recording Start Date. public static Bitmap DrawImageOfSummaryIndexTracks( @@ -52,7 +52,7 @@ public static Bitmap DrawImageOfSummaryIndexTracks( } /// - /// Reads csv file containing summary indices and converts them to a tracks image + /// Reads csv file containing summary indices and converts them to a tracks image. /// public static Bitmap DrawImageOfSummaryIndices( Dictionary listOfIndexProperties, @@ -88,9 +88,6 @@ public static Bitmap DrawImageOfSummaryIndices( List errors = null, bool verbose = false) { - // to translate past keys into current keys - Dictionary translationDictionary = InitialiseIndexProperties.GetKeyTranslationDictionary(); - const int trackHeight = DefaultTrackHeight; int scaleLength = 0; var bitmapList = new List>(dictionaryOfSummaryIndices.Keys.Count); @@ -102,25 +99,12 @@ public static Bitmap DrawImageOfSummaryIndices( string correctKey = key; if (!listOfIndexProperties.ContainsKey(key)) { - if (translationDictionary.ContainsKey(key)) - { - correctKey = translationDictionary[key]; - LoggedConsole.WriteWarnLine( - "The csv header is an unknown index <{0}>. Translated to <{1}>", - key, - correctKey); - } - else + if (verbose) { - if (verbose) - { - Logger.Warn( - "A index properties configuration could not be found for {0} (not even in the translation directory). Property is ignored and not rendered" - .Format2(key)); - } - - continue; + Logger.Warn("{0} index configuration could not be found. Index is ignored and not rendered.".Format2(key)); } + + continue; } IndexProperties ip = listOfIndexProperties[correctKey]; @@ -178,9 +162,9 @@ public static Bitmap DrawImageOfSummaryIndices( } /// - /// Reads csv file containing summary indices and converts them to a tracks image + /// Reads csv file containing summary indices and converts them to a tracks image. /// - /// an image of two clipping tracks + /// an image of two clipping tracks. public static Bitmap DrawHighAmplitudeClippingTrack(FileInfo csvFile) { if (!csvFile.Exists) @@ -197,9 +181,9 @@ public static Bitmap DrawHighAmplitudeClippingTrack(FileInfo csvFile) } /// - /// Reads csv file containing summary indices and converts them to a tracks image + /// Reads csv file containing summary indices and converts them to a tracks image. /// - /// a bitmap image + /// a bitmap image. public static Bitmap DrawHighAmplitudeClippingTrack(double[] array1, double[] array2) { double[] values1 = DataTools.NormaliseInZeroOne(array1, 0, 1.0); @@ -209,10 +193,8 @@ public static Bitmap DrawHighAmplitudeClippingTrack(double[] array1, double[] ar int trackWidth = dataLength; int trackHeight = DefaultTrackHeight; - //Color[] grayScale = ImageTools.GrayScale(); - - Bitmap bmp = new Bitmap(trackWidth, trackHeight); - Graphics g = Graphics.FromImage(bmp); + var bmp = new Bitmap(trackWidth, trackHeight); + var g = Graphics.FromImage(bmp); //g.Clear(grayScale[240]); g.Clear(Color.LightGray); diff --git a/src/AudioAnalysisTools/Indices/InitialiseIndexProperties.cs b/src/AudioAnalysisTools/Indices/InitialiseIndexProperties.cs index 34bbe46f7..f56785cf4 100644 --- a/src/AudioAnalysisTools/Indices/InitialiseIndexProperties.cs +++ b/src/AudioAnalysisTools/Indices/InitialiseIndexProperties.cs @@ -115,6 +115,7 @@ public static Dictionary GetDictionaryOfSummaryIndexPro return dict; } + /* public static Dictionary GetKeyTranslationDictionary() { var dict = new Dictionary @@ -153,5 +154,6 @@ public static Dictionary GetKeyTranslationDictionary() return dict; } + */ } }