diff --git a/MetaMorpheus/EngineLayer/GlobalVariables.cs b/MetaMorpheus/EngineLayer/GlobalVariables.cs index 2bf0a2017..3e8ccd4a0 100644 --- a/MetaMorpheus/EngineLayer/GlobalVariables.cs +++ b/MetaMorpheus/EngineLayer/GlobalVariables.cs @@ -70,7 +70,7 @@ public static class GlobalVariables public static void SetUpGlobalVariables() { AcceptedDatabaseFormats = new List { ".fasta", ".fa", ".xml", ".msp" }; - AcceptedSpectraFormats = new List { ".raw", ".mzml", ".mgf", ".msalign" }; + AcceptedSpectraFormats = new List { ".raw", ".mzml", ".mgf", ".msalign", ".tdf", ".tdf_bin", ".d" }; AnalyteType = AnalyteType.Peptide; _InvalidAminoAcids = new char[] { 'X', 'B', 'J', 'Z', ':', '|', ';', '[', ']', '{', '}', '(', ')', '+', '-' }; ExperimentalDesignFileName = "ExperimentalDesign.tsv"; diff --git a/MetaMorpheus/GUI/App.xaml b/MetaMorpheus/GUI/App.xaml index 7a7f81415..b01c43c56 100644 --- a/MetaMorpheus/GUI/App.xaml +++ b/MetaMorpheus/GUI/App.xaml @@ -9,7 +9,7 @@ - + diff --git a/MetaMorpheus/GUI/MainWindow.xaml.cs b/MetaMorpheus/GUI/MainWindow.xaml.cs index 7f7f5769d..70eaa2fae 100644 --- a/MetaMorpheus/GUI/MainWindow.xaml.cs +++ b/MetaMorpheus/GUI/MainWindow.xaml.cs @@ -301,7 +301,7 @@ private void NewoutLabelStatus(object sender, StringEventArgs s) { Dispatcher.BeginInvoke(new Action(() => NewoutLabelStatus(sender, s))); } - else + else if (InProgressTasks != null) { // Find the task or the collection!!! @@ -1279,7 +1279,7 @@ private void MenuItem_MetaDraw_Click(object sender, RoutedEventArgs e) // Get search results var searchResult = Directory.GetFiles(finalSearchTask.Task.OutputFolder) - .First(p => p.EndsWith(".psmtsv") || p.EndsWith(".osmtsv")); + .First(p => p.EndsWith("PSMs.psmtsv") || p.EndsWith("OSMs.osmtsv")); filesToLoad = spectraFiles.Append(searchResult).ToArray(); } diff --git a/MetaMorpheus/GUI/MetaDraw/BioPolymerCoverageTabView.xaml b/MetaMorpheus/GUI/MetaDraw/BioPolymerCoverageTabView.xaml new file mode 100644 index 000000000..c83f7bebf --- /dev/null +++ b/MetaMorpheus/GUI/MetaDraw/BioPolymerCoverageTabView.xaml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + +