revert partial and add comments (#14377)

mjkkirschner · web-flow · commit 01c2525c29d6 · 2023-09-06T00:24:23.000-04:00
diff --git a/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs
@@ -260,6 +260,7 @@ private static string GetStringFromObject(object obj)
                     return ObjectToLabelString(obj);
                 case TypeCode.Double:
                     return ((double)obj).ToString(numberFormat, CultureInfo.InvariantCulture);
+                //!!!!carefully consider the consequences of this change before uncommenting.
                 //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:
@@ -271,10 +272,6 @@ 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/Engine/ProtoCore/Reflection/MirrorData.cs b/src/Engine/ProtoCore/Reflection/MirrorData.cs
@@ -224,18 +224,19 @@ public string StringData
                     {
                         return "null";
                     }
-                    else if (Data is bool)
+                    if (Data is bool)
                     {
                         return Data.ToString().ToLower();
                     }
-                    else if (Data is IFormattable)
+                    if (Data is IFormattable)
                     {
                         // Object.ToString() by default will use the current 
                         // culture to do formatting. For example, Double.ToString()
                         // https://msdn.microsoft.com/en-us/library/3hfd35ad(v=vs.110).aspx
                         // We should always use invariant culture format for formattable 
                         // object.
 
+                        //!!!!carefully consider the consequences of this change before uncommenting.
                         //TODO: uncomment this once https://jira.autodesk.com/browse/DYN-5101 is complete
                         //if (Data is double)
                         //{
@@ -246,12 +247,8 @@ public string StringData
                         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
`@@ -224,18 +224,19 @@ public string StringData`
`224`	`224`	`{`
`225`	`225`	`return "null";`
`226`	`226`	`}`
`227`		`- else if (Data is bool)`
	`227`	`+ if (Data is bool)`
`228`	`228`	`{`
`229`	`229`	`return Data.ToString().ToLower();`
`230`	`230`	`}`
`231`		`- else if (Data is IFormattable)`
	`231`	`+ if (Data is IFormattable)`
`232`	`232`	`{`
`233`	`233`	`// Object.ToString() by default will use the current`
`234`	`234`	`// culture to do formatting. For example, Double.ToString()`
`235`	`235`	`// https://msdn.microsoft.com/en-us/library/3hfd35ad(v=vs.110).aspx`
`236`	`236`	`// We should always use invariant culture format for formattable`
`237`	`237`	`// object.`
`238`	`238`
	`239`	`+ //!!!!carefully consider the consequences of this change before uncommenting.`
`239`	`240`	`//TODO: uncomment this once https://jira.autodesk.com/browse/DYN-5101 is complete`
`240`	`241`	`//if (Data is double)`
`241`	`242`	`//{`
`@@ -246,12 +247,8 @@ public string StringData`
`246`	`247`	`return (Data as IFormattable).ToString(null, CultureInfo.InvariantCulture);`
`247`	`248`	`//}`
`248`	`249`	`}`
`249`		`- else`
	`250`	`+`
`250`	`251`	`{`
`251`		`- if (double.TryParse(Data.ToString(), out double d))`
`252`		`- {`
`253`		`- return Convert.ToDouble(Data).ToString(PrecisionFormat, CultureInfo.InvariantCulture);`
`254`		`- }`
`255`	`252`	`return Data.ToString();`
`256`	`253`	`}`
`257`	`254`	`}`