fix culture-dependent double parsing in a few places (#2069)

smith-chem-wisc · Jun 10, 2021 · 5ef29e5 · 5ef29e5
1 parent 774eddb
commit 5ef29e5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/EngineLayer/SpectralLibrarySearch/SpectralLibrary.cs b/EngineLayer/SpectralLibrarySearch/SpectralLibrary.cs
@@ -204,23 +204,23 @@ private LibrarySpectrum ReadLibrarySpectrum(StreamReader reader, bool onlyReadHe
                         int indOfParent = Array.IndexOf(split, "Parent");
                         if (indOfParent > 0)
                         {
-                            precursorMz = double.Parse(split[indOfParent + 1]);
+                            precursorMz = double.Parse(split[indOfParent + 1], CultureInfo.InvariantCulture);
                         }
                     }
 
                     // get RT
                     int indOfRt = Array.IndexOf(split, "iRT");
                     if (indOfRt > 0)
                     {
-                        rt = double.Parse(split[indOfRt + 1]);
+                        rt = double.Parse(split[indOfRt + 1], CultureInfo.InvariantCulture);
                     }
                     else
                     {
                         indOfRt = Array.IndexOf(split, "RT");
 
                         if (indOfRt > 0)
                         {
-                            rt = double.Parse(split[indOfRt + 1]);
+                            rt = double.Parse(split[indOfRt + 1], CultureInfo.InvariantCulture);
                         }
                     }
 

diff --git a/GUI/MetaDraw/MetaDrawSettingsWindow.xaml.cs b/GUI/MetaDraw/MetaDrawSettingsWindow.xaml.cs
@@ -2,6 +2,7 @@
 using EngineLayer.GlycoSearch;
 using GuiFunctions;
 using System.ComponentModel;
+using System.Globalization;
 using System.Windows;
 
 namespace MetaMorpheusGUI
@@ -55,7 +56,7 @@ private void Save_Click(object sender, RoutedEventArgs e)
 
             if (!string.IsNullOrWhiteSpace(qValueBox.Text))
             {
-                if (double.TryParse(qValueBox.Text, out double qValueFilter) && qValueFilter >= 0 && qValueFilter <= 1)
+                if (double.TryParse(qValueBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out double qValueFilter) && qValueFilter >= 0 && qValueFilter <= 1)
                 {
                     MetaDrawSettings.QValueFilter = qValueFilter;
                 }

diff --git a/GUI/TaskWindows/GPTMDTaskWindow.xaml.cs b/GUI/TaskWindows/GPTMDTaskWindow.xaml.cs
@@ -421,7 +421,7 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             double? minimumAllowedIntensityRatioToBasePeak = null;
             if (!string.IsNullOrWhiteSpace(MinimumAllowedIntensityRatioToBasePeakTexBox.Text))
             {
-                if (double.TryParse(MinimumAllowedIntensityRatioToBasePeakTexBox.Text, out double minimumAllowedIntensityRatio))
+                if (double.TryParse(MinimumAllowedIntensityRatioToBasePeakTexBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out double minimumAllowedIntensityRatio))
                 {
                     minimumAllowedIntensityRatioToBasePeak = minimumAllowedIntensityRatio;
                 }

diff --git a/GUI/TaskWindows/SearchTaskWindow.xaml.cs b/GUI/TaskWindows/SearchTaskWindow.xaml.cs
@@ -495,13 +495,13 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             }
 
             double? minimumAllowedIntensityRatioToBasePeak = null;
-            if (double.TryParse(MinimumAllowedIntensityRatioToBasePeakTexBox.Text, out double minimumAllowedIntensityRatio))
+            if (double.TryParse(MinimumAllowedIntensityRatioToBasePeakTexBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out double minimumAllowedIntensityRatio))
             {
                 minimumAllowedIntensityRatioToBasePeak = minimumAllowedIntensityRatio;
             }
 
             double? windowWidthThompsons = null;
-            if (double.TryParse(WindowWidthThomsonsTextBox.Text, out double windowWidth))
+            if (double.TryParse(WindowWidthThomsonsTextBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out double windowWidth))
             {
                 windowWidthThompsons = windowWidth;
             }

diff --git a/GUI/Util/GlobalGuiSettings.cs b/GUI/Util/GlobalGuiSettings.cs
@@ -277,7 +277,7 @@ public static bool CheckPeakFindingTolerance(string text)
 
             public static bool CheckHistogramBinWidth(string text)
             {
-                if (!float.TryParse(text, out float binWidth) || binWidth < 0 || binWidth > 1)
+                if (!double.TryParse(text, NumberStyles.Any, CultureInfo.InvariantCulture, out double binWidth) || binWidth < 0 || binWidth > 1)
                 {
                     MessageBox.Show("The histogram bin width must be between zero and one Daltons. \n You entered " + '"' + text + '"');
                     return false;

diff --git a/GuiFunctions/MetaDraw/PeptideSpectrumMatchPlot.cs b/GuiFunctions/MetaDraw/PeptideSpectrumMatchPlot.cs
@@ -394,7 +394,7 @@ protected void AnnotateProperties()
             text.Append("\r\n");
 
             text.Append("Theoretical Mass: ");
-            text.Append(double.TryParse(SpectrumMatch.PeptideMonoMass, out var monoMass) ? monoMass.ToString("F3") : SpectrumMatch.PeptideMonoMass);
+            text.Append(double.TryParse(SpectrumMatch.PeptideMonoMass, NumberStyles.Any, CultureInfo.InvariantCulture, out var monoMass) ? monoMass.ToString("F3") : SpectrumMatch.PeptideMonoMass);
             text.Append("\r\n");
 
             text.Append("Score: ");