Final edits after Anthony review.

Issue #297 branch for recognizers.
QutEcoacoustics · May 11, 2020 · 6f4eda6 · 6f4eda6
1 parent 79e8f35
commit 6f4eda6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/src/AnalysisPrograms/Draw/RibbonPlots/RibbonPlot.Entry.cs b/src/AnalysisPrograms/Draw/RibbonPlots/RibbonPlot.Entry.cs
@@ -233,7 +233,7 @@ void Operation(IImageProcessingContext context)
                     var y = Padding + ((Padding + ribbonHeight) * b);
 
                     // draw label
-                    context.DrawTextSafe(textGraphics, dateLabel, scaledFont, textColor, new Point(HorizontalPadding, y + (ribbonHeight / 2)));
+                    context.DrawTextSafe(dateLabel, scaledFont, textColor, new Point(HorizontalPadding, y + (ribbonHeight / 2)));
 
                     // draw void
                     var @void = new RectangularPolygon(ribbonLeft, y, estimatedWidth, ribbonHeight);

diff --git a/src/AnalysisPrograms/Recognizers/Birds/BotaurusPoiciloptilus.cs b/src/AnalysisPrograms/Recognizers/Birds/BotaurusPoiciloptilus.cs
@@ -58,7 +58,7 @@ public override AnalyzerConfig ParseConfig(FileInfo file)
                 return config;
             }
 
-            throw new ConfigFileException($"Autralasian Bittern expects one and only one {nameof(OneBinTrackParameters)}} algorithm.", file);
+            throw new ConfigFileException($"Autralasian Bittern expects one and only one {nameof(OnebinTrackParameters)} algorithm.", file);
         }
 
         /// <summary>

diff --git a/src/AudioAnalysisTools/AudioAnalysisTools.csproj b/src/AudioAnalysisTools/AudioAnalysisTools.csproj
@@ -9,6 +9,11 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Events\Tracks\**" />
+    <EmbeddedResource Remove="Events\Tracks\**" />
+    <None Remove="Events\Tracks\**" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Acoustics.Shared\Acoustics.Shared.csproj" />
     <ProjectReference Include="..\Acoustics.Tools\Acoustics.Tools.csproj" />
@@ -36,7 +41,4 @@
     </PackageReference>
     <PackageReference Include="Towel" Version="1.0.11-alpha" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Events\Tracks\" />
-  </ItemGroup>
 </Project>
diff --git a/src/AudioAnalysisTools/Events/Drawing/EventDrawer.cs b/src/AudioAnalysisTools/Events/Drawing/EventDrawer.cs
@@ -14,23 +14,20 @@ namespace AudioAnalysisTools.Events.Drawing
 
     public static class EventDrawer
     {
-
         /// <summary>
         /// Draws a "score" indicator on the left edge of an event.
         /// </summary>
+        /// <param name="event">The event for which to draw the score indicator.</param>
         /// <param name="graphics">The image context to draw to.</param>
         /// <param name="options">The event rendering optons to use.</param>
-        /// <param name="@event">The event for which to draw the score indicator.</param>
         public static void DrawScoreIndicator(this SpectralEvent @event, IImageProcessingContext graphics, EventRenderingOptions options)
         {
             if (!options.DrawScore)
             {
                 return;
             }
 
-            // Although an Interval<double> ScoreRange property has been added to EventCommon,
-            // this does not clamp values. For now, we clamp before drawing.
-            var normalisedScore = @event.ScoreNormalised.Clamp(0, 1);
+            var normalisedScore = @event.GetScoreNormalised();
 
             if (normalisedScore == 0)
             {

diff --git a/src/AudioAnalysisTools/Events/EventCommon.cs b/src/AudioAnalysisTools/Events/EventCommon.cs
@@ -55,7 +55,11 @@ public abstract class EventCommon : EventBase, IDrawableEvent
         /// Up to user to determine a suitable range maximum.
         /// Minimum of range assumed to be zero.
         /// </summary>
-        public double ScoreNormalised => this.Score / this.ScoreRange.Maximum;
+        public double GetScoreNormalised()
+        {
+            var range = this.ScoreRange.Maximum - this.ScoreRange.Minimum;
+            return (this.Score / range).Clamp(0, 1);
+        }
 
         /// <summary>
         /// Draw this event on an image.

diff --git a/src/AudioAnalysisTools/UnitConverters.cs b/src/AudioAnalysisTools/UnitConverters.cs
@@ -121,14 +121,6 @@ public UnitConverters(double segmentStartOffset, int sampleRate, int frameSize,
         /// </summary>
         public LinearScale TemporalScale { get; }
 
-        /// <summary>
-        /// Gets the temporal scale in second units.
-        /// </summary>
-        /// <remarks>
-        /// Measured in seconds per spectrogram frame.
-        /// </remarks>
-        //public LinearSecondsScale SecondsScale { get; }
-
         /// <summary>
         /// Gets the spectral scale.
         /// </summary>