Improvement Number Format (#13744)

jesusalvino · web-flow · commit e1649a0eeb24 · 2023-02-17T06:56:51.000-08:00
* Improvement Number Format

* updating scope

* minor refactoring

* Number Format to Double and String values based on the preference

* comment changes and refactoring
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -1663,7 +1663,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)
@@ -1683,8 +1683,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
@@ -1,4 +1,4 @@
-﻿using System.Linq;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using Dynamo.Controls;
diff --git a/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs
@@ -250,6 +250,8 @@ private static string GetStringFromObject(object obj)
                     return ObjectToLabelString(obj);
                 case TypeCode.Double:
                     return ((double)obj).ToString(numberFormat, CultureInfo.InvariantCulture);
+                //TODO: uncomment this once https://jira.autodesk.com/browse/DYN-5101 is complete
+                //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(ProtoCore.Mirror.MirrorData.PrecisionFormat, CultureInfo.InvariantCulture);
+                    }
                     return (string)obj;
             };
         }
diff --git a/src/DynamoCoreWpf/Views/Preview/PreviewControl.xaml.cs b/src/DynamoCoreWpf/Views/Preview/PreviewControl.xaml.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -383,8 +383,7 @@ private void RefreshExpandedDisplay(Action refreshDisplay)
 
                     newViewModel = nodeViewModel.DynamoViewModel.WatchHandler.GenerateWatchViewModelForData(
                         nodeViewModel.NodeModel.CachedValue, preferredDictionaryOrdering,
-                        null, nodeViewModel.NodeModel.AstIdentifierForPreview.Name, false);
-
+                        null, nodeViewModel.NodeModel.AstIdentifierForPreview.Name, false);                    
                 },
                 (m) =>
                 {
@@ -434,7 +433,7 @@ private void RefreshExpandedDisplay(Action refreshDisplay)
                 }
             );
         }
-
+        
         /// <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,23 @@ 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.
+
+                        //TODO: uncomment this once https://jira.autodesk.com/browse/DYN-5101 is complete
+                        //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();
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1663,7 +1663,7 @@ private IPreferences CreateOrLoadPreferences(IPreferences preferences)`
`1663`	`1663`
`1664`	`1664`	`private static void InitializePreferences(IPreferences preferences)`
`1665`	`1665`	`{`
`1666`		`- DynamoUnits.Display.PrecisionFormat = preferences.NumberFormat;`
	`1666`	`+ ProtoCore.Mirror.MirrorData.PrecisionFormat = DynamoUnits.Display.PrecisionFormat = preferences.NumberFormat;`
`1667`	`1667`
`1668`	`1668`	`var settings = preferences as PreferenceSettings;`
`1669`	`1669`	`if (settings != null)`
`@@ -1683,8 +1683,8 @@ private void PreferenceSettings_PropertyChanged(object sender, PropertyChangedEv`
`1683`	`1683`	`{`
`1684`	`1684`	`switch (e.PropertyName)`
`1685`	`1685`	`{`
`1686`		`- case "NumberFormat":`
`1687`		`- DynamoUnits.Display.PrecisionFormat = PreferenceSettings.NumberFormat;`
	`1686`	`+ case nameof(PreferenceSettings.NumberFormat):`
	`1687`	`+ ProtoCore.Mirror.MirrorData.PrecisionFormat = DynamoUnits.Display.PrecisionFormat = PreferenceSettings.NumberFormat;`
`1688`	`1688`	`break;`
`1689`	`1689`	`}`
`1690`	`1690`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Linq;`
	`1`	`+using System.Linq;`
`2`	`2`	`using System.Windows;`
`3`	`3`	`using System.Windows.Controls;`
`4`	`4`	`using Dynamo.Controls;`