DYN-4964-WorkingRange-Popup CodeReview 2

Add functionality for when a custom node is created the Workspace Scale Factor is set.
Updating and removing some comments and also I started to add the unit test.

src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs

@@ -2211,6 +2211,8 @@ private void ShowNewFunctionDialogAndMakeFunction(object parameter)
                 this.ExecuteCommand(new DynamoModel.CreateCustomNodeCommand(Guid.NewGuid(),
                     args.Name, args.Category, args.Description, true));
                 this.ShowStartPage = false;
+
+                SetDefaultScaleFactor();
             }
         }
 
@@ -2524,13 +2526,7 @@ public void MakeNewHomeWorkspace(object parameter)
 
                 ShowStartPage = false; // Hide start page if there's one.
 
-                var defaultWorkspace = Workspaces.FirstOrDefault();
-
-                if (defaultWorkspace != null)
-                {
-                    defaultWorkspace.GeoScalingViewModel.ScaleValue = PreferenceSettings.DefaultScaleFactor;
-                    defaultWorkspace.GeoScalingViewModel.UpdateGeometryScale(PreferenceSettings.DefaultScaleFactor);
-                }
+                SetDefaultScaleFactor();
             }
         }
 
@@ -2576,7 +2572,7 @@ internal bool ClearHomeWorkspaceInternal()
                 model.ClearCurrentWorkspace();
 
                 var defaultWorkspace = Workspaces.FirstOrDefault();
-                //Every time that a new workspace is created we have to assign the Defautl Geometry Scaling value defined in Preferences (comming from DynamoSettings.xml)
+                //Every time that a new workspace is created we have to assign the Default Geometry Scaling value defined in Preferences
                 if (defaultWorkspace !=null && defaultWorkspace.GeoScalingViewModel != null && preferencesViewModel != null)
                     defaultWorkspace.GeoScalingViewModel.ScaleSize = preferencesViewModel.DefaultGeometryScaling;
 
@@ -3180,6 +3176,17 @@ private bool CanSetNumberFormat(object parameter)
             return true;
         }
 
+        private void SetDefaultScaleFactor()
+        {
+            var defaultWorkspace = Workspaces.FirstOrDefault();
+
+            if (defaultWorkspace != null)
+            {
+                defaultWorkspace.GeoScalingViewModel.ScaleValue = PreferenceSettings.DefaultScaleFactor;
+                defaultWorkspace.GeoScalingViewModel.UpdateGeometryScale(PreferenceSettings.DefaultScaleFactor);
+            }
+        }
+
         #region Shutdown related methods
 
         /// <summary>

src/DynamoCoreWpf/Views/Core/GeometryScalingPopup.xaml.cs

@@ -42,7 +42,6 @@ private void Geometry_Scaling_Checked(object sender, System.Windows.RoutedEventA
         {
             var selectedButton = sender as Button;
             if (selectedButton == null) return;
-            //var buttons = BaseGrid.Children.OfType<Button>();
             var buttons = GeometryScalingRadiosPanel.Children.OfType<Button>();
 
             int index = 0;

src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs

@@ -1054,10 +1054,11 @@ private void OnContextMenuOpened(object sender, EventArgs e)
         private void OnGeometryScaling_Click(object sender, RoutedEventArgs e)
         {
             if (GeoScalingPopup == null)
+            {
                 GeoScalingPopup = new GeometryScalingPopup(ViewModel.DynamoViewModel);
-
-            GeoScalingPopup.Placement = PlacementMode.Bottom;
-            GeoScalingPopup.PlacementTarget = geometryScalingButton;
+                GeoScalingPopup.Placement = PlacementMode.Bottom;
+                GeoScalingPopup.PlacementTarget = geometryScalingButton;
+            }
             GeoScalingPopup.IsOpen = true;
         }
     }

test/DynamoCoreWpfTests/PreferencesGeometryScalingTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Windows;
@@ -7,6 +7,8 @@
 using Dynamo.Wpf.Views;
 using DynamoCoreWpfTests.Utility;
 using NUnit.Framework;
+using Dynamo.Configuration;
+using Dynamo.ViewModels;
 
 namespace DynamoCoreWpfTests
 {
@@ -90,5 +92,28 @@ public void PreferencesGeoScaling_RunGraph_Manual_Mode()
             //When RunType = Manual and the MarkNodesAsModifiedAndRequestRun() method is called, the graph won't be executed and the node state will remain in Active
             Assert.AreEqual(nodeView.ViewModel.State, ElementState.Active);
         }
+
+        [Test]
+        public void PreferencesGeoScaling_Serializing()
+        {
+            int scaleFactor;
+            double defaultScaleFactor;
+
+            var settings = new PreferenceSettings();
+
+            var settingFilePath = Path.Combine(TempFolder, "DynamoSettings.xml");
+
+            var settingsLoadedFromFile = PreferenceSettings.Load(settingFilePath);
+
+            //The GeometryScalingCodeBlock.dyn contains a CodeBlock with a large number that needs ScaleFactor > Medium
+            Open(@"core\GeometryScalingCodeBlock.dyn");
+
+            var dynViewModel = View.DataContext as DynamoViewModel;
+            scaleFactor = dynViewModel.ScaleFactorLog;
+            defaultScaleFactor = dynViewModel.PreferenceSettings.DefaultScaleFactor;
+
+        }
+
+
     }
 }