Number Format to Double and String values based on the preference

DynamoDS · QilongTang · Feb 17, 2023 · Feb 11, 2023 · Feb 13, 2023 · Feb 14, 2023
commit 584cbcbfc464cf99426b4c49c07bd18b00e19ca7
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -1636,7 +1636,7 @@ private IPreferences CreateOrLoadPreferences(IPreferences preferences)
 
         private static void InitializePreferences(IPreferences preferences)
         {
-            DynamoUnits.Display.PrecisionFormat = preferences.NumberFormat;
+            ProtoCore.Mirror.MirrorData.PrecisionFormat = DynamoUnits.Display.PrecisionFormat = preferences.NumberFormat;
 
             var settings = preferences as PreferenceSettings;
             if (settings != null)
@@ -1656,8 +1656,8 @@ private void PreferenceSettings_PropertyChanged(object sender, PropertyChangedEv
         {
             switch (e.PropertyName)
             {
-                case "NumberFormat":
-                    DynamoUnits.Display.PrecisionFormat = PreferenceSettings.NumberFormat;
+                case nameof(PreferenceSettings.NumberFormat):
+                    ProtoCore.Mirror.MirrorData.PrecisionFormat = DynamoUnits.Display.PrecisionFormat = PreferenceSettings.NumberFormat;
                     break;
             }
         }

diff --git a/src/DynamoCoreWpf/Utilities/PreferencesPanelUtilities.cs b/src/DynamoCoreWpf/Utilities/PreferencesPanelUtilities.cs
@@ -47,20 +47,5 @@ where expander.Header.ToString().Equals(expanderName)
             preferencesWindow.WindowStartupLocation = location;
             preferencesWindow.ShowDialog();
         }
-
-        /// <summary>
-        /// Indicates if a string value has a double number format
-        /// </summary>
-        /// <param name="valueToTest"></param>
-        /// <returns></returns>
-        public static bool IsValidDoubleNumber(string valueToTest)
-        {
-            if (double.TryParse(valueToTest, out double d) && !Double.IsNaN(d) && !Double.IsInfinity(d))
-            {
-                return true;
-            }
-
-            return false;
-        }
     }
 }
diff --git a/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs
@@ -241,6 +241,8 @@ public WatchViewModel(string label, string path, Action<string> tagGeometry, boo
             IsCollection = label == WatchViewModel.LIST || label == WatchViewModel.DICTIONARY;
         }
 
+        internal static string PrecisionFormat { get; set; } = "f3";
+
         private static string GetStringFromObject(object obj)
         {
             TypeCode type = Type.GetTypeCode(obj.GetType());
@@ -249,7 +251,7 @@ private static string GetStringFromObject(object obj)
                 case TypeCode.Boolean:
                     return ObjectToLabelString(obj);
                 case TypeCode.Double:
-                    return ((double)obj).ToString(numberFormat, CultureInfo.InvariantCulture);
+                    return ((double)obj).ToString(ProtoCore.Mirror.MirrorData.PrecisionFormat, CultureInfo.InvariantCulture);
                 case TypeCode.Int32:
                     return ((int)obj).ToString(CultureInfo.InvariantCulture);
                 case TypeCode.Int64:
@@ -259,6 +261,10 @@ private static string GetStringFromObject(object obj)
                 case TypeCode.Object:
                     return ObjectToLabelString(obj);
                 default:
+                    if (double.TryParse(obj.ToString(), out double d))
+                    {
+                        return Convert.ToDouble(obj).ToString(PrecisionFormat, CultureInfo.InvariantCulture);
+                    }
                     return (string)obj;
             };
         }

diff --git a/src/DynamoCoreWpf/Views/Preview/PreviewControl.xaml.cs b/src/DynamoCoreWpf/Views/Preview/PreviewControl.xaml.cs
@@ -329,7 +329,6 @@ private void RefreshCondensedDisplay(Action refreshDisplay)
                 {
                     var mirrorData = nodeViewModel.NodeModel.CachedValue;
                     newContent = CompactBubbleHandler.Process(mirrorData);
-                    newContent.NodeLabel = checkNumberFormat(newContent.NodeLabel);
                 },
                 (m) =>
                 {
@@ -382,10 +381,11 @@ private void RefreshExpandedDisplay(Action refreshDisplay)
                             nodeViewModel.NodeModel.OutPorts.Select(p => p.Name).Where(n => !string.IsNullOrEmpty(n));
                     }
 
+                    WatchViewModel.PrecisionFormat = nodeViewModel.DynamoViewModel.PreferenceSettings.NumberFormat;
+
                     newViewModel = nodeViewModel.DynamoViewModel.WatchHandler.GenerateWatchViewModelForData(
                         nodeViewModel.NodeModel.CachedValue, preferredDictionaryOrdering,
-                        null, nodeViewModel.NodeModel.AstIdentifierForPreview.Name, false);
-                    newViewModel.NodeLabel = checkNumberFormat(newViewModel.NodeLabel);
+                        null, nodeViewModel.NodeModel.AstIdentifierForPreview.Name, false);                    
                 },
                 (m) =>
                 {
@@ -435,19 +435,7 @@ private void RefreshExpandedDisplay(Action refreshDisplay)
                 }
             );
         }
-
-        private string checkNumberFormat(string numberValue)
-        {
-            if (PreferencesPanelUtilities.IsValidDoubleNumber(numberValue))
-            {
-                return Convert.ToDouble(numberValue).ToString(nodeViewModel.DynamoViewModel.PreferenceSettings.NumberFormat);
-            }
-            else
-            {
-                return numberValue;
-            }
-        }        
-
+
         /// <summary>
         /// It's used to apply Collapsed and Expanded events for TreeViewItems.
         /// </summary>

diff --git a/src/Engine/ProtoCore/Properties/AssemblyInfo.cs b/src/Engine/ProtoCore/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // General Information about an assembly is controlled through the following 
@@ -12,6 +12,7 @@
 [assembly: InternalsVisibleTo("ProtoTest")]
 [assembly: InternalsVisibleTo("ProtoTestFx")]
 [assembly:InternalsVisibleTo("DynamoCore")]
+[assembly: InternalsVisibleTo("DynamoCoreWpf")]
 [assembly: InternalsVisibleTo("DynamoCoreTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
 [assembly: InternalsVisibleTo("ProtoImperative")]

diff --git a/src/Engine/ProtoCore/Reflection/MirrorData.cs b/src/Engine/ProtoCore/Reflection/MirrorData.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -208,6 +208,8 @@ internal static object GetData(StackValue sv, RuntimeCore runtimeCore)
                 return null;
             }
 
+            internal static string PrecisionFormat { get; set; } = "f3";
+
             /// <summary>
             /// Returns string representation of data
             /// </summary>
@@ -230,10 +232,21 @@ public string StringData
                         // https://msdn.microsoft.com/en-us/library/3hfd35ad(v=vs.110).aspx
                         // We should always use invariant culture format for formattable 
                         // object.
-                        return (Data as IFormattable).ToString(null, CultureInfo.InvariantCulture);
+                        if (Data is double)
+                        {
+                            return (Data as IFormattable).ToString(PrecisionFormat, CultureInfo.InvariantCulture);
+                        }
+                        else
+                        {
+                            return (Data as IFormattable).ToString(null, CultureInfo.InvariantCulture);
+                        }
                     }
                     else
                     {
+                        if (double.TryParse(Data.ToString(), out double d))
+                        {
+                            return Convert.ToDouble(Data).ToString(PrecisionFormat, CultureInfo.InvariantCulture);
+                        }
                         return Data.ToString();
                     }
                 }