DynamoDS
diff --git a/‎src/DynamoCore/Configuration/IPreferences.cs
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion b/‎src/DynamoCore/Configuration/IPreferences.cs
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/‎src/DynamoCore/Configuration/PreferenceSettings.cs
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions b/‎src/DynamoCore/Configuration/PreferenceSettings.cs
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions b/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+10-1Lines changed: 10 additions & 1 deletion b/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+10-1Lines changed: 10 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion b/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion b/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/UI/Converters.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/Converters.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Images/Canvas/canvas-button-geometry-scaling.png
Copy file name to clipboard
1.63 KB b/‎src/DynamoCoreWpf/UI/Images/Canvas/canvas-button-geometry-scaling.png
Copy file name to clipboard
1.63 KB
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
+25-1Lines changed: 25 additions & 1 deletion b/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
+25-1Lines changed: 25 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/GeometryScalingViewModel.cs
Copy file name to clipboard
+80Lines changed: 80 additions & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/GeometryScalingViewModel.cs
Copy file name to clipboard
+80Lines changed: 80 additions & 0 deletions
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Dynamo.Graph.Connectors;
 
@@ -40,6 +40,11 @@ public interface IPreferences
         /// </summary>
         bool IsBackgroundGridVisible { get; set; }
 
+        /// <summary>
+        /// Indicates the Default Geometry Scaling value from the Preferences panel
+        /// </summary>
+        double DefaultScaleFactor { get; set; }
+
         /// <summary>
         /// Indicates whether background preview is active or not.
         /// </summary>
 
@@ -51,6 +51,7 @@ public class PreferenceSettings : NotificationObject, IPreferences, IRenderPreci
         private string lastUpdateDownloadPath;
         private int maxNumRecentFiles;
         private bool isBackgroundGridVisible;
+        private double defaultScaleFactor;
         private bool disableTrustWarnings = false;
         private bool isNotificationCenterEnabled;
         private bool isStaticSplashScreenEnabled;
@@ -230,6 +231,24 @@ public bool IsBackgroundGridVisible
             }
         }
 
+        /// <summary>
+        /// Default geometry scale factor for a new workspace
+        /// </summary>
+        public double DefaultScaleFactor
+        {
+            get
+            {
+                return defaultScaleFactor;
+            }
+            set
+            {
+                if (value == defaultScaleFactor) return;
+                defaultScaleFactor = value;
+
+                RaisePropertyChanged(nameof(DefaultScaleFactor));
+            }
+        }
+
 
         /// <summary>
         /// Indicates whether background preview is active or not.
 
@@ -19,6 +19,8 @@
   <ItemGroup>
     <None Remove="node_modules\%40dynamods\splash-screen\build\index.bundle.js" />
     <None Remove="node_modules\%40dynamods\splash-screen\build\index.html" />
+    <None Remove="UI\Images\Canvas\canvas-button-geometry-scaling.png" />
+    <None Remove="Views\Core\GeometryScalingPopup.xaml" />
     <None Remove="UI\Images\question-hover-blue-16px.png" />
     <None Remove="Views\SplashScreen\WebApp\splashScreenBackground.png" />
   </ItemGroup>
@@ -308,6 +310,7 @@
     <Compile Include="ViewModels\Core\Converters\DynamoPythonScriptEditorTextOptions.cs" />
     <Compile Include="ViewModels\Core\Converters\SerializationConverters.cs" />
     <Compile Include="ViewModels\Core\DynamoViewModelBranding.cs" />
+    <Compile Include="ViewModels\Core\GeometryScalingViewModel.cs" />
     <Compile Include="ViewModels\Core\HomeWorkspaceViewModel.cs" />
     <Compile Include="ViewModels\Core\InPortViewModel.cs" />
     <Compile Include="ViewModels\Core\OutPortViewModel.cs" />
