diff --git a/src/AnalysisPrograms/Sandpit.cs b/src/AnalysisPrograms/Sandpit.cs index fef334b81..976924905 100644 --- a/src/AnalysisPrograms/Sandpit.cs +++ b/src/AnalysisPrograms/Sandpit.cs @@ -71,7 +71,7 @@ public override Task Execute(CommandLineApplication app) //CodeToPlaceScoreTracksUnderLdfcSpectrograms(); //CodeToPlaceScoreTracksUnderSingleImage(); - ConcatenateIndexFilesAndSpectrograms(); + //ConcatenateIndexFilesAndSpectrograms(); //ConcatenateGreyScaleSpectrogramImages(); //ConcatenateMarineImages(); //ConcatenateImages(); @@ -80,6 +80,7 @@ public override Task Execute(CommandLineApplication app) //DrawLongDurationSpectrogram(); //DrawClusterSequence(); //DrawStandardSpectrograms(); + Test_DrawFourSpectrograms(); //ExtractSpectralFeatures(); //HerveGlotinMethods(); @@ -106,7 +107,6 @@ public override Task Execute(CommandLineApplication app) //TestNoiseReduction(); //Oscillations2014.TESTMETHOD_DrawOscillationSpectrogram(); //Oscillations2014.TESTMETHOD_GetSpectralIndex_Osc(); - //Test_DrawFourSpectrograms(); Console.WriteLine("# Finished Sandpit Task! Press any key to exit."); return this.Ok(); @@ -514,8 +514,17 @@ public static void Audio2CsvOverOneFile() AnalyseLongRecording.Execute(arguments); } + public static void Test_DrawFourSpectrograms() + { + var sourceRecording = @"C:\SensorNetworks\SoftwareTests\TestRecordings\BAC2_20071008-085040.wav".ToFileInfo(); + var output = @"C:\SensorNetworks\SoftwareTests\TestFourSonograms".ToDirectoryInfo(); + var configFile = @"C:\Work\GitHub\audio-analysis\AudioAnalysis\AnalysisConfigFiles\Towsey.Sonogram.yml".ToFileInfo(); + //Audio2Sonogram.TESTMETHOD_DrawFourSpectrograms(sourceRecording, output, configFile); + } + /// - /// Draws a standard spectrogram + /// Draws a standard spectrogram, w/wo noise removal & melscale/linear. + /// This worked Feb 2019. /// public static void DrawStandardSpectrograms() { @@ -527,18 +536,18 @@ public static void DrawStandardSpectrograms() SourceFileName = "BAC2_20071008-085040", WindowSize = 1024, WindowOverlap = 0.0, - DoMelScale = false, + DoMelScale = true, MelBinCount = 256, - NoiseReductionType = NoiseReductionType.Median, + NoiseReductionType = NoiseReductionType.None, NoiseReductionParameter = 0.0, }; - //var amplSpectrogram = new AmplitudeSpectrogram(settings, recording); - //var dbSpectrogram = new DecibelSpectrogram(settings, recording); - //dbSpectrogram.DrawSpectrogram(@"C:\Ecoacoustics\WavFiles\TestRecordings\BAC\BAC2_20071008-085040_MelMedian.png"); + var amplSpectrogram = new AmplitudeSpectrogram(settings, recording); + var dbSpectrogram = new DecibelSpectrogram(settings, recording); + dbSpectrogram.DrawSpectrogram(@"C:\Ecoacoustics\WavFiles\TestRecordings\BAC\2019Output\BAC2_20071008-085040_MelNoNoiseRemoval.png"); var energySpectro = new EnergySpectrogram(settings, recording); - energySpectro.DrawLogPsd(@"C:\Ecoacoustics\WavFiles\TestRecordings\BAC\BAC2_20071008-085040_LogPSD.png"); + energySpectro.DrawLogPsd(@"C:\Ecoacoustics\WavFiles\TestRecordings\BAC\2019Output\BAC2_20071008-085040_MelLogPSD_NoNoiseRemoval.png"); } public static void DrawLongDurationSpectrogram() @@ -1417,11 +1426,6 @@ public static void TestsOfFrequencyScales() FrequencyScale.TESTMETHOD_DrawFrequencyLinesOnImage(); } - public static void Test_DrawFourSpectrograms() - { - Audio2Sonogram.TESTMETHOD_DrawFourSpectrograms(); - } - /// /// Unit test of AnalyseLongRecording() using artificial signal ///