Fixed errant syntax errors from merge commits

QutEcoacoustics · Nov 30, 2017 · 48bb370 · 48bb370
1 parent bd1e874
commit 48bb370
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/AudioAnalysis/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommon.cs b/AudioAnalysis/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommon.cs
@@ -109,22 +109,22 @@ public static Image DrawIndexSpectrogramCommon(
             }
             else if (imageScaleInMsPerPixel > 5000)
             {
-                blendWt1 = 0.7;
-                blendWt2 = 0.3;
+                blendWeight1 = 0.7;
+                blendWeight2 = 0.3;
             }
             else if (imageScaleInMsPerPixel > 1000)
             {
-                blendWt1 = 0.2;
-                blendWt2 = 0.8;
+                blendWeight1 = 0.2;
+                blendWeight2 = 0.8;
             }
             else if (imageScaleInMsPerPixel > 500)
             {
                 // > 0.5 seconds
-                blendWt1 = 0.1;
-                blendWt2 = 0.9;
+                blendWeight1 = 0.1;
+                blendWeight2 = 0.9;
             }
 
-            var ldfcSpectrogram = cs1.DrawBlendedFalseColourSpectrogram(colorMap1, colorMap2, blendWt1, blendWt2);
+            var ldfcSpectrogram = cs1.DrawBlendedFalseColourSpectrogram(colorMap1, colorMap2, blendWeight1, blendWeight2);
             if (ldfcSpectrogram == null)
             {
                 throw new InvalidOperationException("Null Image returned from DrawBlendedFalseColourSpectrogram");

diff --git a/AudioAnalysis/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomFocusedSpectrograms.cs b/AudioAnalysis/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomFocusedSpectrograms.cs
@@ -126,7 +126,7 @@ public static void DrawStackOfZoomedSpectrograms(DirectoryInfo inputDirectory, D
             for (int i = 0; i < compressionCount; i++)
             {
                 int factor = compressionFactor[i];
-                image = DrawFrameSpectrogramAtScale(ldsConfig, indexGeneration, startTimeOfData, factor, frameData, indexData, focalTime, frameScale, imageWidth);
+                var image = DrawFrameSpectrogramAtScale(ldsConfig, indexGeneration, startTimeOfData, factor, frameData, indexData, focalTime, frameScale, imageWidth);
                 if (image != null)
                 {
                     imageList.Add(image);
@@ -207,7 +207,7 @@ public static Image DrawIndexSpectrogramAtScale(
                 startTime = TimeSpan.Zero;
             }
 
-            TimeSpan endTime = ImageDuration;
+            TimeSpan endTime = imageDuration;
             if (focalTime != TimeSpan.Zero)
             {
                 endTime = focalTime + halfImageDuration;