@@ -358,6 +361,9 @@
     <Compile Include="Views\Core\ConnectorPinView.xaml.cs">
       <DependentUpon>ConnectorPinView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Core\GeometryScalingPopup.xaml.cs">
+      <DependentUpon>GeometryScalingPopup.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Debug\DebugModesWindow.xaml.cs">
       <DependentUpon>DebugModesWindow.xaml</DependentUpon>
     </Compile>
@@ -519,6 +525,9 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Core\GeometryScalingPopup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\FileTrust\FileTrustWarning.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -684,6 +693,7 @@
     <Resource Include="UI\Images\Alignment\align_x_distribute.png" />
     <Resource Include="UI\Images\Alignment\align_y_average.png" />
     <Resource Include="UI\Images\Alignment\align_y_distribute.png" />
+    <Resource Include="UI\Images\Canvas\canvas-button-geometry-scaling.png" />
     <Resource Include="UI\Images\caret_up.png" />
     <EmbeddedResource Include="Views\GuidedTour\HtmlPages\Resources\ArtifaktElement-Regular.woff" />
     <Resource Include="UI\Images\cursors.psd" />
 
@@ -2375,7 +2375,7 @@ You can try disabling loading packages from built-in package paths, or unload th
 Do you wish to uninstall {1}? Restart {2} to complete the uninstall and try downloading {0} again.</value>
   </data>
   <data name="PreferencesViewVisualSettingsGeoScaling" xml:space="preserve">
-    <value>Geometry Scaling</value>
+    <value>Default Geometry Scaling</value>
     <comment>Expander Header Name</comment>
   </data>
   <data name="PreferencesViewVisualSettingsGroupStyles" xml:space="preserve">
@@ -3482,6 +3482,9 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="SplashScreenSigningIn" xml:space="preserve">
     <value>Signing In</value>
   </data>
+  <data name="InCanvasGeometryScalingToolTip" xml:space="preserve">
+    <value>Workspace Geometry Scaling</value>
+  </data>
   <data name="GroupContextMenuPreview" xml:space="preserve">
     <value>Preview Geometry</value>
   </data>
 
@@ -2591,7 +2591,7 @@ You can try disabling loading packages from built-in package paths, or unload th
 Do you wish to uninstall {1}? Restart {2} to complete the uninstall and try downloading {0} again.</value>
   </data>
   <data name="PreferencesViewVisualSettingsGeoScaling" xml:space="preserve">
-    <value>Geometry Scaling</value>
+    <value>Default Geometry Scaling</value>
     <comment>Expander Header Name</comment>
   </data>
   <data name="PreferencesViewVisualSettingsGroupStyles" xml:space="preserve">
@@ -3469,6 +3469,9 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="SplashScreenSigningIn" xml:space="preserve">
     <value>Signing In</value>
   </data>
+  <data name="InCanvasGeometryScalingToolTip" xml:space="preserve">
+    <value>Workspace Geometry Scaling</value>
+  </data>
   <data name="GroupContextMenuPreview" xml:space="preserve">
     <value>Preview Geometry</value>
   </data>
 
@@ -3424,6 +3424,24 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
+    /// <summary>
+    /// Receive a GeometryScaleSize value and if it matches the parameter passed will return a brush with a specific color
+    /// </summary>
+    public class ScaleSizeBackgroundConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value.Equals(parameter))
+                return new SolidColorBrush(Color.FromRgb(217, 217, 217));
+            return new SolidColorBrush(Color.FromRgb(71, 71, 71));
+            
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value.Equals(true) ? parameter : Binding.DoNothing;
+        }
+    }
+
     /// <summary>
     /// This converter was designed for Expanders, so it will store/fetch the current Expander state
     /// </summary>
 
@@ -42,6 +42,7 @@
 using Dynamo.Wpf.ViewModels.FileTrust;
 using Dynamo.Wpf.ViewModels.Watch3D;
 using DynamoUtilities;
