DynamoDS
diff --git a/‎src/DynamoCore/Graph/Nodes/VariableInputNode.cs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎src/DynamoCore/Graph/Nodes/VariableInputNode.cs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/DynamoCoreWpf/Controls/DynamoNodeButton.cs
Copy file name to clipboard
+10-4Lines changed: 10 additions & 4 deletions b/‎src/DynamoCoreWpf/Controls/DynamoNodeButton.cs
Copy file name to clipboard
+10-4Lines changed: 10 additions & 4 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Watch3D/DefaultWatch3DViewModel.cs
Copy file name to clipboard
+31-29Lines changed: 31 additions & 29 deletions b/‎src/DynamoCoreWpf/ViewModels/Watch3D/DefaultWatch3DViewModel.cs
Copy file name to clipboard
+31-29Lines changed: 31 additions & 29 deletions
diff --git a/‎src/Libraries/Watch3DNodeModels/Watch3D.cs
Copy file name to clipboard
+25-31Lines changed: 25 additions & 31 deletions b/‎src/Libraries/Watch3DNodeModels/Watch3D.cs
Copy file name to clipboard
+25-31Lines changed: 25 additions & 31 deletions
diff --git a/‎src/Libraries/Watch3DNodeModelsWpf/HelixWatch3DNodeViewModel.cs
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎src/Libraries/Watch3DNodeModelsWpf/HelixWatch3DNodeViewModel.cs
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
@@ -185,7 +185,7 @@ public virtual void RemoveInputFromModel()
                 model.InPorts.Remove(port);
                 MarkNodeDirty();
             }
-            
+
         }
 
         /// <summary>
@@ -271,8 +271,8 @@ public void SerializeCore(XmlElement element, SaveContext context)
         /// <param name="context">save context</param>
         public void DeserializeCore(XmlElement element, SaveContext context)
         {
-            int amt = Convert.ToInt32(element.Attributes["inputcount"].Value);
-            SetNumInputs(amt);
+            XmlAttribute inputCount = element.Attributes["inputcount"];
+            SetNumInputs(inputCount == null ? 1 : Convert.ToInt32(inputCount.Value));
         }
 
         #endregion
 
@@ -16,6 +16,12 @@ public class DynamoNodeButton : Button
         private string eventName = string.Empty;
         private ModelBase model = null;
         private DynamoViewModel dynamoViewModel;
