General style adherence refactoring

- Added copyright header to files - Removed reggions - Fixed the spelling of Image_Tacks (now ImageTrack)
QutEcoacoustics · Nov 29, 2017 · 99bca53 · 99bca53
1 parent 44f48df
commit 99bca53
Show file tree

Hide file tree

Showing 101 changed files with 766 additions and 477 deletions.
diff --git a/Acoustics/Acoustics.Shared/Extensions/ExtensionsDrawing.cs b/Acoustics/Acoustics.Shared/Extensions/ExtensionsDrawing.cs
@@ -77,7 +77,10 @@ public static byte[] ToByteArray(this Image image, ImageFormat imageFormat)
         /// </remarks>
         public static Bitmap Crop(this Image source, Rectangle crop)
         {
-            if (source == null) return null;
+            if (source == null)
+            {
+                return null;
+            }
 
             var bmp = new Bitmap(crop.Width, crop.Height);
             using (var gr = Graphics.FromImage(bmp))

diff --git a/AudioAnalysis/AnalysisPrograms/AED.cs b/AudioAnalysis/AnalysisPrograms/AED.cs
@@ -234,10 +234,10 @@ public static Image DrawSonogram(BaseSonogram sonogram, IEnumerable<AcousticEven
         {
             var image = new Image_MultiTrack(sonogram.GetImage(false, true));
 
-            image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
+            image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
 
-            ////image.AddTrack(Image_Track.GetWavEnvelopeTrack(sonogram, image.sonogramImage.Width));
-            image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+            ////image.AddTrack(ImageTrack.GetWavEnvelopeTrack(sonogram, image.sonogramImage.Width));
+            image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
             image.AddEvents(
                 events,
                 sonogram.NyquistFrequency,

diff --git a/AudioAnalysis/AnalysisPrograms/AcousticHiResIndicesPlusRecognizers.cs b/AudioAnalysis/AnalysisPrograms/AcousticHiResIndicesPlusRecognizers.cs
@@ -724,7 +724,7 @@ public void SummariseResults(AnalysisSettings settings, FileSegment inputFileSeg
                                           FrameStep = settings.Configuration[AnalysisKeys.FrameStep],
                                           IndexCalculationDuration = acousticIndicesParsedConfiguration.IndexCalculationDuration,
                                           BgNoiseNeighbourhood = acousticIndicesParsedConfiguration.BgNoiseNeighborhood,
-                                          MinuteOffset = inputFileSegment.SegmentStartOffset ?? TimeSpan.Zero,
+                                          AnalysisStartOffset = inputFileSegment.SegmentStartOffset ?? TimeSpan.Zero,
                                           BackgroundFilterCoeff = SpectrogramConstants.BACKGROUND_FILTER_COEFF,
                                           LongDurationSpectrogramConfig = ldSpectrogramConfig,
                                       };
@@ -818,15 +818,15 @@ private static void TileOutput(DirectoryInfo outputDirectory, string fileStem, s
         private static Image DrawSonogram(BaseSonogram sonogram, double[,] hits, List<Plot> scores, List<SpectralTrack> tracks)
         {
             Image_MultiTrack image = new Image_MultiTrack(sonogram.GetImage());
-            image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
-            image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+            image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
+            image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
 
             if (scores != null)
             {
                 foreach (Plot plot in scores)
                 {
                     // assumes data normalized in 0,1
-                    image.AddTrack(Image_Track.GetNamedScoreTrack(plot.data, 0.0, 1.0, plot.threshold, plot.title));
+                    image.AddTrack(ImageTrack.GetNamedScoreTrack(plot.data, 0.0, 1.0, plot.threshold, plot.title));
                 }
             }
 

diff --git a/AudioAnalysis/AnalysisPrograms/AcousticIndices.cs b/AudioAnalysis/AnalysisPrograms/AcousticIndices.cs
@@ -602,15 +602,15 @@ private static void TileOutput(DirectoryInfo outputDirectory, string fileStem, s
         private static Image DrawSonogram(BaseSonogram sonogram, double[,] hits, List<Plot> scores, List<SpectralTrack> tracks)
         {
             Image_MultiTrack image = new Image_MultiTrack(sonogram.GetImage());
-            image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
-            image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+            image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
+            image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
 
             if (scores != null)
             {
                 foreach (Plot plot in scores)
                 {
                     // assumes data normalized in 0,1
-                    image.AddTrack(Image_Track.GetNamedScoreTrack(plot.data, 0.0, 1.0, plot.threshold, plot.title));
+                    image.AddTrack(ImageTrack.GetNamedScoreTrack(plot.data, 0.0, 1.0, plot.threshold, plot.title));
                 }
             }
 

diff --git a/AudioAnalysis/AnalysisPrograms/Audio2InputForConvCNN.cs b/AudioAnalysis/AnalysisPrograms/Audio2InputForConvCNN.cs
@@ -711,7 +711,7 @@ public static AudioToSonogramResult GenerateSpectrogramImages(FileInfo sourceRec
             image = sonogram.GetImageAnnotatedWithLinearHerzScale(image, "AMPLITUDE SPECTROGRAM + LCN + ridge detection");
             list.Add(image);
 
-            Image envelopeImage = Image_Track.DrawWaveEnvelopeTrack(recordingSegment, image.Width);
+            Image envelopeImage = ImageTrack.DrawWaveEnvelopeTrack(recordingSegment, image.Width);
             list.Add(envelopeImage);
 
             // 3) now draw the standard decibel spectrogram
@@ -727,7 +727,7 @@ public static AudioToSonogramResult GenerateSpectrogramImages(FileInfo sourceRec
             image = sonogram.GetImageFullyAnnotated("DECIBEL SPECTROGRAM");
             list.Add(image);
 
-            Image segmentationImage = Image_Track.DrawSegmentationTrack(
+            Image segmentationImage = ImageTrack.DrawSegmentationTrack(
                 sonogram,
                 EndpointDetectionConfiguration.K1Threshold,
                 EndpointDetectionConfiguration.K2Threshold,

diff --git a/AudioAnalysis/AnalysisPrograms/Audio2Sonogram.cs b/AudioAnalysis/AnalysisPrograms/Audio2Sonogram.cs
@@ -288,7 +288,7 @@ public static AudioToSonogramResult GenerateFourSpectrogramImages(
                 image = sonogram.GetImageAnnotatedWithLinearHerzScale(image, "AMPLITUDE SPECTROGRAM + LCN + ridge detection");
                 list.Add(image);
 
-                Image envelopeImage = Image_Track.DrawWaveEnvelopeTrack(recordingSegment, image.Width);
+                Image envelopeImage = ImageTrack.DrawWaveEnvelopeTrack(recordingSegment, image.Width);
                 list.Add(envelopeImage);
 
                 // IMAGE 2) now draw the standard decibel spectrogram
@@ -297,7 +297,7 @@ public static AudioToSonogramResult GenerateFourSpectrogramImages(
                 image = sonogram.GetImageFullyAnnotated("DECIBEL SPECTROGRAM");
                 list.Add(image);
 
-                Image segmentationImage = Image_Track.DrawSegmentationTrack(
+                Image segmentationImage = ImageTrack.DrawSegmentationTrack(
                     sonogram,
                     EndpointDetectionConfiguration.K1Threshold,
                     EndpointDetectionConfiguration.K2Threshold,

diff --git a/AudioAnalysis/AnalysisPrograms/CanetoadOld_OBSOLETE.cs b/AudioAnalysis/AnalysisPrograms/CanetoadOld_OBSOLETE.cs
@@ -372,11 +372,11 @@ private static Image DrawSonogram(
             ////img.Save(@"C:\SensorNetworks\temp\testimage1.png", System.Drawing.Imaging.ImageFormat.Png);
 
             ////Image_MultiTrack image = new Image_MultiTrack(img);
-            image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
-            image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+            image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
+            image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
             if (scores != null)
             {
-                image.AddTrack(Image_Track.GetNamedScoreTrack(scores.data, 0.0, 1.0, scores.threshold, scores.title));
+                image.AddTrack(ImageTrack.GetNamedScoreTrack(scores.data, 0.0, 1.0, scores.threshold, scores.title));
             }
 
             if (hits != null)

diff --git a/AudioAnalysis/AnalysisPrograms/ConcatenateIndexFiles.cs b/AudioAnalysis/AnalysisPrograms/ConcatenateIndexFiles.cs
@@ -34,6 +34,8 @@ namespace AnalysisPrograms
     using AudioAnalysisTools;
     using AudioAnalysisTools.Indices;
     using AudioAnalysisTools.LongDurationSpectrograms;
+    using AudioAnalysisTools.StandardSpectrograms;
+
     using log4net;
     using PowerArgs;
     using TowseyLibrary;
@@ -1043,8 +1045,8 @@ public static void ConcatenateAcousticEventFiles(DirectoryInfo[] dataDirs, strin
             var duration = new TimeSpan(0, indexArray.Length, 0);
 
             int trackHeight = 20;
-            Bitmap timeBmp1 = Image_Track.DrawTimeRelativeTrack(duration, indexArray.Length, trackHeight);
-            Bitmap timeBmp2 = Image_Track.DrawTimeTrack(duration, startTime, indexArray.Length, trackHeight);
+            Bitmap timeBmp1 = ImageTrack.DrawTimeRelativeTrack(duration, indexArray.Length, trackHeight);
+            Bitmap timeBmp2 = ImageTrack.DrawTimeTrack(duration, startTime, indexArray.Length, trackHeight);
 
             var imageList = new List<Image> { titleBar, timeBmp1, image, timeBmp2 };
             var compositeBmp = (Bitmap)ImageTools.CombineImagesVertically(imageList);

diff --git a/AudioAnalysis/AnalysisPrograms/Create4Sonograms.cs b/AudioAnalysis/AnalysisPrograms/Create4Sonograms.cs
@@ -212,9 +212,9 @@ public static void Main(Arguments arguments)
 
             //prepare sonogram images
             var protoImage6 = new Image_MultiTrack(standardSonogram.GetImage(doHighlightSubband: false, add1KHzLines: true));
-            protoImage6.AddTrack(Image_Track.GetTimeTrack(standardSonogram.Duration, standardSonogram.FramesPerSecond));
-            protoImage6.AddTrack(Image_Track.GetWavEnvelopeTrack(recording, protoImage6.SonogramImage.Width));
-            protoImage6.AddTrack(Image_Track.GetSegmentationTrack(standardSonogram));
+            protoImage6.AddTrack(ImageTrack.GetTimeTrack(standardSonogram.Duration, standardSonogram.FramesPerSecond));
+            protoImage6.AddTrack(ImageTrack.GetWavEnvelopeTrack(recording, protoImage6.SonogramImage.Width));
+            protoImage6.AddTrack(ImageTrack.GetSegmentationTrack(standardSonogram));
             var image6 = protoImage6.GetImage();
 
             var list = new List<Image>();
@@ -249,19 +249,19 @@ public static void Main(Arguments arguments)
             ////sonogram.Data = SNR.SpectralRidges2Intensity(binary, originalSg);
 
             //image = new Image_MultiTrack(sonogram.GetImage(doHighlightSubband, false));
-            //image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
-            //image.AddTrack(Image_Track.GetWavEnvelopeTrack(recording, image.sonogramImage.Width));
-            //image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+            //image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
+            //image.AddTrack(ImageTrack.GetWavEnvelopeTrack(recording, image.sonogramImage.Width));
+            //image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
             //fn = outputFolder + wavFileName + "_tracks.png";
             //image.Save(fn);
             //LoggedConsole.WriteLine("Spectral tracks sonogram to file: " + fn);
 
             //3: prepare image of spectral peaks sonogram
             //sonogram.Data = SNR.NoiseReduce_Peaks(originalSg, dynamicRange);
             //image = new Image_MultiTrack(sonogram.GetImage(doHighlightSubband, add1kHzLines));
-            //image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration));
-            //image.AddTrack(Image_Track.GetWavEnvelopeTrack(recording, image.Image.Width));
-            //image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+            //image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration));
+            //image.AddTrack(ImageTrack.GetWavEnvelopeTrack(recording, image.Image.Width));
+            //image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
             //fn = outputFolder + wavFileName + "_peaks.png";
             //image.Save(fn);
 
@@ -270,9 +270,9 @@ public static void Main(Arguments arguments)
             //4: Sobel approach
             //sonogram.Data = SNR.NoiseReduce_Sobel(originalSg, dynamicRange);
             //image = new Image_MultiTrack(sonogram.GetImage(doHighlightSubband, add1kHzLines));
-            //image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration));
-            //image.AddTrack(Image_Track.GetWavEnvelopeTrack(recording, image.Image.Width));
-            //image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+            //image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration));
+            //image.AddTrack(ImageTrack.GetWavEnvelopeTrack(recording, image.Image.Width));
+            //image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
             //fn = outputFolder + wavFileName + "_sobel.png";
             //image.Save(fn);
             //LoggedConsole.WriteLine("Sobel sonogram to file: " + fn);
@@ -327,9 +327,9 @@ public static void Main(Arguments arguments)
 
             bool doHighlightSubband = false; bool add1kHzLines = true;
             var image = new Image_MultiTrack(sonogram.GetImage(doHighlightSubband, add1kHzLines));
-            //image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration));
-            //image.AddTrack(Image_Track.GetWavEnvelopeTrack(recording, image.Image.Width));
-            //image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+            //image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration));
+            //image.AddTrack(ImageTrack.GetWavEnvelopeTrack(recording, image.Image.Width));
+            //image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
             image.AddEvents(eprEvents);
             image.Save(outputFolder + wavFileName + ".png");
              */

diff --git a/AudioAnalysis/AnalysisPrograms/Crow.cs b/AudioAnalysis/AnalysisPrograms/Crow.cs
@@ -400,9 +400,9 @@ static Image DrawSonogram(BaseSonogram sonogram, double[,] hits, Plot scores, Li
             //img.Save(@"C:\SensorNetworks\temp\testimage1.png", System.Drawing.Imaging.ImageFormat.Png);
 
             //Image_MultiTrack image = new Image_MultiTrack(img);
-            image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
-            image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
-            if (scores != null) image.AddTrack(Image_Track.GetNamedScoreTrack(scores.data, 0.0, 1.0, scores.threshold, scores.title));
+            image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
+            image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
+            if (scores != null) image.AddTrack(ImageTrack.GetNamedScoreTrack(scores.data, 0.0, 1.0, scores.threshold, scores.title));
             //if (hits != null) image.OverlayRedTransparency(hits);
             if (hits != null) image.OverlayRainbowTransparency(hits);
             if (predictedEvents.Count > 0) image.AddEvents(predictedEvents, sonogram.NyquistFrequency, sonogram.Configuration.FreqBinCount, sonogram.FramesPerSecond);

diff --git a/AudioAnalysis/AnalysisPrograms/Dong.Felt.Main.cs b/AudioAnalysis/AnalysisPrograms/Dong.Felt.Main.cs
@@ -144,7 +144,7 @@ public override AnalysisResult2 Analyze<T>(AnalysisSettings analysisSettings, Se
 
             //    var imageResult = new Image_MultiTrack(spectrogram.GetImage(true, true));
             //    //imageResult.AddPoints(pointsOfInterest);
-            //    imageResult.AddTrack(Image_Track.GetTimeTrack(spectrogram.Duration, spectrogram.FramesPerSecond));
+            //    imageResult.AddTrack(ImageTrack.GetTimeTrack(spectrogram.Duration, spectrogram.FramesPerSecond));
             //    imageResult.Save(path + "1.png");
             //    Log.Info("Show the result of Final PointsOfInterest");
             ////}

diff --git a/AudioAnalysis/AnalysisPrograms/DrawEasyImage.cs b/AudioAnalysis/AnalysisPrograms/DrawEasyImage.cs
@@ -44,6 +44,8 @@ namespace AnalysisPrograms
     using TowseyLibrary;
     using System.Drawing;
 
+    using AudioAnalysisTools.StandardSpectrograms;
+
     /// <summary>
     /// First argument on command line to call this action is "drawEasyImage"
     /// </summary>
@@ -381,7 +383,7 @@ public static void Execute(Arguments arguments)
             SunAndMoon.AddSunRiseSetLinesToImage((Bitmap)bitmap, arguments.BrisbaneSunriseDatafile, startdayOfYear, endDayOfYear, dayPixelHeight);
 
             // add the time scales
-            Bitmap timeBmp1 = Image_Track.DrawTimeRelativeTrack(oneDay, graphWidth, trackHeight);
+            Bitmap timeBmp1 = ImageTrack.DrawTimeRelativeTrack(oneDay, graphWidth, trackHeight);
             var imageList = new List<Image>();
             imageList.Add(timeBmp1);
             imageList.Add(bitmap);
@@ -398,7 +400,7 @@ public static void Execute(Arguments arguments)
             string startString = $"{startDate.Value.Year}/{startDate.Value.Month}/{startDate.Value.Day}";
             string   endString = $"{endDate.Value.Year}/{endDate.Value.Month}/{endDate.Value.Day}";
             string title = $"EASY:   {arguments.FileStemName}    From {startString} to {endString}                          Indices: {indicesDescription}";
-            Bitmap titleBar = Image_Track.DrawTitleTrack(compositeBmp2.Width, trackHeight, title);
+            Bitmap titleBar = ImageTrack.DrawTitleTrack(compositeBmp2.Width, trackHeight, title);
             imageList = new List<Image>();
             imageList.Add(titleBar);
             imageList.Add(compositeBmp2);

diff --git a/AudioAnalysis/AnalysisPrograms/DrawLongDurationSpectrograms.cs b/AudioAnalysis/AnalysisPrograms/DrawLongDurationSpectrograms.cs
@@ -36,6 +36,8 @@ namespace AnalysisPrograms
     using AudioAnalysisTools.Indices;
     using AudioAnalysisTools.LongDurationSpectrograms;
     using AudioAnalysisTools.LongDurationSpectrograms.Zooming;
+    using AudioAnalysisTools.StandardSpectrograms;
+
     using PowerArgs;
     using TowseyLibrary;
 
@@ -424,7 +426,7 @@ public static Image DrawFalseColourSpectrograms(Arguments args, string fileStem,
             string title = fileStem;
             var titleImage = LDSpectrogramRGB.DrawTitleBarOfFalseColourSpectrogram(title, image1.Width);
             int trackHeight = 20;
-            var timeScale = Image_Track.DrawTimeRelativeTrack(fullDuration, image1.Width, trackHeight);
+            var timeScale = ImageTrack.DrawTimeRelativeTrack(fullDuration, image1.Width, trackHeight);
 
             colourMap = args.ColourMap2 ?? LDSpectrogramRGB.DefaultColorMap2;
             var image2 = cs1.DrawFalseColourSpectrogramChromeless("NEGATIVE", colourMap);

diff --git a/AudioAnalysis/AnalysisPrograms/EPR.cs b/AudioAnalysis/AnalysisPrograms/EPR.cs
@@ -399,11 +399,11 @@ public static void DrawSonogram(BaseSonogram sonogram, string path, double[] nor
             using (Image_MultiTrack image = new Image_MultiTrack(img))
             {
                 //img.Save(@"C:\SensorNetworks\WavFiles\temp1\testimage1.jpg", System.Drawing.Imaging.ImageFormat.Jpeg);
-                image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
-                image.AddTrack(Image_Track.GetScoreTrack(normalizedDBArray, 0, 1.0, dBThreshold));
-                image.AddTrack(Image_Track.GetScoreTrack(odScores, 0, 1.0, odThreshold));
-                image.AddTrack(Image_Track.GetScoreTrack(gpScores, 0, 1.0, 0.3));
-                //image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+                image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
+                image.AddTrack(ImageTrack.GetScoreTrack(normalizedDBArray, 0, 1.0, dBThreshold));
+                image.AddTrack(ImageTrack.GetScoreTrack(odScores, 0, 1.0, odThreshold));
+                image.AddTrack(ImageTrack.GetScoreTrack(gpScores, 0, 1.0, 0.3));
+                //image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
                 //var aes = new List<AcousticEvent>();
                 //aes.Add(ae);
                 image.AddEvents(list, sonogram.NyquistFrequency, sonogram.Configuration.FreqBinCount, sonogram.FramesPerSecond);

diff --git a/AudioAnalysis/AnalysisPrograms/FeltTemplate_Create.cs b/AudioAnalysis/AnalysisPrograms/FeltTemplate_Create.cs
@@ -244,8 +244,8 @@ public static void DrawSonogram(BaseSonogram sonogram, string path, AcousticEven
             using (Image_MultiTrack image = new Image_MultiTrack(img))
             {
                 //img.Save(@"C:\SensorNetworks\WavFiles\temp1\testimage1.jpg", System.Drawing.Imaging.ImageFormat.Jpeg);
-                image.AddTrack(Image_Track.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
-                image.AddTrack(Image_Track.GetSegmentationTrack(sonogram));
+                image.AddTrack(ImageTrack.GetTimeTrack(sonogram.Duration, sonogram.FramesPerSecond));
+                image.AddTrack(ImageTrack.GetSegmentationTrack(sonogram));
                 var aes = new List<AcousticEvent>();
                 aes.Add(ae);
                 image.AddEvents(aes, sonogram.NyquistFrequency, sonogram.Configuration.FreqBinCount, sonogram.FramesPerSecond);