+using ViewModels.Core;
 using ISelectable = Dynamo.Selection.ISelectable;
 using WpfResources = Dynamo.Wpf.Properties.Resources;
 
@@ -98,6 +99,8 @@ internal PreferencesViewModel PreferencesViewModel
             }
         }
 
+       
+
         /// <summary>
         /// Guided Tour Manager
         /// </summary>
@@ -743,6 +746,7 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
 
             preferencesViewModel = new PreferencesViewModel(this);
 
+
             if (!DynamoModel.IsTestMode && !DynamoModel.IsHeadless)
             {
                 model.State = DynamoModel.DynamoModelState.StartedUI;
@@ -2207,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();
             }
         }
 
@@ -2514,11 +2520,13 @@ internal bool CanSelectAll(object parameter)
         public void MakeNewHomeWorkspace(object parameter)
         {
             if (ClearHomeWorkspaceInternal())
-            {
+            {   
                 var t = new DelegateBasedAsyncTask(model.Scheduler, () => model.ResetEngine());
                 model.Scheduler.ScheduleForExecution(t);
 
                 ShowStartPage = false; // Hide start page if there's one.
+
+                SetDefaultScaleFactor();
             }
         }
 
@@ -2563,6 +2571,11 @@ internal bool ClearHomeWorkspaceInternal()
 
                 model.ClearCurrentWorkspace();
 
+                var defaultWorkspace = Workspaces.FirstOrDefault();
+                //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;
+
                 return true;
             }
 
@@ -3163,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>
 
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using Dynamo.Core;
+using Dynamo.ViewModels;
+
+namespace ViewModels.Core
+{
+    /// <summary>
+    /// This class will be contain information about the current Geometry Scale selected in the Dynamo Workspace
+    /// </summary>
+    public class GeometryScalingViewModel : NotificationObject
+    {
+        private DynamoViewModel dynViewModel;
+        private GeometryScaleSize scaleSize;
+        private double scaleValue = 0;
+        internal double ScaleValue
+        {
+            get
+            {
+                return scaleValue;
+            }
+            set
+            {
+                scaleValue = value;
+                UpdateGeometryScale(scaleValue);
+            }
+        }
+
+        internal GeometryScalingViewModel(DynamoViewModel dynViewModel)
+        {
+            this.dynViewModel = dynViewModel;
+        }
+
+        internal Tuple<string, string, string> ScaleRange
+        {
+            get
+            {
+                return scaleRanges[ScaleSize];
+            }
+        }
+
+
+        internal static Dictionary<GeometryScaleSize, Tuple<string, string, string>> scaleRanges = new Dictionary<GeometryScaleSize, Tuple<string, string, string>>
+        {
+            {GeometryScaleSize.Medium, new Tuple<string, string, string>("medium", "0.0001", "10,000")},
+            {GeometryScaleSize.Small, new Tuple<string, string, string>("small", "0.000,001", "100")},
+            {GeometryScaleSize.Large, new Tuple<string, string, string>("large", "0.01", "1,000,000")},
+            {GeometryScaleSize.ExtraLarge, new Tuple<string, string, string>("extra large", "1", "100,000,000")}
+        };
+
+        /// <summary>
+        /// Current Geometry Scale selected in dynamo workspace.
+        /// </summary>
+        public GeometryScaleSize ScaleSize
+        {
+            get
+            {
+                return scaleSize;
+            }
+            set
+            {
+                if(scaleSize != value)
+                {
+                    scaleSize = value;
+                    RaisePropertyChanged(nameof(ScaleSize));
+                }               
+            }
+        }
+
+        internal void UpdateGeometryScale(double scaleFactor)
+        {
+            int UIScaleFactor = GeometryScalingOptions.ConvertScaleFactorToUI((int)scaleFactor);
+
+            if (Enum.IsDefined(typeof(GeometryScaleSize), UIScaleFactor))
+            {
+                ScaleSize = (GeometryScaleSize)UIScaleFactor;
+            }
+        }
+    }
+}