+
+        /// <summary>
+        /// If true, display a warning message when a port is about to be removed
+        /// </summary>
+        public bool ShowWarningForRemovingInPort { get; set; } = true;
+
         private DynamoViewModel DynamoViewModel
         {
             get
@@ -54,16 +60,16 @@ public DynamoNodeButton(ModelBase model, string eventName)
 
         private void OnDynamoNodeButtonClick(object sender, RoutedEventArgs e)
         {
-            // If this DynamoNodeButton was created with an associated model 
-            // and the event name, then the owner of this button (a ModelBase) 
+            // If this DynamoNodeButton was created with an associated model
+            // and the event name, then the owner of this button (a ModelBase)
             // needs the "ModelEventCommand" to be sent when user clicks
             // on the button.
-            // 
+            //
             if (null != this.model && (!string.IsNullOrEmpty(this.eventName)))
             {
                 MessageBoxResult result = MessageBoxResult.None;
 
-                if (eventName.Equals("RemoveInPort"))
+                if (eventName.Equals("RemoveInPort") && ShowWarningForRemovingInPort)
                 {
                     result = MessageBoxService.Show
                     (
 
@@ -38,7 +38,7 @@ public class Watch3DViewModelStartupParams
         /// </summary>
         public Watch3DViewModelStartupParams()
         {
-            
+
         }
 
         /// <summary>
@@ -57,7 +57,7 @@ public Watch3DViewModelStartupParams(DynamoModel model)
 
     /// <summary>
     /// The DefaultWatch3DViewModel is the base class for all 3D previews in Dynamo.
-    /// Classes which derive from this base are used to prepare geometry for 
+    /// Classes which derive from this base are used to prepare geometry for
     /// rendering by various render targets. The base class handles the registration
     /// of all necessary event handlers on models, workspaces, and nodes.
     /// </summary>
@@ -97,7 +97,7 @@ public virtual bool Active
                 }
 
                 active = value;
-                preferences.SetIsBackgroundPreviewActive(PreferenceWatchName, value);               
+                preferences.SetIsBackgroundPreviewActive(PreferenceWatchName, value);
                 RaisePropertyChanged("Active");
 
                 OnActiveStateChanged();
@@ -134,7 +134,7 @@ public virtual bool IsGridVisible
         /// <summary>
         /// A flag which indicates whether this view model is used for a background preview.
         /// </summary>
-        public virtual bool IsBackgroundPreview 
+        public virtual bool IsBackgroundPreview
         {
             get { return true; }
         }
@@ -277,11 +277,11 @@ public DefaultWatch3DViewModel(NodeModel model, Watch3DViewModelStartupParams pa
         /// <summary>
         /// Call setup to establish the visualization context for the
         /// Watch3DViewModel. Because the Watch3DViewModel is passed into the DynamoViewModel,
-        /// Setup is required to fully establish the rendering context. 
+        /// Setup is required to fully establish the rendering context.
         /// </summary>
         /// <param name="viewModel">An IDynamoViewModel object.</param>
         /// <param name="renderPackageFactory">An IRenderPackageFactory object.</param>
-        public void Setup(IDynamoViewModel viewModel, 
+        public void Setup(IDynamoViewModel viewModel,
             IRenderPackageFactory renderPackageFactory)
         {
             this.viewModel = viewModel;
@@ -293,7 +293,7 @@ protected virtual void OnShutdown()
             // Override in inherited classes.
         }
 
-        
+
         protected virtual void OnClear()
         {
             // Override in inherited classes.
@@ -514,7 +514,7 @@ public virtual void RemoveGeometryForNode(NodeModel node)
         }
 
         /// <summary>
-        /// Call this method to add the render package. 
+        /// Call this method to add the render package.
         /// </summary>
         /// <param name="packages"></param>
         /// <param name="forceAsyncCall"></param>
@@ -626,7 +626,7 @@ protected virtual void OnRenderPackagesUpdated(NodeModel node, RenderPackageCach
             {
                 //When Watch3D nodes are in canvas we need to ignore the Node.RenderPackageUpdate event in some cases.
                 //The background preview does not request tesselation for non-visible nodes or the Watch / Watch3D nodes.
-                //When these nodes are connected to a Watch3D, tesselation is requested and the Node.RenderPacakgeUpdate 
+                //When these nodes are connected to a Watch3D, tesselation is requested and the Node.RenderPacakgeUpdate
                 //event will be raised.  The background preview needs to filter out those tesselation events.
                 if (node.IsVisible == false || node is Watch || node is Watch3DNodeModels.Watch3D)
                 {
@@ -645,38 +645,40 @@ protected virtual void OnRenderPackagesUpdated(NodeModel node, RenderPackageCach
                 return;
             }
 
-            // If there are no connectors connected to the first (only) input port update for all render packages
-            var inConnectors = inPorts[0].Connectors;
-            if (inConnectors == null || inConnectors.Count() < 1 || inConnectors[0].Start == null)
-            {
-                AddGeometryForRenderPackages(packages);
-                return;
-            }
-
-            // Only update for render packages from the connected output port
-            var inputId = inConnectors[0].Start.GUID;
-            foreach (var port in node.OutPorts)
+            foreach (PortModel inPort in inPorts)
             {
-                if (port.GUID != inputId)
+                var inConnectors = inPort.Connectors;
+                if (inConnectors == null || inConnectors.Count() < 1 || inConnectors[0].Start == null)
                 {
+                    AddGeometryForRenderPackages(packages);
                     continue;
                 }
 
-                RenderPackageCache portPackages = packages.GetPortPackages(inputId);
-                if (portPackages == null)
+                // Only update for render packages from the connected output port
+                var inputId = inConnectors[0].Start.GUID;
+                foreach (var port in node.OutPorts)
                 {
-                    continue;
-                }
+                    if (port.GUID != inputId)
+                    {
+                        continue;
+                    }
+
+                    RenderPackageCache portPackages = packages.GetPortPackages(inputId);
+                    if (portPackages == null)
+                    {
+                        continue;
+                    }
 
-                AddGeometryForRenderPackages(portPackages);
+                    AddGeometryForRenderPackages(portPackages);
+                }
             }
         }
 
         /// <summary>
         /// Called from derived classes when a collection of render packages
         /// are available to be processed as render geometry.
         /// </summary>
-        /// <param name="taskPackages">A collection of packages from which to 
+        /// <param name="taskPackages">A collection of packages from which to
         /// create render geometry.</param>
         public virtual void GenerateViewGeometryFromRenderPackagesAndRequestUpdate(
             RenderPackageCache taskPackages)
@@ -688,7 +690,7 @@ public virtual void GenerateViewGeometryFromRenderPackagesAndRequestUpdate(
 
         /// <summary>
         /// Returns a 3D ray from the camera to the given mouse location
-        /// in world coordinates that can be used to perform a hit-test 
+        /// in world coordinates that can be used to perform a hit-test
         /// on objects in the view
         /// </summary>
         /// <param name="args">mouse click location in screen coordinates</param>
@@ -821,7 +823,7 @@ private static bool CanZoomToFit(object parameter)
         protected virtual void ZoomToFit(object parameter)
         {
             // Override in derived classes to specify zoom to fit behavior.
-        } 
+        }
 
         #endregion
 
 
@@ -95,9 +95,9 @@ public Watch3DCamera()
     [OutPortTypes("var")]
     [AlsoKnownAs("Dynamo.Nodes.dyn3DPreview", "Dynamo.Nodes.3DPreview", "Dynamo.Nodes.Watch3D", "DynamoWatch3D.Watch3D")]
     [IsDesignScriptCompatible]
-    public class Watch3D : NodeModel
+    public class Watch3D : VariableInputNode
     {
-        // If the view model, which maintains the camera, 
+        // If the view model, which maintains the camera,
         // is not created until the view customization is applied,
         // as in the case of a Watch3D node,
         // we cache the camera position data returned from the file
@@ -171,34 +171,10 @@ public void SetWatchSize(double w, double h)
 
         public override IEnumerable<AssociativeNode> BuildOutputAst(List<AssociativeNode> inputAstNodes)
         {
-            if (IsPartiallyApplied)
+            return new[]
             {
-                return new[]
-                {
-                    AstFactory.BuildAssignment(
-                        GetAstIdentifierForOutputIndex(0),
-                        AstFactory.BuildFunctionObject(
-                            new IdentifierListNode
-                            {
-                                LeftNode = AstFactory.BuildIdentifier("DataBridge"),
-                                RightNode = AstFactory.BuildIdentifier("BridgeData")
-                            },
-                            2,
-                            new[] { 0 },
-                            new List<AssociativeNode>
-                            {
-                                AstFactory.BuildStringNode(GUID.ToString()),
-                                AstFactory.BuildNullNode()
-                            }))
-                };
-            }
-
-            var resultAst = new[]
-            {
-                AstFactory.BuildAssignment(GetAstIdentifierForOutputIndex(0), inputAstNodes[0])
+                AstFactory.BuildAssignment(GetAstIdentifierForOutputIndex(0), AstFactory.BuildExprList(inputAstNodes))
             };
-
-            return resultAst;
         }
 
         #endregion
@@ -241,14 +217,14 @@ protected override void DeserializeCore(XmlElement nodeElement, SaveContext cont
                     WatchWidth = Convert.ToDouble(node.Attributes["width"].Value, CultureInfo.InvariantCulture);
                     WatchHeight = Convert.ToDouble(node.Attributes["height"].Value, CultureInfo.InvariantCulture);
 
-                    // Cache the data if we're using a node view customization 
+                    // Cache the data if we're using a node view customization
                     // to create the view model.
                     initialCameraData = node;
 
                     // Trigger the event, in case the view model already exists
                     OnDeserialized(node);
 
-                    // Deserialized can be null, when we are running on Unix. There is no WPF 
+                    // Deserialized can be null, when we are running on Unix. There is no WPF
                     // and that's why no Helix. But we still have to process camera position to use it in Flood.
                     if (Deserialized == null)
                     {
@@ -264,7 +240,7 @@ protected override void DeserializeCore(XmlElement nodeElement, SaveContext cont
         }
 
         /// <summary>
-        /// Deserializes camera from XML, if there is no any Deserialized action. 
+        /// Deserializes camera from XML, if there is no any Deserialized action.
         /// It's used for creation of camera, that will be sent to Flood.
         /// </summary>
         private void DeserializeCamera()
@@ -310,5 +286,23 @@ public override bool RequestVisualUpdateAsync(
             // No visualization update is required for this node type.
             return false;
         }
+
+        protected override string GetInputTooltip(int index)
+        {
+            return Resources.Watch3DPortDataInputToolTip;
+        }
+
+        protected override string GetInputName(int index)
+        {
+            return string.Empty;
+        }
+
+        protected override void RemoveInput()
+        {
+            if (InPorts.Count > 1)
+            {
+                base.RemoveInput();
+            }
+        }
     }
 }
@@ -100,7 +100,7 @@ protected override void OnNodePropertyChanged(object sender, PropertyChangedEven
             if (e.PropertyName == "IsFrozen")
             {
                 if (!watchModel.UpstreamCache.Contains(node))
-                { 
+                {
                     return;
                 }
 
@@ -116,11 +116,11 @@ protected override void PortDisconnectedHandler(PortModel obj)
         {
             if (obj.PortType == PortType.Input  && watchModel == obj.Owner)
             {
-                OnClear();
+                UpdateUpstream();
             }
         }
 
-        
+
         protected override void OnRenderPackagesUpdated(NodeModel node,
             RenderPackageCache renderPackages)
         {
@@ -136,9 +136,9 @@ protected override void OnRenderPackagesUpdated(NodeModel node,
 
         protected override void OnWorkspaceSaving(XmlDocument doc)
         {
-            // In the node version of this view model, we don't save when 
+            // In the node version of this view model, we don't save when
             // the workspace is saving. See Watch3D.SeralizeCore where we call
-            // the view model's SerializeCamera method, and Watch3D.DeserializeCore 
+            // the view model's SerializeCamera method, and Watch3D.DeserializeCore
             // where we call the view model's DeserializeCamera method.
         }
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public virtual void RemoveInputFromModel()`
`185`	`185`	`model.InPorts.Remove(port);`
`186`	`186`	`MarkNodeDirty();`
`187`	`187`	`}`
`188`		`-`
	`188`	`+`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`/// <summary>`
`@@ -271,8 +271,8 @@ public void SerializeCore(XmlElement element, SaveContext context)`
`271`	`271`	`/// <param name="context">save context</param>`
`272`	`272`	`public void DeserializeCore(XmlElement element, SaveContext context)`
`273`	`273`	`{`
`274`		`- int amt = Convert.ToInt32(element.Attributes["inputcount"].Value);`
`275`		`- SetNumInputs(amt);`
	`274`	`+ XmlAttribute inputCount = element.Attributes["inputcount"];`
	`275`	`+ SetNumInputs(inputCount == null ? 1 : Convert.ToInt32(inputCount.Value));`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ protected override void OnNodePropertyChanged(object sender, PropertyChangedEven`
`100`	`100`	`if (e.PropertyName == "IsFrozen")`
`101`	`101`	`{`
`102`	`102`	`if (!watchModel.UpstreamCache.Contains(node))`
`103`		`- {`
	`103`	`+ {`
`104`	`104`	`return;`
`105`	`105`	`}`
`106`	`106`
`@@ -116,11 +116,11 @@ protected override void PortDisconnectedHandler(PortModel obj)`
`116`	`116`	`{`
`117`	`117`	`if (obj.PortType == PortType.Input && watchModel == obj.Owner)`
`118`	`118`	`{`
`119`		`- OnClear();`
	`119`	`+ UpdateUpstream();`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`-`
	`123`	`+`
`124`	`124`	`protected override void OnRenderPackagesUpdated(NodeModel node,`
`125`	`125`	`RenderPackageCache renderPackages)`
`126`	`126`	`{`
`@@ -136,9 +136,9 @@ protected override void OnRenderPackagesUpdated(NodeModel node,`
`136`	`136`
`137`	`137`	`protected override void OnWorkspaceSaving(XmlDocument doc)`
`138`	`138`	`{`
`139`		`- // In the node version of this view model, we don't save when`
	`139`	`+ // In the node version of this view model, we don't save when`
`140`	`140`	`// the workspace is saving. See Watch3D.SeralizeCore where we call`
`141`		`- // the view model's SerializeCamera method, and Watch3D.DeserializeCore`
	`141`	`+ // the view model's SerializeCamera method, and Watch3D.DeserializeCore`
`142`	`142`	`// where we call the view model's DeserializeCamera method.`
`143`	`143`	`}`
`144`	`144`