DynamoDS
diff --git a/‎src/Libraries/CoreNodeModels/DefineData.cs
Copy file name to clipboard
+17-29Lines changed: 17 additions & 29 deletions b/‎src/Libraries/CoreNodeModels/DefineData.cs
Copy file name to clipboard
+17-29Lines changed: 17 additions & 29 deletions
diff --git a/‎src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DefineData.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DefineData.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
@@ -27,7 +27,6 @@ namespace CoreNodeModels
     [AlsoKnownAs("Data.DefineData")]
     public class DefineData : DSDropDownBase
     {
-        private List<DynamoDropDownItem> serializedItems;
         private bool isAutoMode = true; // default start with auto-detect 'on'
         private bool isList;
         private string displayValue = Properties.Resources.DefineDataDisplayValueMessage;
@@ -48,7 +47,7 @@ public class DefineData : DSDropDownBase
         [JsonProperty]
         public bool IsAutoMode
         {
-            get { return isAutoMode; }
+            get => isAutoMode;
             set
             {
                 isAutoMode = value;
@@ -64,7 +63,7 @@ public bool IsAutoMode
         [JsonProperty]
         public bool IsList
         {
-            get { return isList; }
+            get => isList;
             set
             {
                 isList = value;
@@ -79,8 +78,8 @@ public bool IsList
         ///
         [JsonProperty]
         public string DisplayValue
-        {   
-            get { return displayValue; }
+        {
+            get => displayValue;
             set
             {
                 if (displayValue != value)
@@ -93,10 +92,7 @@ public string DisplayValue
 
 
         [JsonIgnore]
-        public override bool IsInputNode
-        {
-            get { return true; }
-        }
+        public override bool IsInputNode => true;
 
 
         private string value = "";
@@ -146,7 +142,6 @@ private DefineData(IEnumerable<PortModel> inPorts, IEnumerable<PortModel> outPor
 
         private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-       
         }
 
         protected override void OnBuilt()
@@ -170,7 +165,7 @@ public override IEnumerable<AssociativeNode> BuildOutputAst(List<AssociativeNode
             // the object to be (type) evaluated
             // the expected datatype
             // if the input is an ArrayList or not
-            var function = new Func<object, string, bool, bool, string, Dictionary<string, object>>(DSCore.Data.IsSupportedDataNodeType);
+            var function = new Func<object, string, bool, bool, string, Dictionary<string, object>>(EvaluateDefineDataNode);
             var functionInputs = new List<AssociativeNode> {
                 inputAstNodes[0],
                 AstFactory.BuildStringNode((Items[SelectedIndex].Item as Data.DataNodeDynamoType).Type.ToString()),
@@ -196,25 +191,24 @@ public override IEnumerable<AssociativeNode> BuildOutputAst(List<AssociativeNode
                 [functionCallIdentifier, AstFactory.BuildStringNode("Validation")]);
 
             resultAst.Add(AstFactory.BuildAssignment(
-                    AstFactory.BuildIdentifier(GUID + "_db"),
-                    DataBridge.GenerateBridgeDataAst(GUID.ToString(), getSecondKey)));
+                AstFactory.BuildIdentifier(GUID + "_db"),
+                DataBridge.GenerateBridgeDataAst(GUID.ToString(), getSecondKey)));
 
             return resultAst;
         }
 
 
         private void DataBridgeCallback(object data)
         {
-            //Todo If the playerValue is not empty string then we can chanage the UI to reflect the value is coming from the player
+            //Todo If the playerValue is not empty string then we can change the UI to reflect the value is coming from the player
             //Todo if the function call throws we don't get back to DatabridgeCallback.  Not sure if we need to handle this case
 
             //Now we reset this value to empty string so that the next time a value is set from upstream nodes we can know that it is not coming from the player
             value = "";
 
-            // If data is null
             if (data == null)
             {
-                if(IsAutoMode)
+                if (IsAutoMode)
                 {
                     DisplayValue = string.Empty; // show blank if we are in locked mode (as we cannot interact with the node)
                 }
@@ -226,26 +220,26 @@ private void DataBridgeCallback(object data)
             }
 
             // If data is not null
-            (bool IsValid, bool UpdateList, DataNodeDynamoType InputType) resultData = (ValueTuple<bool, bool, DataNodeDynamoType>)data;
+            (bool IsValid, bool UpdateList, DataNodeDynamoType InputType) = (ValueTuple<bool, bool, DataNodeDynamoType>)data;
 
             if (IsAutoMode)
             {
-                if (resultData.UpdateList)
+                if (UpdateList)
                 {
                     IsList = !IsList;
                 }
 
-                if (resultData.InputType != null)
+                if (InputType != null)
                 {
-                    if (!resultData.IsValid)
+                    if (!IsValid)
                     {
                         // Assign to the correct value, if the object was of supported type
-                        var index = Items.IndexOf(Items.First(i => i.Name.Equals(resultData.InputType.Name)));
+                        var index = Items.IndexOf(Items.First(i => i.Name.Equals(InputType.Name)));
                         SelectedIndex = index;
                     }
-                    if (!DisplayValue.Equals(resultData.InputType.Name))
+                    if (!DisplayValue.Equals(InputType.Name))
                     {
-                        DisplayValue = resultData.InputType.Name;
+                        DisplayValue = InputType.Name;
                     }
                 }
             }
@@ -273,12 +267,6 @@ protected override SelectionState PopulateItemsCore(string currentSelection)
             return SelectionState.Restore;
         }
 
-        [OnSerializing]
-        private void OnSerializing(StreamingContext context)
-        {
-            serializedItems = Items.ToList();
-        }
-
         protected override bool UpdateValueCore(UpdateValueParams updateValueParams)
         {
             string name = updateValueParams.PropertyName;
 
@@ -16,7 +16,7 @@ namespace CoreNodeModelsWpf.Nodes
     /// <summary>
     /// View customizer for DefineData node model.
     /// </summary>
-    public class DefineDataNodeViewCustomization : DropDownNodeViewCustomization, INodeViewCustomization<DefineData>
+    internal class DefineDataNodeViewCustomization : DropDownNodeViewCustomization, INodeViewCustomization<DefineData>
     {
         private ComboBox dropdown;
         private ToggleButton modeToggleButton;
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ namespace CoreNodeModels`
`27`	`27`	`[AlsoKnownAs("Data.DefineData")]`
`28`	`28`	`public class DefineData : DSDropDownBase`
`29`	`29`	`{`
`30`		`- private List<DynamoDropDownItem> serializedItems;`
`31`	`30`	`private bool isAutoMode = true; // default start with auto-detect 'on'`
`32`	`31`	`private bool isList;`
`33`	`32`	`private string displayValue = Properties.Resources.DefineDataDisplayValueMessage;`
`@@ -48,7 +47,7 @@ public class DefineData : DSDropDownBase`
`48`	`47`	`[JsonProperty]`
`49`	`48`	`public bool IsAutoMode`
`50`	`49`	`{`
`51`		`- get { return isAutoMode; }`
	`50`	`+ get => isAutoMode;`
`52`	`51`	`set`
`53`	`52`	`{`
`54`	`53`	`isAutoMode = value;`
`@@ -64,7 +63,7 @@ public bool IsAutoMode`
`64`	`63`	`[JsonProperty]`
`65`	`64`	`public bool IsList`
`66`	`65`	`{`
`67`		`- get { return isList; }`
	`66`	`+ get => isList;`
`68`	`67`	`set`
`69`	`68`	`{`
`70`	`69`	`isList = value;`
`@@ -79,8 +78,8 @@ public bool IsList`
`79`	`78`	`///`
`80`	`79`	`[JsonProperty]`
`81`	`80`	`public string DisplayValue`
`82`		`- {`
`83`		`- get { return displayValue; }`
	`81`	`+ {`
	`82`	`+ get => displayValue;`
`84`	`83`	`set`
`85`	`84`	`{`
`86`	`85`	`if (displayValue != value)`
`@@ -93,10 +92,7 @@ public string DisplayValue`
`93`	`92`
`94`	`93`
`95`	`94`	`[JsonIgnore]`
`96`		`- public override bool IsInputNode`
`97`		`- {`
`98`		`- get { return true; }`
`99`		`- }`
	`95`	`+ public override bool IsInputNode => true;`
`100`	`96`
`101`	`97`
`102`	`98`	`private string value = "";`
`@@ -146,7 +142,6 @@ private DefineData(IEnumerable<PortModel> inPorts, IEnumerable<PortModel> outPor`
`146`	`142`
`147`	`143`	`private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)`
`148`	`144`	`{`
`149`		`-`
`150`	`145`	`}`
`151`	`146`
`152`	`147`	`protected override void OnBuilt()`
`@@ -170,7 +165,7 @@ public override IEnumerable<AssociativeNode> BuildOutputAst(List<AssociativeNode`
`170`	`165`	`// the object to be (type) evaluated`
`171`	`166`	`// the expected datatype`
`172`	`167`	`// if the input is an ArrayList or not`
`173`		`- var function = new Func<object, string, bool, bool, string, Dictionary<string, object>>(DSCore.Data.IsSupportedDataNodeType);`
	`168`	`+ var function = new Func<object, string, bool, bool, string, Dictionary<string, object>>(EvaluateDefineDataNode);`
`174`	`169`	`var functionInputs = new List<AssociativeNode> {`
`175`	`170`	`inputAstNodes[0],`
`176`	`171`	`AstFactory.BuildStringNode((Items[SelectedIndex].Item as Data.DataNodeDynamoType).Type.ToString()),`
`@@ -196,25 +191,24 @@ public override IEnumerable<AssociativeNode> BuildOutputAst(List<AssociativeNode`
`196`	`191`	`[functionCallIdentifier, AstFactory.BuildStringNode("Validation")]);`
`197`	`192`
`198`	`193`	`resultAst.Add(AstFactory.BuildAssignment(`
`199`		`- AstFactory.BuildIdentifier(GUID + "_db"),`
`200`		`- DataBridge.GenerateBridgeDataAst(GUID.ToString(), getSecondKey)));`
	`194`	`+ AstFactory.BuildIdentifier(GUID + "_db"),`
	`195`	`+ DataBridge.GenerateBridgeDataAst(GUID.ToString(), getSecondKey)));`
`201`	`196`
`202`	`197`	`return resultAst;`
`203`	`198`	`}`
`204`	`199`
`205`	`200`
`206`	`201`	`private void DataBridgeCallback(object data)`
`207`	`202`	`{`
`208`		`- //Todo If the playerValue is not empty string then we can chanage the UI to reflect the value is coming from the player`
	`203`	`+ //Todo If the playerValue is not empty string then we can change the UI to reflect the value is coming from the player`
`209`	`204`	`//Todo if the function call throws we don't get back to DatabridgeCallback. Not sure if we need to handle this case`
`210`	`205`
`211`	`206`	`//Now we reset this value to empty string so that the next time a value is set from upstream nodes we can know that it is not coming from the player`
`212`	`207`	`value = "";`
`213`	`208`
`214`		`- // If data is null`
`215`	`209`	`if (data == null)`
`216`	`210`	`{`
`217`		`- if(IsAutoMode)`
	`211`	`+ if (IsAutoMode)`
`218`	`212`	`{`
`219`	`213`	`DisplayValue = string.Empty; // show blank if we are in locked mode (as we cannot interact with the node)`
`220`	`214`	`}`
`@@ -226,26 +220,26 @@ private void DataBridgeCallback(object data)`
`226`	`220`	`}`
`227`	`221`
`228`	`222`	`// If data is not null`
`229`		`- (bool IsValid, bool UpdateList, DataNodeDynamoType InputType) resultData = (ValueTuple<bool, bool, DataNodeDynamoType>)data;`
	`223`	`+ (bool IsValid, bool UpdateList, DataNodeDynamoType InputType) = (ValueTuple<bool, bool, DataNodeDynamoType>)data;`
`230`	`224`
`231`	`225`	`if (IsAutoMode)`
`232`	`226`	`{`
`233`		`- if (resultData.UpdateList)`
	`227`	`+ if (UpdateList)`
`234`	`228`	`{`
`235`	`229`	`IsList = !IsList;`
`236`	`230`	`}`
`237`	`231`
`238`		`- if (resultData.InputType != null)`
	`232`	`+ if (InputType != null)`
`239`	`233`	`{`
`240`		`- if (!resultData.IsValid)`
	`234`	`+ if (!IsValid)`
`241`	`235`	`{`
`242`	`236`	`// Assign to the correct value, if the object was of supported type`
`243`		`- var index = Items.IndexOf(Items.First(i => i.Name.Equals(resultData.InputType.Name)));`
	`237`	`+ var index = Items.IndexOf(Items.First(i => i.Name.Equals(InputType.Name)));`
`244`	`238`	`SelectedIndex = index;`
`245`	`239`	`}`
`246`		`- if (!DisplayValue.Equals(resultData.InputType.Name))`
	`240`	`+ if (!DisplayValue.Equals(InputType.Name))`
`247`	`241`	`{`
`248`		`- DisplayValue = resultData.InputType.Name;`
	`242`	`+ DisplayValue = InputType.Name;`
`249`	`243`	`}`
`250`	`244`	`}`
`251`	`245`	`}`
`@@ -273,12 +267,6 @@ protected override SelectionState PopulateItemsCore(string currentSelection)`
`273`	`267`	`return SelectionState.Restore;`
`274`	`268`	`}`
`275`	`269`
`276`		`- [OnSerializing]`
`277`		`- private void OnSerializing(StreamingContext context)`
`278`		`- {`
`279`		`- serializedItems = Items.ToList();`
`280`		`- }`
`281`		`-`
`282`	`270`	`protected override bool UpdateValueCore(UpdateValueParams updateValueParams)`
`283`	`271`	`{`
`284`	`272`	`string name = updateValueParams.PropertyName;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace CoreNodeModelsWpf.Nodes`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// View customizer for DefineData node model.`
`18`	`18`	`/// </summary>`
`19`		`- public class DefineDataNodeViewCustomization : DropDownNodeViewCustomization, INodeViewCustomization<DefineData>`
	`19`	`+ internal class DefineDataNodeViewCustomization : DropDownNodeViewCustomization, INodeViewCustomization<DefineData>`
`20`	`20`	`{`
`21`	`21`	`private ComboBox dropdown;`
`22`	`22`	`private ToggleButton modeToggleButton;`