Merge branch 'master' of https://github.com/DynamoDS/Dynamo

src/DynamoCore/Graph/Connectors/ConnectorModel.cs

@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Xml;
+using Dynamo.Configuration;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Utilities;
@@ -159,6 +160,9 @@ private ConnectorModel(
             GUID = guid;
             Start = start.OutPorts[startIndex];
             PortModel endPort = end.InPorts[endIndex];
+            // Reading visibility settings from preferences and setting the visibility of the connector
+            // so that setting changes within the session can be relfected instantly
+            IsHidden = !PreferenceSettings.Instance.ShowConnector;
 
             Debug.WriteLine("Creating a connector between ports {0}(owner:{1}) and {2}(owner:{3}).",
                 start.GUID, Start.Owner == null ? "null" : Start.Owner.Name, end.GUID, endPort.Owner == null ? "null" : endPort.Owner.Name);

src/DynamoCore/Models/RecordableCommands.cs

@@ -11,6 +11,7 @@
 using System.Runtime.Serialization;
 using System.Xml;
 using System.Globalization;
+using Dynamo.Configuration;
 
 namespace Dynamo.Models
 {
@@ -1563,15 +1564,16 @@ public enum Mode
                 BeginCreateConnections
             }
 
-            void setProperties(int portIndex, PortType portType, Mode mode)
+            void SetProperties(int portIndex, PortType portType, Mode mode)
             {
                 PortIndex = portIndex;
                 Type = portType;
                 ConnectionMode = mode;
+                IsHidden = !PreferenceSettings.Instance.ShowConnector;
             }
 
             /// <summary>
-            ///
+            /// Recordable command ConnectionCommand constructor
             /// </summary>
             /// <param name="nodeId"></param>
             /// <param name="portIndex"></param>
@@ -1581,11 +1583,11 @@ void setProperties(int portIndex, PortType portType, Mode mode)
             public MakeConnectionCommand(string nodeId, int portIndex, PortType portType, Mode mode)
                 : base(new[] { Guid.Parse(nodeId) })
             {
-                setProperties(portIndex, portType, mode);
+                SetProperties(portIndex, portType, mode);
             }
 
             /// <summary>
-            ///
+            /// Recordable command ConnectionCommand constructor
             /// </summary>
             /// <param name="nodeId"></param>
             /// <param name="portIndex"></param>
@@ -1594,11 +1596,11 @@ public MakeConnectionCommand(string nodeId, int portIndex, PortType portType, Mo
             public MakeConnectionCommand(Guid nodeId, int portIndex, PortType portType, Mode mode)
                 : base(new[] { nodeId })
             {
-                setProperties(portIndex, portType, mode);
+                SetProperties(portIndex, portType, mode);
             }
 
             /// <summary>
-            ///
+            /// Recordable command ConnectionCommand constructor
             /// </summary>
             /// <param name="nodeId"></param>
             /// <param name="portIndex"></param>
@@ -1607,7 +1609,7 @@ public MakeConnectionCommand(Guid nodeId, int portIndex, PortType portType, Mode
             public MakeConnectionCommand(IEnumerable<Guid> nodeId, int portIndex, PortType portType, Mode mode)
                 : base(nodeId)
             {
-                setProperties(portIndex, portType, mode);
+                SetProperties(portIndex, portType, mode);
             }
 
             internal static MakeConnectionCommand DeserializeCore(XmlElement element)
@@ -1616,7 +1618,6 @@ internal static MakeConnectionCommand DeserializeCore(XmlElement element)
                 int portIndex = helper.ReadInteger("PortIndex");
                 var portType = ((PortType)helper.ReadInteger("Type"));
                 var mode = ((Mode)helper.ReadInteger("ConnectionMode"));
-
                 var modelGuids = DeserializeGuid(element, helper);
 
                 return new MakeConnectionCommand(modelGuids, portIndex, portType, mode);
@@ -1635,6 +1636,9 @@ internal static MakeConnectionCommand DeserializeCore(XmlElement element)
             [DataMember]
             public Mode ConnectionMode { get; private set; }
 
+            [DataMember]
+            internal bool IsHidden { get; private set; }
+
             #endregion
 
             #region Protected Overridable Methods
@@ -1651,6 +1655,7 @@ protected override void SerializeCore(XmlElement element)
                 helper.SetAttribute("PortIndex", PortIndex);
                 helper.SetAttribute("Type", ((int)Type));
                 helper.SetAttribute("ConnectionMode", ((int)ConnectionMode));
+                helper.SetAttribute("IsHidden", IsHidden);
             }
 
             #endregion

src/DynamoCoreWpf/Controls/StartPage.xaml.cs

@@ -295,6 +295,10 @@ private void SetSampleDatasetsPath()
                     {
                         sampleDatasetsPath = datasetsPath;
                     }
+                    else
+                    {
+                        DynamoViewModel.Model.Logger.Log("Error, Dataset folder not found.");
+                    }
                 }
             }
             catch (Exception ex)

src/DynamoCoreWpf/DynamoCoreWpf.csproj

@@ -59,7 +59,7 @@
 
     <Target Name="NpmRunBuildHomePage" BeforeTargets="BeforeBuild">
         <PropertyGroup>
