Skip to content

Commit

Permalink
Check that original zooming spectrograms is working
Browse files Browse the repository at this point in the history
Also do some resharping on the way.
Got the zoom stack working well.
Set up a separate config for zooming index properties.
Original hash: 3e7cb29
  • Loading branch information
towsey committed Nov 16, 2017
1 parent df133c7 commit d3d3c1f
Show file tree
Hide file tree
Showing 11 changed files with 950 additions and 194 deletions.
30 changes: 5 additions & 25 deletions Acoustics/Acoustics.Shared/FileNameHelpers.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
namespace Acoustics.Shared
// <copyright file="FileNameHelpers.cs" company="QutEcoacoustics">
// All code in this file and all associated files are the copyright and property of the QUT Ecoacoustics Research Group (formerly MQUTeR, and formerly QUT Bioacoustics Research Group).
// </copyright>

namespace Acoustics.Shared
{
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;

/// <summary>
Expand All @@ -21,12 +23,6 @@ public static class FilenameHelpers
/// <summary>
/// Return an absolute path for a result file.
/// </summary>
/// <param name="outputDirectory"></param>
/// <param name="orignalFile"></param>
/// <param name="analysisTag"></param>
/// <param name="newExtension"></param>
/// <param name="otherSegments"></param>
/// <returns></returns>
public static string AnalysisResultPath(
DirectoryInfo outputDirectory,
FileInfo orignalFile,
Expand All @@ -42,12 +38,6 @@ public static string AnalysisResultPath(
/// <summary>
/// Return an absolute path for a result file.
/// </summary>
/// <param name="outputDirectory"></param>
/// <param name="baseName"></param>
/// <param name="analysisTag"></param>
/// <param name="newExtension"></param>
/// <param name="otherSegments"></param>
/// <returns></returns>
public static string AnalysisResultPath(
DirectoryInfo outputDirectory,
string baseName,
Expand All @@ -63,11 +53,6 @@ public static string AnalysisResultPath(
/// <summary>
/// Return a relative file name only (no directory) for a result file.
/// </summary>
/// <param name="baseName"></param>
/// <param name="analysisTag"></param>
/// <param name="newExtension"></param>
/// <param name="otherSegments"></param>
/// <returns></returns>
public static string AnalysisResultName(string baseName, string analysisTag, string newExtension, params string[] otherSegments)
{
if (string.IsNullOrWhiteSpace(baseName))
Expand Down Expand Up @@ -100,7 +85,6 @@ public static string AnalysisResultName(string baseName, string analysisTag, str
return filename;
}


public static void ParseAnalysisFileName(
FileInfo file,
out string originalBaseName,
Expand Down Expand Up @@ -159,9 +143,6 @@ public static bool TryParseAnalysisFileName(
/// Matches a very specific format:
/// e.g. "4c77b524-1857-4550-afaa-c0ebe5e3960a_20101013_003000+1000_Towsey.Acoustic.ACI.csv"
/// </summary>
/// <param name="filename"></param>
/// <param name="analysisTag"></param>
/// <returns></returns>
public static bool TryParseOldStyleCsvFileName(string filename, out string analysisTag)
{
analysisTag = string.Empty;
Expand All @@ -181,7 +162,6 @@ public static bool TryParseOldStyleCsvFileName(string filename, out string analy
{
return false;
}

}
}
}
Loading

0 comments on commit d3d3c1f

Please sign in to comment.