Enable recording name to be passed to spectrograms.

Issue #278 Enable recording name to be passed to spectrogram labels. Also check that all spectrograms draw individually.
QutEcoacoustics · Dec 14, 2019 · b1ba0c8 · b1ba0c8
1 parent 664597a
commit b1ba0c8
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 91 deletions.
diff --git a/src/AnalysisConfigFiles/Towsey.Sonogram.yml b/src/AnalysisConfigFiles/Towsey.Sonogram.yml
@@ -27,7 +27,6 @@ FrameStep: 441
 Waveform: true
 DecibelSpectrogram: true
 DecibelSpectrogram_NoiseReduced: true
-DecibelSpectrogram_Ridges: true
 CepstralSpectrogram: true
 DifferenceSpectrogram: true
 AmplitudeSpectrogram_LocalContrastNormalization: true

diff --git a/src/AnalysisConfigFiles/Towsey.SpectrogramGenerator.yml b/src/AnalysisConfigFiles/Towsey.SpectrogramGenerator.yml
@@ -24,14 +24,13 @@ FrameLength: 512
 # Following frame step yields 50 frames/s which can make some subsequent operations a bit easier.
 FrameStep: 441
 
-Waveform: true
-DecibelSpectrogram: true
-DecibelSpectrogram_NoiseReduced: true
-DecibelSpectrogram_Ridges: true
-CepstralSpectrogram: true
-DifferenceSpectrogram: true
+Waveform: false
+DecibelSpectrogram: false
+DecibelSpectrogram_NoiseReduced: false
+CepstralSpectrogram: false
+DifferenceSpectrogram: false
 AmplitudeSpectrogram_LocalContrastNormalization: true
-Experimental: true
+Experimental: false
 
 #NOISE REDUCTION PARAMETERS
 DoNoiseReduction: true

diff --git a/src/AnalysisPrograms/Audio2InputForConvCNN.cs b/src/AnalysisPrograms/Audio2InputForConvCNN.cs
@@ -794,6 +794,7 @@ public AnalysisResult2 Analyze<T>(AnalysisSettings analysisSettings, SegmentSett
         {
             var audioFile = segmentSettings.SegmentAudioFile;
             var recording = new AudioRecording(audioFile.FullName);
+            var sourceRecordingName = recording.BaseName;
             var outputDirectory = segmentSettings.SegmentOutputDirectory;
             bool saveCsv = analysisSettings.AnalysisDataSaveBehavior;
             var analysisResult = new AnalysisResult2(analysisSettings, segmentSettings, recording.Duration);
@@ -805,7 +806,7 @@ public AnalysisResult2 Analyze<T>(AnalysisSettings analysisSettings, SegmentSett
             //configurationDictionary[ConfigKeys.Recording.Key_RecordingFileName] = audioFile.Name;
             //var soxImage = new FileInfo(Path.Combine(segmentSettings.SegmentOutputDirectory.FullName, audioFile.Name + ".SOX.png"));
             var configInfo = ConfigFile.Deserialize<AnalyzerConfig>(analysisSettings.ConfigFile);
-            var spectrogramResult = Audio2Sonogram.GenerateSpectrogramImages(audioFile, configInfo);
+            var spectrogramResult = Audio2Sonogram.GenerateSpectrogramImages(audioFile, configInfo, sourceRecordingName);
 
             // this analysis produces no results! But we still print images (that is the point)
             if (analysisSettings.AnalysisImageSaveBehavior.ShouldSave(analysisResult.Events.Length))