-            <PackageVersion>1.0.18</PackageVersion>
+            <PackageVersion>1.0.19</PackageVersion>
             <PackageName>DynamoHome</PackageName>
         </PropertyGroup>
         <Exec Command="$(PowerShellCommand) -ExecutionPolicy ByPass -Command echo ($(SolutionDir)\pkgexist.ps1 $(PackageName) $(PackageVersion))" ConsoleToMSBuild="true">

src/DynamoCoreWpf/ViewModels/Core/ConnectorViewModel.cs

@@ -1450,22 +1450,18 @@ public void Redraw(object parameter)
         {
             var p2 = new Point();
 
-            if (parameter is Point)
+            if (parameter is Point point)
             {
-                p2 = (Point)parameter;
+                p2 = point;
             }
-            else if (parameter is Point2D)
+            else if (parameter is Point2D d)
             {
-                p2 = ((Point2D)parameter).AsWindowsType();
+                p2 = d.AsWindowsType();
             }
 
             CurvePoint3 = p2;
-
-            var offset = 0.0;
-            double distance = 0;
-
-            distance = Math.Sqrt(Math.Pow(CurvePoint3.X - CurvePoint0.X, 2) + Math.Pow(CurvePoint3.Y - CurvePoint0.Y, 2));
-            offset = .45 * distance;
+            double distance = Math.Sqrt(Math.Pow(CurvePoint3.X - CurvePoint0.X, 2) + Math.Pow(CurvePoint3.Y - CurvePoint0.Y, 2));
+            double offset = .45 * distance;
 
             CurvePoint1 = new Point(CurvePoint0.X + offset, CurvePoint0.Y);
             CurvePoint2 = new Point(p2.X - offset, p2.Y);
@@ -1485,20 +1481,28 @@ public void Redraw(object parameter)
             //RaisePropertyChanged(string.Empty);
 
 
-            PathFigure pathFigure = new PathFigure();
-            pathFigure.StartPoint = CurvePoint0;
+            PathFigure pathFigure = new PathFigure
+            {
+                StartPoint = CurvePoint0
+            };
 
             BezierSegment segment = new BezierSegment(CurvePoint1, CurvePoint2, CurvePoint3, true);
-            var segmentCollection = new PathSegmentCollection(1);
-            segmentCollection.Add(segment);
+            var segmentCollection = new PathSegmentCollection(1)
+            {
+                segment
+            };
             pathFigure.Segments = segmentCollection;
             PathFigureCollection pathFigureCollection = new PathFigureCollection();
             pathFigureCollection.Add(pathFigure);
 
-            ComputedBezierPathGeometry = new PathGeometry();
-            ComputedBezierPathGeometry.Figures = pathFigureCollection;
-            ComputedBezierPath = new Path();
-            ComputedBezierPath.Data = ComputedBezierPathGeometry;
+            ComputedBezierPathGeometry = new PathGeometry
+            {
+                Figures = pathFigureCollection
+            };
+            ComputedBezierPath = new Path
+            {
+                Data = ComputedBezierPathGeometry
+            };
         }
 
         private PathFigure DrawSegmentBetweenPointPairs(Point startPt, Point endPt, ref List<Point[]> controlPointList)

src/DynamoCoreWpf/Views/HomePage/HomePage.xaml.cs

@@ -125,7 +125,7 @@ private void OnDataContextChanged(object sender, DependencyPropertyChangedEventA
 
         private void DynamoViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if(dynWebView?.CoreWebView2 != null && e.PropertyName.Equals(nameof(startPage.DynamoViewModel.ShowStartPage)))
+            if(e.PropertyName == nameof(startPage.DynamoViewModel.ShowStartPage) && dynWebView?.CoreWebView2 != null)
             {
                 dynWebView.CoreWebView2.ExecuteScriptAsync(@$"window.setShowStartPageChanged('{startPage.DynamoViewModel.ShowStartPage}')");
             }
@@ -615,8 +615,10 @@ internal void ShowSampleFilesInFolder()
                 return;
             }
 
-            Process.Start(new ProcessStartInfo("explorer.exe", "/select,"
-                + this.startPage.SampleFolderPath)
+            // Open the default Explorer location if the Sample folder cannot be found
+            string explorerArg = this.startPage.SampleFolderPath != null ? "/select," + this.startPage.SampleFolderPath : "";
+
+            Process.Start(new ProcessStartInfo("explorer.exe", explorerArg)
             { UseShellExecute = true });
             Logging.Analytics.TrackEvent(Logging.Actions.Show, Logging.Categories.DynamoHomeOperations, "Sample Files");
         }
@@ -630,8 +632,7 @@ internal void ShowSampleDatasetsInFolder()
                 return;
             }
 
-            Process.Start(new ProcessStartInfo("explorer.exe", /*"/select,"*/
-                /*+ */this.startPage.SampleDatasetsPath)
+            Process.Start(new ProcessStartInfo("explorer.exe", this.startPage.SampleDatasetsPath)
             { UseShellExecute = true });
             Logging.Analytics.TrackEvent(Logging.Actions.Show, Logging.Categories.DynamoHomeOperations, "Dataset Files");
         }