fix: Fixed double conversion exceptions as conversion depends on the …

…user's culture...
DigiDNA · Dec 20, 2023 · d69a3dc · d69a3dc
1 parent ea518fa
commit d69a3dc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/ValueTransformers/Converters/ByAdding.cs b/ValueTransformers/Converters/ByAdding.cs
@@ -44,7 +44,7 @@ public class ByAdding: MarkupExtension, IValueConverter
                 parameter = 0;
             }
 
-			double n = System.Convert.ToDouble( value ) + System.Convert.ToDouble( parameter );
+			double n = Helper.ParseDouble( value ) + Helper.ParseDouble( parameter );
 
 			if( targetType == typeof( char ) )
             {

diff --git a/ValueTransformers/Converters/BySubtracting.cs b/ValueTransformers/Converters/BySubtracting.cs
@@ -39,7 +39,7 @@ public class BySubtracting: MarkupExtension, IValueConverter
 				parameter = 0;
 			}
 
-			return new ByAdding().Convert( value, targetType, -System.Convert.ToDouble( parameter ), culture );
+			return new ByAdding().Convert( value, targetType, -Helper.ParseDouble( parameter ), culture );
 		}
 
 		public object? ConvertBack( object? value, Type targetType, object? parameter, System.Globalization.CultureInfo? culture )

diff --git a/ValueTransformers/Converters/DividedBy.cs b/ValueTransformers/Converters/DividedBy.cs
@@ -39,7 +39,7 @@ public class DividedBy: MarkupExtension, IValueConverter
 				parameter = 1;
 			}
 
-			return new MultipliedBy().Convert( value, targetType, 1.0 / System.Convert.ToDouble( parameter ), culture );
+			return new MultipliedBy().Convert( value, targetType, 1.0 / Helper.ParseDouble( parameter ), culture );
 		}
 
 		public object? ConvertBack( object? value, Type targetType, object? parameter, System.Globalization.CultureInfo? culture )

diff --git a/ValueTransformers/Converters/Helper.cs b/ValueTransformers/Converters/Helper.cs
@@ -143,5 +143,15 @@ public static bool IsZero( object? value )
 
             throw new ArgumentException( "Unsupported type", nameof( value ) );
         }
+
+        public static double ParseDouble( object? o )
+        {
+            if( o is string str )
+            {
+                return double.Parse( str, System.Globalization.CultureInfo.InvariantCulture );
+            }
+
+            return Convert.ToDouble( o );
+        }
     }
 }
diff --git a/ValueTransformers/Converters/MultipliedBy.cs b/ValueTransformers/Converters/MultipliedBy.cs
@@ -44,7 +44,7 @@ public class MultipliedBy: MarkupExtension, IValueConverter
                 parameter = 1;
             }
 
-			double n = System.Convert.ToDouble( value ) * System.Convert.ToDouble( parameter );
+			double n = Helper.ParseDouble( value ) * Helper.ParseDouble( parameter );
 
 			if( targetType == typeof( char ) )
             {