Add back second time scale to spectrograms.

Issue #278 Add back second time scale to spectrograms. Do this so do not have to fix unit tests!
QutEcoacoustics · Dec 12, 2019 · de70d9b · de70d9b
1 parent 85f32ce
commit de70d9b
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/src/AudioAnalysisTools/StandardSpectrograms/BaseSonogram.cs b/src/AudioAnalysisTools/StandardSpectrograms/BaseSonogram.cs
@@ -284,8 +284,7 @@ public Image GetImageFullyAnnotated(Image image, string title, int[,] gridLineLo
 
             var titleBar = LDSpectrogramRGB.DrawTitleBarOfGrayScaleSpectrogram(title, image.Width);
             var timeBmp = ImageTrack.DrawTimeTrack(this.Duration, image.Width);
-            //var list = new List<Image> { titleBar, timeBmp, image, timeBmp };
-            var list = new List<Image> { titleBar, image, timeBmp };
+            var list = new List<Image> { titleBar, timeBmp, image, timeBmp };
             var compositeImage = ImageTools.CombineImagesVertically(list);
             return compositeImage;
         }
@@ -717,6 +716,24 @@ public static Image GetImageAnnotatedWithLinearHertzScale(Image image, int sampl
             return image;
         }
 
+        /// <summary>
+        /// This method draws only top and bottom time scales and adds the title bar.
+        /// It does NOT include the frequency grid lines.
+        /// </summary>
+        public static Image FrameSonogram(
+            Image sonogramImage,
+            Image titleBar,
+            TimeSpan minuteOffset,
+            TimeSpan xAxisTicInterval,
+            TimeSpan xAxisPixelDuration,
+            TimeSpan labelInterval)
+        {
+            int imageWidth = sonogramImage.Width;
+            var timeBmp = ImageTrack.DrawShortTimeTrack(minuteOffset, xAxisPixelDuration, xAxisTicInterval, labelInterval, imageWidth, "Seconds");
+            Image[] imageArray = { titleBar, timeBmp, sonogramImage, timeBmp };
+            return ImageTools.CombineImagesVertically(imageArray);
+        }
+
         /// <summary>
         /// This method assumes that the height of the passed sonogram image is half of the original frame size.
         /// This assumption allows the frequency scale grid lines to be placed at the correct intervals.
@@ -741,7 +758,7 @@ public static Image FrameSonogram(
 
             int imageWidth = sonogramImage.Width;
             var timeBmp = ImageTrack.DrawShortTimeTrack(minuteOffset, xAxisPixelDuration, xAxisTicInterval, labelInterval, imageWidth, "Seconds");
-            Image[] imageArray = { titleBar, sonogramImage, timeBmp };
+            Image[] imageArray = { titleBar, timeBmp, sonogramImage, timeBmp };
             return ImageTools.CombineImagesVertically(imageArray);
         }