diff --git a/src/Engine/ProtoCore/Lang/BuiltInFunctionEndPoint.cs b/src/Engine/ProtoCore/Lang/BuiltInFunctionEndPoint.cs index 896800a6fc5..c9ffd15929f 100644 --- a/src/Engine/ProtoCore/Lang/BuiltInFunctionEndPoint.cs +++ b/src/Engine/ProtoCore/Lang/BuiltInFunctionEndPoint.cs @@ -370,7 +370,6 @@ public override StackValue Execute(ProtoCore.Runtime.Context c, List } return StackValue.BuildInt(typeUID); - case BuiltInMethods.MethodID.ToString: case BuiltInMethods.MethodID.ToStringFromObject: case BuiltInMethods.MethodID.ToStringFromArray: { diff --git a/src/Engine/ProtoCore/Lang/BuiltInMethods.cs b/src/Engine/ProtoCore/Lang/BuiltInMethods.cs index 8db5af10fd9..8c308b49092 100644 --- a/src/Engine/ProtoCore/Lang/BuiltInMethods.cs +++ b/src/Engine/ProtoCore/Lang/BuiltInMethods.cs @@ -54,7 +54,6 @@ public enum MethodID Reorder, RangeExpression, Sum, - ToString, ToStringFromObject, ToStringFromArray, Transpose, @@ -120,7 +119,6 @@ public enum MethodID "Reorder", // kReorder Constants.kFunctionRangeExpression, // kGenerateRange "Sum", // kSum - "ToString", // kToString "__ToStringFromObject", // kToStringFromObject "__ToStringFromArray", // kToStringFromArray "Transpose", // kTranspose @@ -784,17 +782,6 @@ public BuiltInMethods(Core core) MethodAttributes = new MethodAttributes(){Description = Resources.Gettypes} }, - new BuiltInMethod - { - ReturnType = TypeSystem.BuildPrimitiveTypeObject(PrimitiveType.String, 0), - - Parameters = new [] - { - new KeyValuePair("object", TypeSystem.BuildPrimitiveTypeObject(PrimitiveType.Var)), - }.ToList(), - ID = BuiltInMethods.MethodID.ToString, - MethodAttributes = new MethodAttributes(true, false, "This node is obsolete, please use \"String from Object\""), - }, new BuiltInMethod { diff --git a/src/Libraries/Analysis/PointData.cs b/src/Libraries/Analysis/PointData.cs deleted file mode 100644 index 31641405356..00000000000 --- a/src/Libraries/Analysis/PointData.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Autodesk.DesignScript.Geometry; -using Autodesk.DesignScript.Runtime; -using Dynamo.Graph.Nodes; - -namespace Analysis -{ - /// - /// A class for storing structure point analysis data. - /// - [IsVisibleInDynamoLibrary(false)] - public class PointData : IStructuredData //, IGraphicItem - { - /// - /// A list of Points. - /// - [NodeObsolete("ValueLocationObsolete", typeof(Properties.Resources))] - public IEnumerable ValueLocations { get; internal set; } - - /// - /// A dictionary of lists of double values. - /// - [NodeObsolete("ValuesObsolete", typeof(Properties.Resources))] - public IList Values { get; internal set; } - - protected PointData( - IEnumerable points, IList values) - { - ValueLocations = points; - Values = values; - } - - /// - /// Create a PointAnalysisData object. - /// - /// A list of Points. - /// A list of double values. - [NodeObsolete("ByPointsAndValueObsolete", typeof(Properties.Resources))] - public static PointData ByPointsAndValues(IEnumerable points, IList values) - { - if (points == null) - { - throw new ArgumentNullException("points"); - } - - if (values == null) - { - throw new ArgumentNullException("values"); - } - - if (!points.Any()) - { - throw new ArgumentException("points", AnalysisResources.EmptyPointsMessage); - } - - if (!values.Any()) - { - throw new ArgumentException("values", AnalysisResources.EmptyValuesMessage); - } - - if (points.Count() != values.Count) - { - throw new ArgumentException(AnalysisResources.InputsNotEquivalentMessage); - } - - return new PointData(points, values); - } - } -} diff --git a/src/Libraries/Analysis/Properties/Resources.cs-CZ.resx b/src/Libraries/Analysis/Properties/Resources.cs-CZ.resx index d02ba10b1d2..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.cs-CZ.resx +++ b/src/Libraries/Analysis/Properties/Resources.cs-CZ.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Použijte uzly bodů a čísel jako přímé vstupy k uzlům, u kterých byly dříve použity uzly PointData. - - - Použijte uzly povrchů a atributů UV jako přímé vstupy k uzlům, u kterých byly dříve použity uzly SurfaceData. - - - Použijte uzly povrchů, atributů UV a čísel jako přímé vstupy k uzlům, u kterých byly dříve použity uzly SurfaceData. - - - Použijte povrch dostupný na jiném místě v grafu. - - - Použijte body dostupné na jiném místě v grafu. - - - Použijte umístění atributů UV dostupná na jiném místě v grafu. - - - Použijte hodnoty dodané v rámci uzlu, pomocí kterého se provede analýza. - - - Použijte hodnoty dodané v rámci uzlu, pomocí kterého se provede analýza. - - - Použijte uzly vektorů a čísel jako přímé vstupy k uzlům, u kterých byly dříve použity uzly VectorData. - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.de-DE.resx b/src/Libraries/Analysis/Properties/Resources.de-DE.resx index 09837b8f8d4..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.de-DE.resx +++ b/src/Libraries/Analysis/Properties/Resources.de-DE.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Verwenden Sie Point- und Number-Blöcke als direkte Eingaben für Blöcke, für die bisher PointData-Blöcke verwendet wurden. - - - Verwenden Sie Surface- und UV-Blöcke als direkte Eingaben für Blöcke, für die bisher SurfaceData-Blöcke verwendet wurden. - - - Verwenden Sie Surface-, UV- und Number-Blöcke als direkte Eingaben für Blöcke, für die bisher SurfaceData-Blöcke verwendet wurden. - - - Verwenden Sie die an anderer Stelle des Diagramms verfügbare Surface. - - - Verwenden Sie die an anderer Stelle des Diagramms verfügbaren Points. - - - Verwenden Sie die an anderer Stelle des Diagramms verfügbaren UV-Positionen. - - - Verwenden Sie die Werte aus dem Block, der die Analyse durchführt. - - - Verwenden Sie die Werte aus dem Block, der die Analyse durchführt. - - - Verwenden Sie Vector- und Number-Blöcke als direkte Eingaben für Blöcke, für die bisher VectorData-Blöcke verwendet wurden. - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.en-GB.resx b/src/Libraries/Analysis/Properties/Resources.en-GB.resx index bc9198e7cbf..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.en-GB.resx +++ b/src/Libraries/Analysis/Properties/Resources.en-GB.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Use Point nodes and Number nodes as direct inputs to nodes which previously used PointData nodes - - - Use Surface and UV nodes as direct inputs to nodes which previously used SurfaceData nodes - - - Use Surface, UV, and Number nodes as direct inputs to nodes which previously used SurfaceData nodes - - - Use the Surface available elsewhere in your graph - - - Use the Points available elsewhere in your graph - - - Use the UV locations available elsewhere in your graph. - - - Use the values provided by the node conducting the analysis. - - - Use the values provided by the node conducting the analysis - - - Use Vector nodes and Number nodes as direct inputs to nodes which previously used VectorData nodes - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.en-US.resx b/src/Libraries/Analysis/Properties/Resources.en-US.resx index bc9198e7cbf..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.en-US.resx +++ b/src/Libraries/Analysis/Properties/Resources.en-US.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Use Point nodes and Number nodes as direct inputs to nodes which previously used PointData nodes - - - Use Surface and UV nodes as direct inputs to nodes which previously used SurfaceData nodes - - - Use Surface, UV, and Number nodes as direct inputs to nodes which previously used SurfaceData nodes - - - Use the Surface available elsewhere in your graph - - - Use the Points available elsewhere in your graph - - - Use the UV locations available elsewhere in your graph. - - - Use the values provided by the node conducting the analysis. - - - Use the values provided by the node conducting the analysis - - - Use Vector nodes and Number nodes as direct inputs to nodes which previously used VectorData nodes - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.es-ES.resx b/src/Libraries/Analysis/Properties/Resources.es-ES.resx index 6f41d2c9639..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.es-ES.resx +++ b/src/Libraries/Analysis/Properties/Resources.es-ES.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Utiliza nodos de puntos y nodos de números como entradas directas a nodos que ya utilizaron nodos PointData - - - Utiliza nodos de superficies y UV como entradas directas a nodos que ya utilizaron nodos SurfaceData - - - Utiliza nodos de superficies, UV y números como entradas directas a nodos que ya utilizaron nodos SurfaceData - - - Utiliza la superficie disponible en el gráfico - - - Utiliza los puntos disponibles en cualquier otra parte del gráfico - - - Utiliza las ubicaciones de UV disponibles en cualquier otra parte del gráfico. - - - Utiliza los valores proporcionados por el nodo que efectúa el análisis. - - - Utiliza los valores proporcionados por el nodo que efectúa el análisis - - - Utiliza nodos de vectores y nodos de números como entradas directas a nodos que ya utilizaron nodos VectorData - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.fr-FR.resx b/src/Libraries/Analysis/Properties/Resources.fr-FR.resx index 829db352fcd..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.fr-FR.resx +++ b/src/Libraries/Analysis/Properties/Resources.fr-FR.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Utiliser des noeuds Point et des noeuds Number comme entrées directes pour les noeuds qui utilisaient précédemment des noeuds PointData - - - Utiliser des noeuds de surface et d'UV comme entrées directes pour les noeuds qui utilisaient précédemment des noeuds SurfaceData - - - Utiliser des noeuds Surface, UV et Number comme entrées directes pour les noeuds qui utilisaient précédemment des noeuds SurfaceData - - - Utiliser la surface disponible ailleurs dans le graphique - - - Utiliser les points disponibles ailleurs dans le graphique - - - Utilisez les emplacements d'UV disponibles ailleurs dans votre graphique. - - - Utilisez les valeurs fournies par le noeud effectuant l'analyse. - - - Utiliser les valeurs fournies par le noeud effectuant l'analyse - - - Utiliser des noeuds Vector et des noeuds Number comme entrées directes pour les noeuds qui utilisaient précédemment des noeuds VectorData - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.it-IT.resx b/src/Libraries/Analysis/Properties/Resources.it-IT.resx index b36e90ce4b5..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.it-IT.resx +++ b/src/Libraries/Analysis/Properties/Resources.it-IT.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Utilizzare i nodi Point e Number come input diretti per i nodi che in precedenza utilizzavano nodi PointData - - - Utilizzare i nodi Surface e UV come input diretti per i nodi che in precedenza utilizzavano nodi SurfaceData - - - Utilizzare i nodi Surface, UV e Number come input diretti per i nodi che in precedenza utilizzavano nodi SurfaceData - - - Utilizzare il nodo Surface disponibile altrove nel grafico - - - Utilizzare i nodi Point disponibili altrove nel grafico - - - Utilizzare le posizioni UV disponibili altrove nel grafico. - - - Utilizzare i valori forniti dal nodo che gestisce l'analisi. - - - Utilizzare i valori forniti dal nodo che gestisce l'analisi - - - Utilizzare i nodi Vector e Number come input diretti per i nodi che in precedenza utilizzavano nodi VectorData - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.ja-JP.resx b/src/Libraries/Analysis/Properties/Resources.ja-JP.resx index 189604018ff..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.ja-JP.resx +++ b/src/Libraries/Analysis/Properties/Resources.ja-JP.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - これまでは PointData ノードを使用していたノードへの直接入力として Point ノードと Number ノードを使用します - - - これまでは SurfaceData ノードを使用していたノードへの直接入力として Surface ノードと UV ノードを使用します - - - これまでは SurfaceData ノードを使用していたノードへの直接入力として Surface ノード、UV ノード、Number ノードを使用します - - - グラフ内の任意の場所に使用できる Surface を使用します - - - グラフ内の任意の場所に使用できる Point を使用します - - - グラフ内の任意の場所に使用できる UV 位置を使用します。 - - - 解析を実行するノードによって提供される値を使用します。 - - - 解析を実行するノードによって提供される値を使用します - - - これまでは VectorData ノードを使用していたノードへの直接入力として Vector ノードと Number ノードを使用します - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.ko-KR.resx b/src/Libraries/Analysis/Properties/Resources.ko-KR.resx index 83ba100bb7a..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.ko-KR.resx +++ b/src/Libraries/Analysis/Properties/Resources.ko-KR.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 이전에 PointData 노드를 사용한 노드에 대한 직접 입력으로 Point 노드와 Number 노드를 사용합니다. - - - 이전에 SurfaceData 노드를 사용한 노드에 대한 직접 입력으로 Surface 노드와 UV 노드를 사용합니다. - - - 이전에 SurfaceData 노드를 사용한 노드에 대한 직접 입력으로 Surface 노드, UV 노드, Number 노드를 사용합니다. - - - 그래프의 모든 위치에서 사용 가능한 Surface를 사용합니다. - - - 그래프의 모든 위치에서 사용 가능한 Points를 사용합니다. - - - 그래프의 모든 위치에서 사용 가능한 UV 위치를 사용합니다. - - - 해석 수행 시 노드에서 제공한 값을 사용합니다. - - - 해석 수행 시 노드에서 제공한 값 사용 - - - 이전에 VectorData 노드를 사용한 노드에 대한 직접 입력으로 Vector 노드와 Number 노드를 사용합니다. - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.pl-PL.resx b/src/Libraries/Analysis/Properties/Resources.pl-PL.resx index de6e6b7d2dc..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.pl-PL.resx +++ b/src/Libraries/Analysis/Properties/Resources.pl-PL.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Użyj węzłów punktowych i węzłów numerycznych jako bezpośrednich danych wejściowych do węzłów, które wcześniej używały węzłów PointData - - - Użyj powierzchni i węzłów UV jako bezpośrednich danych wejściowych do węzłów, które wcześniej używały węzłów SurfaceData - - - Użyj powierzchni, UV, węzłów numerycznych jako bezpośrednich danych wejściowych do węzłów, które wcześniej używały węzłów SurfaceData - - - Użyj powierzchni dostępnej w innym miejscu na wykresie - - - Użyj punktów dostępnych w innym miejscu na wykresie - - - Użyj położeń UV dostępnych w innym miejscu na wykresie. - - - Użyj wartości dostarczonych przez węzeł przeprowadzający analizę. - - - Użyj wartości dostarczonych przez węzeł przeprowadzający analizę - - - Użyj węzłów wektorowych i węzłów numerycznych jako bezpośrednich danych wejściowych do węzłów, które wcześniej używały węzłów VectorData - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.pt-BR.resx b/src/Libraries/Analysis/Properties/Resources.pt-BR.resx index b35b772753f..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.pt-BR.resx +++ b/src/Libraries/Analysis/Properties/Resources.pt-BR.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Utilize os nós de pontos e número de nós como entradas diretas para os nós que utilizam anteriormente os nós PointData - - - Utilize os nós Superfície e UV como entradas diretas para os nós que utilizam anteriormente os nós SurfaceData - - - Utilize os nós Superfície, UV e Número como entradas diretas para os nós que utilizam anteriormente os nós SurfaceData - - - Utilize a superfície que estiver disponível em qualquer lugar em seu gráfico - - - Utilize os pontos disponíveis em outro lugar em seu gráfico - - - Utilize as localizações de UV disponíveis em outro lugar em seu gráfico. - - - Utilize os valores fornecidos pelo nó que conduz a análise. - - - Utilize os valores fornecidos pelo nó que conduz a análise. - - - Utilize os nós de Vetor e o Número como entradas diretas para os nós que utilizam anteriormente os nós VectorData - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.resx b/src/Libraries/Analysis/Properties/Resources.resx index bc9198e7cbf..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.resx +++ b/src/Libraries/Analysis/Properties/Resources.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Use Point nodes and Number nodes as direct inputs to nodes which previously used PointData nodes - - - Use Surface and UV nodes as direct inputs to nodes which previously used SurfaceData nodes - - - Use Surface, UV, and Number nodes as direct inputs to nodes which previously used SurfaceData nodes - - - Use the Surface available elsewhere in your graph - - - Use the Points available elsewhere in your graph - - - Use the UV locations available elsewhere in your graph. - - - Use the values provided by the node conducting the analysis. - - - Use the values provided by the node conducting the analysis - - - Use Vector nodes and Number nodes as direct inputs to nodes which previously used VectorData nodes - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.ru-RU.resx b/src/Libraries/Analysis/Properties/Resources.ru-RU.resx index 05144aa46d6..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.ru-RU.resx +++ b/src/Libraries/Analysis/Properties/Resources.ru-RU.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Используйте узлы "Точка" и "Число" как прямые входные данные для узлов, для которых ранее использовались узлы "PointData" - - - Используйте узлы "Поверхность" и "UV" как прямые входные данные для узлов, для которых ранее использовались узлы SurfaceData - - - Используйте узлы "Поверхность", "UV" и "Число" как прямые входные данные для узлов, для которых ранее использовались узлы "SurfaceData" - - - Используйте поверхность, доступную в любом другом месте графика - - - Используйте точки, доступные в любом другом месте графика - - - Используйте местоположения UV, доступные в любом другом месте графика. - - - Используйте значения, полученные от узла, который проводит анализ. - - - Используйте значения, полученные от узла, который проводит анализ - - - Используйте узлы "Вектор" и узлы "Число" как прямые входные данные для узлов, для которых ранее использовались узлы "VectorData" - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.zh-CN.resx b/src/Libraries/Analysis/Properties/Resources.zh-CN.resx index 17b9ab8966b..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.zh-CN.resx +++ b/src/Libraries/Analysis/Properties/Resources.zh-CN.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 将“点”节点和“数字”节点用作节点的直接输入,以前是使用 pointData 节点 - - - 将“曲面”和“UV”节点用作节点的直接输入,以前是使用 SurfaceData 节点 - - - 将“曲面”、“UV”和“数字”节点用作节点的直接输入,以前是使用 SurfaceData 节点 - - - 使用图形中其他位置的可用曲面 - - - 使用图形中其他位置的可用点 - - - 使用图形中其他位置的可用 UV 位置。 - - - 使用节点提供的“值”进行分析。 - - - 使用节点提供的“值”进行分析。 - - - 将“矢量”节点和“数字”节点用作节点的直接输入,以前是使用 VectorData 节点 - \ No newline at end of file diff --git a/src/Libraries/Analysis/Properties/Resources.zh-TW.resx b/src/Libraries/Analysis/Properties/Resources.zh-TW.resx index 52b60fa95b1..1af7de150c9 100644 --- a/src/Libraries/Analysis/Properties/Resources.zh-TW.resx +++ b/src/Libraries/Analysis/Properties/Resources.zh-TW.resx @@ -117,31 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 使用點節點和號碼節點作為直接輸入至先前使用 PointData 節點的節點 - - - 使用曲面和 UV 節點作為直接輸入至先前使用 SurfaceData 節點的節點 - - - 使用表面、UV 和號碼節點作為直接輸入至先前使用 SurfaceData 節點的節點 - - - 使用在圖表中其他位置可用的曲面 - - - 使用在圖表中其他位置可用的點 - - - 使用 UV 可用位置中的圖表。 - - - 使用由進行分析的節點所提供的值。 - - - 使用由進行分析的節點所提供的值。 - - - 使用向量節點和號碼節點作為直接輸入至先前使用 VectorData 節點的節點 - \ No newline at end of file diff --git a/src/Libraries/Analysis/SurfaceData.cs b/src/Libraries/Analysis/SurfaceData.cs deleted file mode 100644 index a14b1d0a696..00000000000 --- a/src/Libraries/Analysis/SurfaceData.cs +++ /dev/null @@ -1,364 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using Autodesk.DesignScript.Geometry; -using Autodesk.DesignScript.Runtime; -using Dynamo.Graph.Nodes; - -namespace Analysis -{ - /// - /// A class for storing structured surface analysis data. - /// - [IsVisibleInDynamoLibrary(false)] - public class SurfaceData : ISurfaceData - { - /// - /// The surface which contains the locations. - /// - [NodeObsolete("SurfaceObsolete", typeof(Properties.Resources))] - public Surface Surface { get; set; } - - /// - /// A list of UV locations on the surface. - /// - [NodeObsolete("ValueLocationsObsolete", typeof(Properties.Resources))] - public IEnumerable ValueLocations { get; internal set; } - - /// - /// A dictionary of lists of doubles. - /// - [NodeObsolete("ValueSurfaceObsolete", typeof(Properties.Resources))] - public IList Values { get; internal set; } - - protected SurfaceData( - Surface surface, IEnumerable valueLocations, IList values) - { - Surface = surface; - //CalculationLocations = CullCalculationLocations(surface, calculationLocations); - ValueLocations = valueLocations; - Values = values; - } - - /// - /// Create a SurfaceData object without values. - /// - /// The surface which contains the locations. - /// A list of UV locations on the surface. - /// - [NodeObsolete("BySurfacePointObsolete", typeof(Properties.Resources))] - public static SurfaceData BySurfaceAndPoints(Surface surface, IEnumerable uvs) - { - if (surface == null) - { - throw new ArgumentNullException("surface"); - } - - if (uvs == null) - { - throw new ArgumentNullException("uvs"); - } - - if (!uvs.Any()) - { - throw new ArgumentException(AnalysisResources.EmptyUVsMessage); - } - - return new SurfaceData(surface, uvs, null); - } - - /// - /// Create a SurfaceData object. - /// - /// The surface which contains the locations. - /// A list of UV locations on the surface. - /// A list of double values. - [NodeObsolete("BySurfacePointsAndValues", typeof(Properties.Resources))] - public static SurfaceData BySurfacePointsAndValues(Surface surface, IEnumerable uvs, IList values) - { - if (surface == null) - { - throw new ArgumentNullException("surface"); - } - - if (uvs == null) - { - throw new ArgumentNullException("uvs"); - } - - if (!uvs.Any()) - { - throw new ArgumentException(AnalysisResources.EmptyUVsMessage); - } - - if (values == null) - { - throw new ArgumentNullException("values"); - } - - if (!values.Any()) - { - throw new ArgumentException("values", AnalysisResources.EmptyValuesMessage); - } - - if (uvs.Count() != values.Count) - { - throw new ArgumentException(AnalysisResources.InputsNotEquivalentMessage); - } - - return new SurfaceData(surface, uvs, values); - } - - ///// - ///// This method constructs a surface through the UV locations, - ///// converting UVs to Points in the 0,0->1,1 domain. This surface is used - ///// to calculate gradient values at positions on a grid specified by width - ///// and height. The Z coordinate of the created points is set to the normalized value - ///// associated with that UV locaton. Points are then found on the surface from UVs, - ///// in a grid of the width and height provided. The Z component of the - ///// points is then stored in the map. - ///// - ///// The width of the value map. - ///// - ///// - //public double[][] GetValueMap(int width, int height) - //{ - // const int MinPointCount = 3; - // const double DefaultPointSpacing = 1 / ((double)MinPointCount - 1); - - // if (!Values.Any()) - // { - // return new double[0][]; - // } - - // var min = Values.Min(); - // var max = Values.Max(); - - // var domain = max - min; - - // if (min == max) - // { - // domain = Math.Abs(max); - // } - - // // Normalize the values in the 0->1 range - // var normalizedValues = Values.Select(v => (v - min)/ domain); - - // // Create points at locations. - // var zip = ValueLocations.Zip(normalizedValues, (uv, value) => Point.ByCoordinates(uv.U,uv.V,value)); - - // // Group the points by their x coordinate. Then order, - // // the inner groups by y. - // var pointGroups = zip. - // GroupBy(pt => pt.X). - // OrderBy(group => group.First().X). - // Select(group=>group.OrderBy(pt=>pt.Y)); - - // // x - Value location provided - // // o - Value location added to 'square' the grid - // // - // // o-o-o----o-o - // // ----x------- - // // --x------x-- - // // o-o-o----o-o - - // // Project groups to a List> - // var pointLists = pointGroups.Select(g => g.ToList()).ToList(); - - // // Square any rows that aren't square - // foreach (var pointList in pointLists) - // { - // var vMin = pointList.First().Y; - // var vMax = pointList.Last().Y; - - // var u = pointList.First().X; - // var v = pointList.First().Y; - - // // If 0,0 0,1 1,0 1,1 continue - // if (u == 0.0 && (v == 0.0 || v==1.0) || - // u==1.0 && (v==0.0||v==1.0)) - // { - // continue; - // } - - // if (vMin != 0.0) - // { - // pointList.Insert(0, Point.ByCoordinates(u, 0.0, 0.0)); - // } - - // if (vMax != 1.0) - // { - // pointList.Add(Point.ByCoordinates(u,1.0,0.0)); - // } - - // // The column should now have start and end points, - // // but what if that's all that was added? - // if (pointList.Count() == 2) - // { - // pointList.Add(Point.ByCoordinates(u,0.5,0.0)); - // } - // } - - // // Check whether we have 'end' rows at u=0 and u=1 - // // If not, add them with the correct number of points - // if (!pointLists.Any(list=>list.Any(item=>item.X == 0.0))) - // { - // var startList = new List(); - // for (var i = 0; i < MinPointCount; i++) - // { - // var v = i * DefaultPointSpacing; - // startList.Add(Point.ByCoordinates(0.0,v,0.0)); - // } - // pointLists.Insert(0, startList); - // } - - // if (!pointLists.Any(list => list.Any(item => item.X == 1.0))) - // { - // var endList = new List(); - // for (var i = 0; i < MinPointCount; i++) - // { - // var v = i * DefaultPointSpacing; - // endList.Add(Point.ByCoordinates(1.0,v,0.0)); - // } - // pointLists.Add(endList); - // } - - // // Project the IGrouping back into an [][] array - // // this is required for the Surface.ByPoints method - // var pointArr = pointLists.Select(l=>l.ToArray()).ToArray(); - - // //var startUTangents = new List(); - // //var startVTangents = new List(); - // //var endUTangents = new List(); - // //var endVTangents = new List(); - - // //for (int i = 0; i < pointArr.Length; i++) - // //{ - // // startUTangents.Add(Vector.XAxis()); - // // endUTangents.Add(Vector.XAxis()); - - // // if (i == 0) - // // { - // // for (int j = 0; j < pointArr[i].Count(); j++) - // // { - // // startVTangents.Add(Vector.YAxis()); - // // } - // // } - // // else if (i == pointArr.Length - 1) - // // { - // // for (int j = 0; j < pointArr[i].Count(); j++) - // // { - // // endVTangents.Add(Vector.YAxis()); - // // } - // // } - // //} - - // //gradientSurface = NurbsSurface.ByPoints(pointArr); - // //gradientSurface = NurbsSurface.ByPointsTangents(pointArr, startUTangents, startVTangents, endUTangents, endVTangents); - - // curves = new List(); - // foreach(var points in pointArr) - // { - // var cpts = new List(); - // var weights = new List(); - // var knots = new List(); - - // Point prevPt = null; - // Point currPt = null; - - // for (var i = 0; i < points.Length; i++) - // { - // currPt = points[i]; - - // if (i == 1 || i == points.Length-1) - // { - // cpts.Add(Point.ByCoordinates(currPt.X, prevPt.Y + (currPt.Y - prevPt.Y) / 2, currPt.Z)); - // } - - // cpts.Add(currPt); - - // prevPt = currPt; - // } - - // for (var i = 0; i < cpts.Count; i++) - // { - // if (i == 0 || i == cpts.Count - 1) - // { - // weights.Add(2); - // } - // else - // { - // weights.Add(1); - // } - // } - - // for (var i = 0; i <= cpts.Count - 3; i++) - // { - // if (i == 0 || i == cpts.Count - 3) - // { - // knots.AddRange(Enumerable.Repeat((double)i, 4)); - // } - // else - // { - // knots.Add(i); - // } - // } - - // // Create a nurbs curve; - // curves.Add(NurbsCurve.ByControlPointsWeightsKnots(cpts, weights.ToArray(), knots.ToArray())); - // } - - // gradientSurface = NurbsSurface.ByLoft(curves); - - // var result = new double[width][]; - - // var wStep = 1 / ((double)width); - // var hStep = 1 / ((double)height); - - // for (var i = 0; i < width; i++) - // { - // result[i] = new double[height]; - // for (var j = 0; j < height; j++) - // { - // var projPt = Point.ByCoordinates(i * wStep, j * hStep, 3.0); - // var proj = gradientSurface.ProjectInputOnto(projPt, Vector.ZAxis().Reverse()); - // var ptEval = proj.First() as Point; - - // // Clamp the points to 0 and 1 - // if (ptEval.Z > 1.0) - // { - // result[i][j] = 1.0; - // } - // else if (ptEval.Z < 0.0) - // { - // result[i][j] = 0.0; - // } - // else - // { - // result[i][j] = ptEval.Z; - // } - // } - // } - - // gradientSurface.Dispose(); - - // return null; - //} - } - - [IsVisibleInDynamoLibrary(false)] - public static class AnalysisExtensions - { - /// - /// Takes two planes (of type UV) and returns True if the difference between the two planes is smaller than 1.0e-6 and returns False otherwise. - /// - /// - /// - /// - public static bool IsAlmostEqualTo(this UV a, UV b) - { - return Math.Abs(a.U - b.U) < 1.0e-6 && Math.Abs(a.V - b.V) < 1.0e-6; - } - } -} diff --git a/src/Libraries/Analysis/VectorData.cs b/src/Libraries/Analysis/VectorData.cs deleted file mode 100644 index eac414079b9..00000000000 --- a/src/Libraries/Analysis/VectorData.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Autodesk.DesignScript.Geometry; -using Autodesk.DesignScript.Runtime; -using Dynamo.Graph.Nodes; - -namespace Analysis -{ - /// - /// A class for storing structured vector analysis data. - /// - [IsVisibleInDynamoLibrary(false)] - public class VectorData : IStructuredData - { - private const byte VectorColor = 120; - - /// - /// A list of calculation locations. - /// - [NodeObsolete("ValueLocationObsolete", typeof(Properties.Resources))] - public IEnumerable ValueLocations { get; internal set; } - - /// - /// A dictionary of results. - /// - [NodeObsolete("ValuesObsolete",typeof(Properties.Resources))] - public IList Values { get; internal set; } - - protected VectorData(IEnumerable points, IList values) - { - ValueLocations = points; - Values = values; - } - - /// - /// Create a VectorAnalysisData object. - /// - /// A list of Points. - /// A list of Vector values. - [NodeObsolete("VectorValueObsolete", typeof(Properties.Resources))] - public static VectorData ByPointsAndValues( - IEnumerable points, IList values) - { - - if (points == null) - { - throw new ArgumentNullException("points"); - } - - if (values == null) - { - throw new ArgumentNullException("values"); - } - - if (!points.Any()) - { - throw new ArgumentException("points", AnalysisResources.EmptyPointsMessage); - } - - if (!values.Any()) - { - throw new ArgumentException("values", AnalysisResources.EmptyValuesMessage); - } - - if (points.Count() != values.Count) - { - throw new ArgumentException(AnalysisResources.InputsNotEquivalentMessage); - } - - return new VectorData(points, values); - } - } -} diff --git a/src/Libraries/CoreNodes/FileSystem.cs b/src/Libraries/CoreNodes/FileSystem.cs index 52c1251e12e..f57d9e5e460 100644 --- a/src/Libraries/CoreNodes/FileSystem.cs +++ b/src/Libraries/CoreNodes/FileSystem.cs @@ -351,52 +351,6 @@ public static void MoveDirectory(string path, string newPath, bool overwriteFile } } #endregion - - #region Obsolete Methods - -#if NET6_0_OR_GREATER - [SupportedOSPlatform("windows")] -#endif - [NodeObsolete("ReadImageObsolete", typeof(Properties.Resources))] - public static Color[] ReadImage(string path, int xSamples, int ySamples) - { - var info = FileFromPath(path); - var image = Image.ReadFromFile(info); - return Image.Pixels(image, xSamples, ySamples).SelectMany(x => x).ToArray(); - } - -#if NET6_0_OR_GREATER - [SupportedOSPlatform("windows")] -#endif - [NodeObsolete("LoadImageFromPathObsolete", typeof(Properties.Resources))] - public static Bitmap LoadImageFromPath(string path) - { - return Image.ReadFromFile(FileFromPath(path)); - } - - [NodeObsolete("ReadTextObsolete", typeof(Properties.Resources))] - public static string ReadText(string path) - { - return ReadText(FileFromPath(path)); - } - -#if NET6_0_OR_GREATER - [SupportedOSPlatform("windows")] -#endif - [NodeObsolete("WriteImageObsolete", typeof(Properties.Resources))] - public static bool WriteImage(string filePath, string fileName, Bitmap image) - { - fileName = Path.ChangeExtension(fileName, "png"); - Image.WriteToFile(Path.Combine(filePath, fileName), image); - return true; - } - - [NodeObsolete("ExportToCSVObsolete", typeof(Properties.Resources))] - public static bool ExportToCSV(string filePath, object[][] data) - { - return false; - } - #endregion } /// diff --git a/src/Libraries/CoreNodes/Properties/Resources.cs-CZ.resx b/src/Libraries/CoreNodes/Properties/Resources.cs-CZ.resx index ac6c1ac543e..e02c42b807e 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.cs-CZ.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.cs-CZ.resx @@ -156,9 +156,6 @@ Nelze uložit data typu {0}. - - Použijte raději uzel Data.ExportCSV. - Vstupní hodnota funkce Math.Factorial nemůže být záporná. @@ -171,9 +168,6 @@ Poloměr vyhledávání nemůže být nula. - - Tento uzel je zastaralý. Použijte řetězec String from Object. - Operace vedla k přetečení celého čísla. Její výsledek může být neočekávaný. @@ -186,9 +180,6 @@ Počet položek se neshoduje s počtem klíčů. href=InvalidKeysLenghtErrorMessage.html - - Raději použijte uzly File.FromPath -> Image.ReadFromFile. - Vybraný modul Python nebylo možné nalézt. @@ -201,12 +192,6 @@ Objekt QuadTree nemůže být sestaven z množiny UV s hodnotou null. - - Raději použijte uzly File.FromPath -> Image.ReadFromFile -> Image.Pixels. - - - Raději použijte uzly File.FromPath -> File.ReadText. - Počet je mimo rozsah. @@ -219,9 +204,6 @@ Adresa URL nesmí mít hodnotu null. - - Raději použijte uzel Image.WriteToFile. - Tento uzel očekával vstup {0}, ale obdržel vstup {1}. Zadejte očekávaný vstup nebo vyberte nový typ v rozevírací nabídce uzlu. diff --git a/src/Libraries/CoreNodes/Properties/Resources.de-DE.resx b/src/Libraries/CoreNodes/Properties/Resources.de-DE.resx index 95c2ab6db80..99ac6a2ac10 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.de-DE.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.de-DE.resx @@ -156,9 +156,6 @@ Daten des Typs {0} können nicht gespeichert werden. - - Verwenden Sie stattdessen den Block Data.ExportCSV. - Der Eingabewert von Math.Factorial darf nicht negativ sein. @@ -171,9 +168,6 @@ Der Suchradius darf nicht null sein. - - Dieser Block ist veraltet, bitte "String from Object" verwenden. - Der Vorgang führte zu einem Ganzzahlüberlauf. Das Ergebnis ist möglicherweise unerwartet. @@ -186,9 +180,6 @@ Anzahl der Elemente stimmt nicht mit der Anzahl der Schlüssel überein. href=InvalidKeysLenghtErrorMessage.html - - Verwenden Sie stattdessen File.FromPath -> Image.ReadFromFile-Blöcke. - Die ausgewählte Python-Engine wurde nicht gefunden @@ -201,12 +192,6 @@ Aus einer Nullmenge von UVs kann kein Quadtree erstellt werden. - - Verwenden Sie stattdessen File.FromPath -> Image.ReadFromFile -> Image.Pixels-Blöcke. - - - Verwenden Sie stattdessen File.FromPath -> File.ReadText-Blöcke. - Anzahl liegt außerhalb des Bereichs. @@ -219,9 +204,6 @@ URL darf nicht null sein. - - Verwenden Sie stattdessen den Block Image.WriteToFile. - Dieser Block erwartete eine {0}-Eingabe, erhielt jedoch eine {1}-Eingabe. Geben Sie die erwartete Eingabe ein, oder wählen Sie im Dropdown-Menü des Blocks einen neuen Typ aus. diff --git a/src/Libraries/CoreNodes/Properties/Resources.en-GB.resx b/src/Libraries/CoreNodes/Properties/Resources.en-GB.resx index 402be78e941..7043b33d317 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.en-GB.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.en-GB.resx @@ -156,9 +156,6 @@ Cannot store data of type {0}. - - Use Data.ExportCSV node instead - The input value of Math.Factorial cannot be negative. @@ -171,9 +168,6 @@ The search radius cannot be zero. - - This node is obsolete, please use "String from Object" - The operation resulted in an integer overflow. Its result may be unexpected. @@ -186,9 +180,6 @@ Number of items does not match the number of keys. href=InvalidKeysLenghtErrorMessage.html - - Use File.FromPath -> Image.ReadFromFile nodes instead - The selected Python engine could not be found @@ -201,12 +192,6 @@ A Quadtree cannot be constructed from a null set of UVs. - - Use File.FromPath -> Image.ReadFromFile -> Image.Pixels nodes instead - - - Use File.FromPath -> File.ReadText nodes instead. - Count is out of range! @@ -219,9 +204,6 @@ The url cannot be null. - - Use Image.WriteToFile node instead - This node expected a {0} input but received a {1} input. Please provide the expected input, or pick a new type in the node’s drop-down menu. diff --git a/src/Libraries/CoreNodes/Properties/Resources.en-US.resx b/src/Libraries/CoreNodes/Properties/Resources.en-US.resx index 12558c02c91..61b44d40969 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.en-US.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.en-US.resx @@ -156,9 +156,6 @@ Cannot store data of type {0}. - - Use Data.ExportCSV node instead - The input value of Math.Factorial cannot be negative. @@ -171,9 +168,6 @@ The search radius cannot be zero. - - This node is obsolete, please use "String from Object" - The operation resulted in an integer overflow. Its result may be unexpected. @@ -186,9 +180,6 @@ Number of items does not match the number of keys. href=InvalidKeysLenghtErrorMessage.html - - Use File.FromPath -> Image.ReadFromFile nodes instead - The selected Python engine could not be found @@ -201,12 +192,6 @@ A Quadtree cannot be constructed from a null set of UVs. - - Use File.FromPath -> Image.ReadFromFile -> Image.Pixels nodes instead - - - Use File.FromPath -> File.ReadText nodes instead. - Count is out of range! @@ -219,9 +204,6 @@ The url cannot be null. - - Use Image.WriteToFile node instead - This node expected a {0} input but received a {1} input. Please provide the expected input, or pick a new type in the node’s drop-down menu. diff --git a/src/Libraries/CoreNodes/Properties/Resources.es-ES.resx b/src/Libraries/CoreNodes/Properties/Resources.es-ES.resx index a5fb24400bf..4d97dbb09db 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.es-ES.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.es-ES.resx @@ -156,9 +156,6 @@ No se pueden almacenar datos del tipo {0}. - - Utilizar el nodo Data.ExportCSV en su lugar - El valor de entrada de Math.Factorial no puede ser negativo. @@ -171,9 +168,6 @@ El radio de búsqueda no puede ser cero - - Este nodo es obsoleto, utilice "String from Object" - La operación ha generado un desbordamiento de número entero. El resultado puede ser inesperado. @@ -186,9 +180,6 @@ El número de elementos no coincide con el número de claves. href=InvalidKeysLenghtErrorMessage.html - - Utiliza los nodos File.FromPath - > Image.ReadFromFile en su lugar - No se ha podido encontrar el motor de Python seleccionado @@ -201,12 +192,6 @@ No se puede generar un árbol cuádruple a partir de un conjunto nulo de UV - - Utiliza los nodos File.FromPath - > Image.ReadFromFile - > Image.Pixels en su lugar - - - Utiliza los nodos File.FromPath - > File.ReadText en su lugar. - El recuento está fuera de rango. @@ -219,9 +204,6 @@ La URL no puede ser nula. - - Utiliza el nodo Image.WriteToFile en su lugar - Este nodo esperaba una entrada {0}, pero ha recibido una entrada {1}. Proporcione la entrada esperada o elija un nuevo tipo en el menú desplegable del nodo. diff --git a/src/Libraries/CoreNodes/Properties/Resources.fr-FR.resx b/src/Libraries/CoreNodes/Properties/Resources.fr-FR.resx index ebd6409f1e5..9ea02296cc0 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.fr-FR.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.fr-FR.resx @@ -156,9 +156,6 @@ Impossible de stocker les données de type {0}. - - Utiliser le noeud Data.ExportCSV à la place - La valeur d'entrée de Math.Factorial ne peut pas être négative. @@ -171,9 +168,6 @@ Le rayon de recherche ne peut pas être égal à zéro. - - Ce noeud est obsolète, utilisez "String from Object" - L'opération a entraîné un dépassement de l'entier. Son résultat peut être inattendu. @@ -186,9 +180,6 @@ Le nombre d'éléments ne correspond pas au nombre de clés. href=InvalidKeysLenghtErrorMessage.html - - Utiliser les noeuds File.FromPath -> Image.ReadFromFile à la place - Le moteur Python sélectionné est introuvable @@ -201,12 +192,6 @@ Un arbre quadratique ne peut pas être créé à partir d'un jeu d'UV nul. - - Utiliser les noeuds File.FromPath -> Image.ReadFromFile -> Image.Pixels à la place - - - Utilisez les noeuds File.FromPath -> File.ReadText à la place. - Le nombre est hors intervalle. @@ -219,9 +204,6 @@ L'URL ne peut pas être nulle. - - Utiliser le noeud Image.WriteToFile à la place - Ce noeud attendait une entrée {0} mais a reçu une entrée {1}. Veuillez fournir l'entrée attendue ou choisir un nouveau type dans le menu déroulant du noeud. diff --git a/src/Libraries/CoreNodes/Properties/Resources.it-IT.resx b/src/Libraries/CoreNodes/Properties/Resources.it-IT.resx index cd6df8254f6..48b1142665e 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.it-IT.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.it-IT.resx @@ -156,9 +156,6 @@ Impossibile memorizzare i dati di tipo {0}. - - Utilizzare invece il nodo Data.ExportCSV - Il valore di input Math.Factorial non può essere negativo. @@ -171,9 +168,6 @@ Il raggio di ricerca non può essere zero. - - Il nodo è obsoleto, utilizzare "String from Object" - L'operazione ha generato un overflow dei numeri interi. Il risultato potrebbe essere imprevisto. @@ -186,9 +180,6 @@ Il numero di elementi non corrisponde al numero di chiavi. href=InvalidKeysLenghtErrorMessage.html - - In sostituzione, utilizzare i nodi File.FromPath -> Image.ReadFromFile - Impossibile trovare il motore Python selezionato. @@ -201,12 +192,6 @@ Non è possibile costruire un elemento quadtree da un gruppo di UV nullo. - - In sostituzione, utilizzare i nodi File.FromPath -> Image.ReadFromFile -> Image.Pixels - - - In sostituzione, utilizzare i nodi File.FromPath -> File.ReadText. - Conteggio non rientra nell'intervallo. @@ -219,9 +204,6 @@ L'URL non può essere Null. - - In sostituzione, utilizzare il nodo Image.WriteToFile - Questo nodo prevedeva un input {0} ma ha ricevuto un input {1}. Fornire l'input previsto o selezionare un nuovo tipo nel menu a discesa del nodo. diff --git a/src/Libraries/CoreNodes/Properties/Resources.ja-JP.resx b/src/Libraries/CoreNodes/Properties/Resources.ja-JP.resx index 5d52e241744..93db8d38cb4 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.ja-JP.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.ja-JP.resx @@ -156,9 +156,6 @@ タイプ {0} のデータを格納できません。 - - 代わりに Data.ExportCSV ノードを使用 - Math.Factorial に負の値を入力することはできません。 @@ -171,9 +168,6 @@ 半径検索の値をゼロにすることはできません。 - - このノードは使用されなくなりました。"String from Object" を使用してください - 演算の結果、整数オーバーフローが発生しました。予期しない結果になる可能性があります。 @@ -186,9 +180,6 @@ 項目数がキーの数に一致しません。href=InvalidKeysLenghtErrorMessage.html - - 代わりに File.FromPath -> Image.ReadFromFile ノードを使用します - 選択した Python エンジンは見つかりませんでした @@ -201,12 +192,6 @@ UV の NULL セットから Quadtree を作成することはできません。 - - 代わりに File.FromPath -> Image.ReadFromFile -> Image.Pixels ノードを使用します - - - 代わりに File.FromPath -> File.ReadText ノードを使用します。 - Count が範囲外です。 @@ -219,9 +204,6 @@ URL を null にすることはできません。 - - 代わりに Image.WriteToFile ノードを使用します - このノードは {0} 入力を要求しましたが、{1} 入力を受け取りました。必要な入力を提供するか、ノードのドロップダウン メニューで新しい型を選択してくださ’い。 diff --git a/src/Libraries/CoreNodes/Properties/Resources.ko-KR.resx b/src/Libraries/CoreNodes/Properties/Resources.ko-KR.resx index e0a10cb318a..1227cb3fef8 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.ko-KR.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.ko-KR.resx @@ -156,9 +156,6 @@ {0} 유형의 데이터를 저장할 수 없습니다. - - 대신 Data.ExportCSV 노드를 사용하십시오. - Math.Factorial의 입력 값은 음수일 수 없습니다. @@ -171,9 +168,6 @@ 검색 반지름은 0이 아니어야 합니다. - - 사용하지 않는 노드입니다. "String from Object"를 사용하십시오. - 작업으로 인해 정수 오버플로우가 발생했습니다. 그 결과가 예기치 않게 발생할 수 있습니다. @@ -186,9 +180,6 @@ 항목 수가 키 수와 일치하지 않습니다. href=InvalidKeysLenghtErrorMessage.html - - 대신 File.FromPath -> Image.ReadFromFile 노드를 사용하십시오. - 선택한 Python 엔진을 찾을 수 없음 @@ -201,12 +192,6 @@ 빈 UV 세트에서 쿼드 트리를 구성할 수 없습니다. - - 대신 File.FromPath -> Image.ReadFromFile -> Image.Pixels 노드를 사용하십시오. - - - 대신 File.FromPath -> File.ReadText 노드를 사용하십시오. - 개수가 범위를 벗어났습니다! @@ -219,9 +204,6 @@ URL은 Null이 될 수 없습니다. - - 대신 Image.WriteToFile 노드를 사용하십시오. - 이 노드는 {0} 입력을 예상했지만 {1} 입력을 수신했습니다. 예상된 입력을 제공하거나 노드의 드롭다운 메뉴에서 새 유형을 선택하십시오. diff --git a/src/Libraries/CoreNodes/Properties/Resources.pl-PL.resx b/src/Libraries/CoreNodes/Properties/Resources.pl-PL.resx index 5ba29f120c4..9e71f2304a6 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.pl-PL.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.pl-PL.resx @@ -156,9 +156,6 @@ Nie można zapisać danych typu {0}. - - Zamiast tego użyj węzła Data.ExportCSV - Wartość danych wejściowych z Math. Factorial nie może być ujemna. @@ -171,9 +168,6 @@ Promień wyszukiwania nie może być równy zeru. - - Węzeł ten jest przestarzały, należy użyć polecenia „Ciąg z obiektu" - Operacja spowodowała przepełnienie liczby całkowitej. Jej wynik może być nieoczekiwany. @@ -186,9 +180,6 @@ Liczba elementów nie odpowiada liczbie kluczy. href=InvalidKeysLenghtErrorMessage.html - - Zamiast tego należy użyć węzłów File.FromPath -> Image.ReadFromFile - Nie można znaleźć wybranego silnika w języku Python @@ -201,12 +192,6 @@ Drzewo czwórkowe nie może być utworzone z pustego zestawu UV. - - Zamiast tego należy użyć węzłów File.FromPath -> Image.ReadFromFile -> Image.Pixels - - - Zamiast tego należy użyć węzłów File.FromPath -> File.ReadText. - Liczba jest poza zakresem! @@ -219,9 +204,6 @@ URL nie może być pusty. - - Zamiast tego należy użyć węzła Image.WriteToFile - Ten węzeł oczekiwał danych wejściowych {0}, ale przekazano do niego dane wejściowe {1}. Podaj oczekiwane dane wejściowe lub wybierz nowy typ z menu rozwijanego węzła. diff --git a/src/Libraries/CoreNodes/Properties/Resources.pt-BR.resx b/src/Libraries/CoreNodes/Properties/Resources.pt-BR.resx index 95e0bcf9d09..0420804c92a 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.pt-BR.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.pt-BR.resx @@ -156,12 +156,6 @@ Não é possível armazenar dados do tipo {0}. - - Utilizar o nó Data.ExportCSV - - - O valor de entrada Math.Factorial não pode ser negativo. - O valor de retorno de Math.Factorial está fora do intervalo. @@ -171,9 +165,6 @@ O raio da pesquisa não pode ser zero. - - Este nó é obsoleto, utilize "String from Object" - A operação resultou em um estouro de número inteiro. O resultado pode ser inesperado. @@ -186,9 +177,6 @@ O número de itens não coincide com o número de chaves. href=InvalidKeysLenghtErrorMessage.html - - Utilize em seu lugar os nós File.FromPath -> Image.ReadFromFile - Não foi possível localizar o mecanismo Python selecionado @@ -201,12 +189,6 @@ Uma árvore quádrupla não pode ser construída a partir de um conjunto nulo de UVs. - - Utilize em seu lugar os nós File.FromPath - > Image.ReadFromFile - > Image.Pixels - - - Utilize em seu lugar os nós File.FromPath - > File.ReadText. - A contagem está fora da faixa! @@ -219,9 +201,6 @@ O URL não pode ser nulo. - - Utilize em seu lugar o nó Image.WriteToFile - Esse nó esperava uma entrada {0}, mas recebeu uma entrada {1}. Forneça a entrada esperada ou selecione um novo tipo no menu suspenso do nó. diff --git a/src/Libraries/CoreNodes/Properties/Resources.resx b/src/Libraries/CoreNodes/Properties/Resources.resx index bee17961411..61b44d40969 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.resx @@ -156,9 +156,6 @@ Cannot store data of type {0}. - - Use Data.ExportCSV node instead - The input value of Math.Factorial cannot be negative. @@ -171,9 +168,6 @@ The search radius cannot be zero. - - This node is obsolete, please use "String from Object" - The operation resulted in an integer overflow. Its result may be unexpected. @@ -186,9 +180,6 @@ Number of items does not match the number of keys. href=InvalidKeysLenghtErrorMessage.html - - Use File.FromPath -> Image.ReadFromFile nodes instead - The selected Python engine could not be found @@ -201,12 +192,6 @@ A Quadtree cannot be constructed from a null set of UVs. - - Use File.FromPath -> Image.ReadFromFile -> Image.Pixels nodes instead - - - Use File.FromPath -> File.ReadText nodes instead. - Count is out of range! @@ -219,9 +204,6 @@ The url cannot be null. - - Use Image.WriteToFile node instead - This node expected a {0} input but received a {1} input. Please provide the expected input, or pick a new type in the node’s drop-down menu. diff --git a/src/Libraries/CoreNodes/Properties/Resources.ru-RU.resx b/src/Libraries/CoreNodes/Properties/Resources.ru-RU.resx index bf054b05771..b0277717c53 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.ru-RU.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.ru-RU.resx @@ -156,9 +156,6 @@ Не удается сохранить данные типа {0}. - - Используйте узел Data.ExportCSV - Входное значение Math.Factorial не может быть отрицательным. @@ -171,9 +168,6 @@ Радиус поиска не может быть равен нулю. - - Этот узел является устаревшим, используйте "String from Object" - Операция привела к переполнению целого числа. Результат может быть непредсказуемым. @@ -186,9 +180,6 @@ Количество элементов не соответствует количеству ключей. href=InvalidKeysLenghtErrorMessage.html - - Используйте узлы File.FromPath -> Image.ReadFromFile - Не удалось найти выбранный механизм Python @@ -201,12 +192,6 @@ Квадрадерево не может быть построено на основе пустого набора UV. - - Используйте узлы File.FromPath -> Image.ReadFromFile -> Image.Pixels - - - Используйте узлы File.FromPath -> File.ReadText. - Количество выходит за пределы диапазона! @@ -219,9 +204,6 @@ URL-адрес не может быть пустым. - - Используйте узел Image.WriteToFile - Для этого узла ожидался ввод {0}, но получен ввод {1}. Введите ожидаемое входное значение или выберите новый тип в раскрывающемся меню узла. diff --git a/src/Libraries/CoreNodes/Properties/Resources.zh-CN.resx b/src/Libraries/CoreNodes/Properties/Resources.zh-CN.resx index 2b3f6f39ea4..547e3187c6e 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.zh-CN.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.zh-CN.resx @@ -156,9 +156,6 @@ 无法存储 {0} 类型的数据。 - - 而是使用 Data.ExportCSV 节点 - Math.Factorial 的输入值不能为负。 @@ -171,9 +168,6 @@ 搜索半径不能为零。 - - 此节点已过时,请使用“String from Object” - 该操作导致整数溢出。其结果可能异常。 @@ -186,9 +180,6 @@ 项目数与关键字数不匹配。href=InvalidKeysLenghtErrorMessage.html - - 而是使用 File.FromPath -> Image.ReadFromFile 节点 - 找不到选定的 Python 引擎 @@ -201,12 +192,6 @@ 无法由空 UV 集构造四叉树。 - - 而是使用 File.FromPath -> Image.ReadFromFile -> Image.Pixels 节点 - - - 而是使用 File.FromPath -> File.ReadText 节点。 - 计数超出范围! @@ -219,9 +204,6 @@ url 不能为空。 - - 而是使用 Image.WriteToFile 节点 - 此节点预计需要 {0} 输入,但却收到 {1} 输入。请提供预计输入,或在节点的下拉菜单中拾取新类型。 diff --git a/src/Libraries/CoreNodes/Properties/Resources.zh-TW.resx b/src/Libraries/CoreNodes/Properties/Resources.zh-TW.resx index b70dc8b6529..0051b34ea2b 100644 --- a/src/Libraries/CoreNodes/Properties/Resources.zh-TW.resx +++ b/src/Libraries/CoreNodes/Properties/Resources.zh-TW.resx @@ -156,9 +156,6 @@ 無法儲存類型為 {0} 的資料。 - - 請改用 Data.ExportCSV 節點 - Math.Factorial 的輸入值不可為負值。 @@ -171,9 +168,6 @@ 搜尋半徑不能為零。 - - 此為舊型節點,請使用「來自物件的字串」 - 作業造成整數溢位。可能會產生非預期的結果。 @@ -186,9 +180,6 @@ 項目數目與鍵的數目不相符。href=InvalidKeysLenghtErrorMessage.html - - 使用 File.FromPath -> Image.ReadFromFile 節點 - 找不到選取的 Python 引擎 @@ -201,12 +192,6 @@ 無法從空值的 UV 集建置四元樹狀目錄。 - - 使用 File.FromPath -> Image.ReadFromFile -> Image.Pixels 節點 - - - 使用 File.FromPath -> File.ReadText 節點。 - Count 超出範圍 ! @@ -219,9 +204,6 @@ URL 不能為空。 - - 使用 Image.WriteToFile 節點 - 此節點應為 {0} 輸入,但收到 {1} 輸入。請提供預期的輸入,或在節點的下拉式功能表中點選新類型。 diff --git a/src/Libraries/CoreNodes/String.cs b/src/Libraries/CoreNodes/String.cs index cdd33272e50..42a10df5b33 100644 --- a/src/Libraries/CoreNodes/String.cs +++ b/src/Libraries/CoreNodes/String.cs @@ -13,14 +13,6 @@ namespace DSCore /// public static class String { - // It has been moved to String.FromObject UI node, which is compiled - // to built-in function __ToStringFromObject(). - [NodeObsolete("FromObjectObsolete", typeof(Properties.Resources))] - public static string FromObject(object obj) - { - return obj.ToString(); - } - /// /// Converts a string to an integer or a double. /// diff --git a/src/Libraries/DSOffice/Excel.cs b/src/Libraries/DSOffice/Excel.cs index f822aca7240..41e333cdebb 100644 --- a/src/Libraries/DSOffice/Excel.cs +++ b/src/Libraries/DSOffice/Excel.cs @@ -164,12 +164,6 @@ public static object[][] ReadFromFile(FileInfo file, string sheetName, bool read return data; } - [NodeObsolete("ReadObsolete", typeof(Properties.Resources))] - public static object[][] Read(string filePath, string sheetName) - { - return ReadFromFile(new FileInfo(filePath), sheetName); - } - /// /// Write data to a Microsoft Excel spreadsheet. Data is written by row /// with sublists to be written in successive rows. Rows and columns are diff --git a/src/Libraries/DSOffice/Properties/Resources.cs-CZ.resx b/src/Libraries/DSOffice/Properties/Resources.cs-CZ.resx index 382bf51b0a3..46c7bdc3162 100644 --- a/src/Libraries/DSOffice/Properties/Resources.cs-CZ.resx +++ b/src/Libraries/DSOffice/Properties/Resources.cs-CZ.resx @@ -120,9 +120,6 @@ Tento uzel je zastaralý a bude odebrán v budoucí verzi aplikace Dynamo, použijte odpovídající uzel založený na OpenXML. - - Použijte místo toho uzel File.FromPath -> Excel.ReadFromFile. - Soubor nebo adresář nelze nalézt. diff --git a/src/Libraries/DSOffice/Properties/Resources.de-DE.resx b/src/Libraries/DSOffice/Properties/Resources.de-DE.resx index 0a73ffa1b19..d99920a0360 100644 --- a/src/Libraries/DSOffice/Properties/Resources.de-DE.resx +++ b/src/Libraries/DSOffice/Properties/Resources.de-DE.resx @@ -120,9 +120,6 @@ Dieser Block ist veraltet und wird in einer zukünftigen Version von Dynamo entfernt. Verwenden Sie den entsprechenden Block, der auf OpenXML basiert. - - Verwenden Sie stattdessen den Block File.FromPath -> Excel.ReadFromFile. - Datei oder Verzeichnis wurde nicht gefunden diff --git a/src/Libraries/DSOffice/Properties/Resources.en-GB.resx b/src/Libraries/DSOffice/Properties/Resources.en-GB.resx index 8f926b5e3e2..1e8185f3ada 100644 --- a/src/Libraries/DSOffice/Properties/Resources.en-GB.resx +++ b/src/Libraries/DSOffice/Properties/Resources.en-GB.resx @@ -120,9 +120,6 @@ This node is obsolete and will be removed in a future version of Dynamo, please use the corresponding one that is OpenXML based. - - Use File.FromPath -> Excel.ReadFromFile node instead. - The file or directory cannot be found diff --git a/src/Libraries/DSOffice/Properties/Resources.en-US.resx b/src/Libraries/DSOffice/Properties/Resources.en-US.resx index 8f926b5e3e2..1e8185f3ada 100644 --- a/src/Libraries/DSOffice/Properties/Resources.en-US.resx +++ b/src/Libraries/DSOffice/Properties/Resources.en-US.resx @@ -120,9 +120,6 @@ This node is obsolete and will be removed in a future version of Dynamo, please use the corresponding one that is OpenXML based. - - Use File.FromPath -> Excel.ReadFromFile node instead. - The file or directory cannot be found diff --git a/src/Libraries/DSOffice/Properties/Resources.es-ES.resx b/src/Libraries/DSOffice/Properties/Resources.es-ES.resx index a3aae95f49e..2b8d91b9869 100644 --- a/src/Libraries/DSOffice/Properties/Resources.es-ES.resx +++ b/src/Libraries/DSOffice/Properties/Resources.es-ES.resx @@ -120,9 +120,6 @@ Este nodo está obsoleto y se eliminará en una futura versión de Dynamo. Utilice el correspondiente basado en OpenXML. - - En su lugar, use los nodos File.FromPath -> Excel.ReadFromFile. - No se puede encontrar el archivo o el directorio. diff --git a/src/Libraries/DSOffice/Properties/Resources.fr-FR.resx b/src/Libraries/DSOffice/Properties/Resources.fr-FR.resx index 3da0e91ed55..4aab099a0d3 100644 --- a/src/Libraries/DSOffice/Properties/Resources.fr-FR.resx +++ b/src/Libraries/DSOffice/Properties/Resources.fr-FR.resx @@ -120,9 +120,6 @@ Ce noeud est obsolète et sera supprimé dans une version ultérieure de Dynamo. Veuillez utiliser le noeud correspondant qui est basé sur OpenXML. - - Utilisez le noeud File.FromPath -> Excel.ReadFromFile à la place. - Le fichier ou le répertoire est introuvable diff --git a/src/Libraries/DSOffice/Properties/Resources.it-IT.resx b/src/Libraries/DSOffice/Properties/Resources.it-IT.resx index 81fb5c22a3e..6951d0b7df8 100644 --- a/src/Libraries/DSOffice/Properties/Resources.it-IT.resx +++ b/src/Libraries/DSOffice/Properties/Resources.it-IT.resx @@ -120,9 +120,6 @@ Questo nodo è obsoleto e verrà rimosso in una versione futura di Dynamo. Utilizzare quello corrispondente basato su OpenXML. - - In sostituzione, utilizzare il nodo File.FromPath -> Excel.ReadFromFile. - Impossibile trovare il file o la directory diff --git a/src/Libraries/DSOffice/Properties/Resources.ja-JP.resx b/src/Libraries/DSOffice/Properties/Resources.ja-JP.resx index f6b4692344f..a5a969ccffa 100644 --- a/src/Libraries/DSOffice/Properties/Resources.ja-JP.resx +++ b/src/Libraries/DSOffice/Properties/Resources.ja-JP.resx @@ -120,9 +120,6 @@ このノードは廃止され、Dynamo の将来のバージョンで削除される予定です。対応する OpenXML ベースのノードを使用してください。 - - File.FromPath ノードの代わりに Excel.ReadFromFile ノードを使用してください。 - ファイルまたはフォルダが見つかりません diff --git a/src/Libraries/DSOffice/Properties/Resources.ko-KR.resx b/src/Libraries/DSOffice/Properties/Resources.ko-KR.resx index 1c404ac561a..f1656c3696f 100644 --- a/src/Libraries/DSOffice/Properties/Resources.ko-KR.resx +++ b/src/Libraries/DSOffice/Properties/Resources.ko-KR.resx @@ -120,9 +120,6 @@ 이 노드는 더 이상 사용되지 않으며 향후 버전의 Dynamo에서 제거될 예정입니다. OpenXML에 기반을 둔 해당 노드를 사용하십시오. - - 대신 File.FromPath -> Excel.ReadFromFile 노드를 사용하십시오. - 파일 또는 디렉토리를 찾을 수 없습니다 diff --git a/src/Libraries/DSOffice/Properties/Resources.pl-PL.resx b/src/Libraries/DSOffice/Properties/Resources.pl-PL.resx index e9dde402b6d..f3774e0ce09 100644 --- a/src/Libraries/DSOffice/Properties/Resources.pl-PL.resx +++ b/src/Libraries/DSOffice/Properties/Resources.pl-PL.resx @@ -120,9 +120,6 @@ Ten węzeł jest przestarzały i zostanie usunięty w przyszłej wersji dodatku Dynamo. Użyj odpowiedniego węzła opartego na języku OpenXML. - - Zamiast tego użyj węzła File.FromPath -> Excel.ReadFromFile. - Nie można znaleźć pliku lub katalogu diff --git a/src/Libraries/DSOffice/Properties/Resources.pt-BR.resx b/src/Libraries/DSOffice/Properties/Resources.pt-BR.resx index ff8ee1d655a..b50d8e826a7 100644 --- a/src/Libraries/DSOffice/Properties/Resources.pt-BR.resx +++ b/src/Libraries/DSOffice/Properties/Resources.pt-BR.resx @@ -120,9 +120,6 @@ Esse nó está obsoleto e será removido em uma versão futura do Dynamo. Use o nó correspondente baseado em OpenXML. - - Use o nó File.FromPath -> Excel.ReadFromFile. - Não é possível localizar o arquivo ou o diretório diff --git a/src/Libraries/DSOffice/Properties/Resources.resx b/src/Libraries/DSOffice/Properties/Resources.resx index 8f926b5e3e2..1e8185f3ada 100644 --- a/src/Libraries/DSOffice/Properties/Resources.resx +++ b/src/Libraries/DSOffice/Properties/Resources.resx @@ -120,9 +120,6 @@ This node is obsolete and will be removed in a future version of Dynamo, please use the corresponding one that is OpenXML based. - - Use File.FromPath -> Excel.ReadFromFile node instead. - The file or directory cannot be found diff --git a/src/Libraries/DSOffice/Properties/Resources.ru-RU.resx b/src/Libraries/DSOffice/Properties/Resources.ru-RU.resx index cb1621956b0..5e287563671 100644 --- a/src/Libraries/DSOffice/Properties/Resources.ru-RU.resx +++ b/src/Libraries/DSOffice/Properties/Resources.ru-RU.resx @@ -120,9 +120,6 @@ Этот узел устарел и будет удален в следующей версии Dynamo. Используйте соответствующий узел на основе OpenXML. - - Используйте узел File.FromPath -> Excel.ReadFromFile. - Не удается найти файл или папку diff --git a/src/Libraries/DSOffice/Properties/Resources.zh-CN.resx b/src/Libraries/DSOffice/Properties/Resources.zh-CN.resx index 42acf104bb0..e1511a59173 100644 --- a/src/Libraries/DSOffice/Properties/Resources.zh-CN.resx +++ b/src/Libraries/DSOffice/Properties/Resources.zh-CN.resx @@ -120,9 +120,6 @@ 此节点已过时,将在未来版本的 Dynamo 中删除,请使用基于 OpenXML 的相应节点。 - - 改为使用 File.FromPath -> Excel.ReadFromFile 节点。 - 找不到文件或目录 diff --git a/src/Libraries/DSOffice/Properties/Resources.zh-TW.resx b/src/Libraries/DSOffice/Properties/Resources.zh-TW.resx index dc9585c1fc7..7798f117f83 100644 --- a/src/Libraries/DSOffice/Properties/Resources.zh-TW.resx +++ b/src/Libraries/DSOffice/Properties/Resources.zh-TW.resx @@ -120,9 +120,6 @@ 此為舊型節點,未來版本的 Dynamo 將移除,請使用以 OpenXML 為基礎的對應節點。 - - 改為使用 File.FromPath -> Excel.ReadFromFile 節點。 - 找不到檔案或目錄 diff --git a/test/DynamoCoreTests/DynamoDefects.cs b/test/DynamoCoreTests/DynamoDefects.cs index 18b2b738881..104435cfbe8 100644 --- a/test/DynamoCoreTests/DynamoDefects.cs +++ b/test/DynamoCoreTests/DynamoDefects.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using CoreNodeModels.Input; @@ -482,12 +482,12 @@ public void CyclicDependency_Defect8827() RunModel(openPath); // check for number of Nodes and Connectors Assert.AreEqual(2, CurrentDynamoModel.CurrentWorkspace.Nodes.Count()); - Assert.AreEqual(2, CurrentDynamoModel.CurrentWorkspace.Connectors.Count()); + Assert.AreEqual(4, CurrentDynamoModel.CurrentWorkspace.Connectors.Count()); var node1 = CurrentDynamoModel.CurrentWorkspace.NodeFromWorkspace - ("385281c8-3177-4359-a348-a3084e16a41a"); + ("923ff0c7-0979-4327-942e-e41ebe7536fd"); var node2 = CurrentDynamoModel.CurrentWorkspace.NodeFromWorkspace - ("1ad8632e-7ddc-4cc7-bfa5-58cb899a5ddf"); + ("0ce96568-fb37-48bb-a920-40857f1579f3"); Assert.IsTrue(node1.Infos.Any(x => x.Message.Equals(ProtoCore.Properties.Resources.kInvalidStaticCyclicDependency))); Assert.IsTrue(node2.Infos.Any(x => x.Message.Equals(ProtoCore.Properties.Resources.kInvalidStaticCyclicDependency))); diff --git a/test/DynamoCoreTests/NodeMigrationTests.cs b/test/DynamoCoreTests/NodeMigrationTests.cs index b939bd34336..168286e05cb 100644 --- a/test/DynamoCoreTests/NodeMigrationTests.cs +++ b/test/DynamoCoreTests/NodeMigrationTests.cs @@ -144,11 +144,6 @@ public void TestMigration_InputOutput_Excel() } //TODO_MSIL pull csv nodes into their own file with a partial class? //or mark excel methods windows only. - [Test] - public void TestMigration_InputOutput_File() - { - TestMigration("TestMigration_InputOutput_File.dyn"); - } [Test] public void TestMigration_FileSystem() diff --git a/test/DynamoCoreTests/Nodes/StringTests.cs b/test/DynamoCoreTests/Nodes/StringTests.cs index 7d164f2316a..701604f6c0b 100644 --- a/test/DynamoCoreTests/Nodes/StringTests.cs +++ b/test/DynamoCoreTests/Nodes/StringTests.cs @@ -866,18 +866,6 @@ public void TestTrimWhitespaceInvalidInput() #endregion - #region Test obsolete string functions ToString and String.FromObject - [Test] - public void TestObsoleteStringFunctions() - { - string testFilePath = Path.Combine(localDynamoStringTestFolder, "TestObsoleteStringFunctions.dyn"); - - RunModel(testFilePath); - AssertPreviewValue("88ecf13c-40dc-42c2-89b3-375c2773f5b1", 42); - AssertPreviewValue("257aaba5-5e11-4646-a25f-6cd17eb8d200", 42); - } - #endregion - #region Test localized string [Test] public void TestLocalizedString() diff --git a/test/Engine/ProtoTest/FFITests/CSFFIDataMarshalingTest.cs b/test/Engine/ProtoTest/FFITests/CSFFIDataMarshalingTest.cs index 81d10b88e8b..ff5e0ed4cf2 100644 --- a/test/Engine/ProtoTest/FFITests/CSFFIDataMarshalingTest.cs +++ b/test/Engine/ProtoTest/FFITests/CSFFIDataMarshalingTest.cs @@ -796,10 +796,10 @@ public void Test_MarshlingPointerToCollection() arr1 = TestData.JoinList([d, [1,2,3]]); arr2 = TestData.JoinList([d, d, d]); - type1 = ToString(arr1[0]); + type1 = __ToStringFromObject(arr1[0]); rank1 = List.Rank(arr1); - type2 = ToString(arr2[0]); + type2 = __ToStringFromObject(arr2[0]); rank2 = List.Rank(arr2); "; ValidationData[] data = { diff --git a/test/Libraries/AnalysisTests/AnalysisTests.cs b/test/Libraries/AnalysisTests/AnalysisTests.cs deleted file mode 100644 index 9549b508832..00000000000 --- a/test/Libraries/AnalysisTests/AnalysisTests.cs +++ /dev/null @@ -1,172 +0,0 @@ -using System; -using System.Collections.Generic; - -using Analysis; - -using Autodesk.DesignScript.Geometry; - -using NUnit.Framework; - -namespace AnalysisTests -{ - [TestFixture] - public class AnalysisTests : TestServices.GeometricTestBase - { - [Test, Category("UnitTests")] - public void SurfaceAnalysisDataBySurfacePointsAndResults_ValidArgs() - { - var sad = SurfaceData.BySurfacePointsAndValues( - TestSurface(), - TestUvs(), - TestResults()); - - Assert.NotNull(sad); - Assert.NotNull(sad.Surface); - Assert.AreEqual(sad.Values.Count, 3); - } - - [Test, Category("UnitTests")] - public void SurfaceAnalysisDataBySurfacePointAndResults_BadArgs() - { - Assert.Throws(() => SurfaceData.BySurfacePointsAndValues( - null, - TestUvs(), - TestResults())); - - Assert.Throws(() => SurfaceData.BySurfacePointsAndValues( - TestSurface(), - null, - TestResults())); - - Assert.Throws(() => SurfaceData.BySurfacePointsAndValues( - TestSurface(), - TestUvs(), - null)); - - // Test empty calculation set - Assert.Throws(() => SurfaceData.BySurfacePointsAndValues( - TestSurface(), - new List(), - TestResults())); - - // Test non matching results sets - Assert.Throws(() => SurfaceData.BySurfacePointsAndValues( - TestSurface(), - new []{UV.ByCoordinates(0,0)}, - TestResults())); - } - - [Test, Category("UnitTests")] - public void PointAnalysisDataByPointsAndResults_ValidArgs() - { - var pad = PointData.ByPointsAndValues( - TestPoints(), - TestResults()); - - Assert.NotNull(pad); - Assert.NotNull(pad.ValueLocations); - Assert.NotNull(pad.Values); - Assert.AreEqual(pad.Values.Count, 3); - } - - [Test, Category("UnitTests")] - public void PointAnalysisDataByPointsAndResults_BadArgs() - { - Assert.Throws( - () => PointData.ByPointsAndValues(null, TestResults())); - - Assert.Throws( - () => PointData.ByPointsAndValues(TestPoints(), null)); - - Assert.Throws( - () => PointData.ByPointsAndValues(new []{Point.ByCoordinates(0,0)}, TestResults())); - } - - [Test, Category("UnitTests")] - public void VectorAnalysisDataByPointsAndResults_ValidArgs() - { - var vad = VectorData.ByPointsAndValues(TestPoints(), TestVectorResults()); - Assert.NotNull(vad); - Assert.NotNull(vad.ValueLocations); - Assert.NotNull(vad.Values); - Assert.AreEqual(vad.Values.Count, 3); - } - - [Test, Category("UnitTests")] - public void VectorAnalysisDataByPointsAndResults_BadArgs() - { - Assert.Throws( - () => - VectorData.ByPointsAndValues( - null, - TestVectorResults())); - - Assert.Throws( - () => - VectorData.ByPointsAndValues( - TestPoints(), - null)); - - Assert.Throws( - () => - VectorData.ByPointsAndValues( - new []{Point.ByCoordinates(0,0)}, - TestVectorResults())); - - } - - private static Surface TestSurface() - { - var points = new[] - { - Point.ByCoordinates(0, 0, 0), - Point.ByCoordinates(0, 1, 0), - Point.ByCoordinates(1, 1, 0), - Point.ByCoordinates(1, 0, 0) - }; - - var srf = Surface.ByPerimeterPoints(points); - return srf; - } - - private static IList TestResults() - { - var a = new List{ 1.0, 2.0, 3.0 }; - return a; - } - - private static IEnumerable TestPoints() - { - var pts = new[] - { - Point.ByCoordinates(0, 0), - Point.ByCoordinates(0.5,0.5), - Point.ByCoordinates(1, 1) - }; - - return pts; - } - - private static IEnumerable TestUvs() - { - var uvs = new[] - { - UV.ByCoordinates(0, 0), - UV.ByCoordinates(0.5, 0.5), - UV.ByCoordinates(1, 1) - }; - - return uvs; - } - - private static IList TestVectorResults() - { - var x = Vector.ByCoordinates(1, 0, 0); - var y = Vector.ByCoordinates(0, 1, 0); - var z = Vector.ByCoordinates(0, 0, 1); - - var a = new List {x,y,z}; - return a; - } - } -} diff --git a/test/Libraries/AnalysisTests/SurfaceDataTests.cs b/test/Libraries/AnalysisTests/SurfaceDataTests.cs deleted file mode 100644 index c7f37e03924..00000000000 --- a/test/Libraries/AnalysisTests/SurfaceDataTests.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Collections.Generic; -using Analysis; -using Autodesk.DesignScript.Geometry; -using NUnit.Framework; - -namespace AnalysisTests -{ - [TestFixture] - class SurfaceDataTests : TestServices.GeometricTestBase - { - /// - /// This test method will execute the BySurfaceAndPoints method from the SurfaceData class passing different parameters - /// - [Test, Category("UnitTests")] - public void SurfaceAnalysisDataBySurfaceAndPointsTest_Exceptions() - { - //Act - var sad = SurfaceData.BySurfaceAndPoints(TestSurface(),TestUvs()); - - //Assert - Assert.IsNotNull(sad); - Assert.IsNotNull(sad.Surface); - //The BySurfaceAndPoints method creates a surface without values, then we validate that values is null - Assert.IsNull(sad.Values); - - //It will raise an ArgumentNullException when we pass the Surface as null - Assert.Throws(() => SurfaceData.BySurfaceAndPoints(null, TestUvs())); - - //It will raise an ArgumentNullException when we pass the UV values as null - Assert.Throws(() => SurfaceData.BySurfaceAndPoints(TestSurface(), null)); - - //It will raise an ArgumentNullException when we pass the UV values as empty IEnumerable - Assert.Throws(() => SurfaceData.BySurfaceAndPoints(TestSurface(), new UV[0])); - - } - - /// - /// This test method will execute the BySurfacePointsAndValues method from the SurfaceData class passing an empty values List - /// - [Test, Category("UnitTests")] - public void SurfaceAnalysisDataBySurfacePointsAndResults_ValuesException() - { - //This will raise the exception thrown when the values list passed to BySurfacePointsAndValues method is empty - Assert.Throws(() => SurfaceData.BySurfacePointsAndValues( - TestSurface(), - TestUvs(), - new List()) ); - } - - /// - /// This test method will execute the IsAlmostEqualTo method from the AnalysisExtensions class - /// - [Test, Category("UnitTests")] - public void AnalysisExtensionsIsAlmostEqualToTest() - { - //Arrange - //Define two UV coordinates that are extremely close - var UVCoord1 = UV.ByCoordinates(0.0000005, 0.0000005); - var UVCoord2 = UV.ByCoordinates(0.0000004, 0.0000004); - - //Act - var boolResult = AnalysisExtensions.IsAlmostEqualTo(UVCoord1, UVCoord2); - - //Assert - //If is true means that the coordinates are almost equal - Assert.IsTrue(boolResult); - } - - private static Surface TestSurface() - { - var points = new[] - { - Point.ByCoordinates(0, 0, 0), - Point.ByCoordinates(0, 1, 0), - Point.ByCoordinates(1, 1, 0), - Point.ByCoordinates(1, 0, 0) - }; - - var srf = Surface.ByPerimeterPoints(points); - return srf; - } - - private static IEnumerable TestUvs() - { - var uvs = new[] - { - UV.ByCoordinates(0, 0), - UV.ByCoordinates(0.5, 0.5), - UV.ByCoordinates(1, 1) - }; - - return uvs; - } - } -} diff --git a/test/Libraries/WorkflowTests/ComplexTests.cs b/test/Libraries/WorkflowTests/ComplexTests.cs index 8744bf8934e..b83f9ae0b15 100644 --- a/test/Libraries/WorkflowTests/ComplexTests.cs +++ b/test/Libraries/WorkflowTests/ComplexTests.cs @@ -580,8 +580,8 @@ public void Test_File_Migration() var workspace = CurrentDynamoModel.CurrentWorkspace; // check all the nodes and connectors are loaded - Assert.AreEqual(10, workspace.Connectors.Count()); - Assert.AreEqual(11, workspace.Nodes.Count()); + Assert.AreEqual(12, workspace.Connectors.Count()); + Assert.AreEqual(13, workspace.Nodes.Count()); // give absolute path var textFileName = workspace.NodeFromWorkspace("545b092b-8b2c-4cd4-b15e-9e4162dd4579"); @@ -593,9 +593,6 @@ public void Test_File_Migration() var imgFileName = workspace.NodeFromWorkspace("c20d8f16-4bf7-465f-93ca-6afd05fe02a2"); imgFileName.Value = Path.Combine(directory, imgFileName.Value); - var imgDirectory = workspace.NodeFromWorkspace("729b5ffd-7813-4e09-94a2-74a1e4619c5f"); - imgDirectory.Value = directory; - var xlsxFileName = workspace.NodeFromWorkspace("b8f8f48b-c546-4ae8-b7f6-45e52310e361"); xlsxFileName.Value = Path.Combine(directory, xlsxFileName.Value); @@ -603,7 +600,7 @@ public void Test_File_Migration() BeginRun(); // test reading - var readText = "b6e77130-3c2e-4d6b-ae5b-2137c3d3a51b"; + var readText = "2d8d7891-3de2-40d6-bd11-5cd46f983030"; var text = GetPreviewValue(readText) as string; Assert.AreEqual(text,"1234"); @@ -615,13 +612,14 @@ public void Test_File_Migration() Assert.AreEqual(ElementState.Active, nodeModel.State); // test reading image. There are 100 Colors object that is generated since - // the sampling in x and y direction is 10. - var readImage = "7fba95f1-fd7a-4033-a7a9-5dfb91c7e886"; - Assert.AreEqual(100,GetFlattenedPreviewValues(readImage).Count); + var imagePixels = "f866a25b-df8f-4c11-a57a-6483d007d432"; + Assert.AreEqual(100,GetFlattenedPreviewValues(imagePixels).Count); // test load image from path and writing image in a CBN var codeBlock = "75b9d0a3-e954-42b5-8ccf-66845b122e3f"; - AssertPreviewValue(codeBlock,true); + var bitmap = GetPreviewValue(codeBlock); + Assert.IsNotNull(bitmap); + Assert.IsInstanceOf(bitmap); // text writing to csv, the node is obsolete but // is migrated, so no warning should be shown on this node diff --git a/test/core/DynamoDefects/Defect_MAGN_8827.dyn b/test/core/DynamoDefects/Defect_MAGN_8827.dyn index 7023fc121da..8fa200b1549 100644 --- a/test/core/DynamoDefects/Defect_MAGN_8827.dyn +++ b/test/core/DynamoDefects/Defect_MAGN_8827.dyn @@ -1,17 +1,187 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file +{ + "Uuid": "3c9d0464-8643-5ffe-96e5-ab1769818209", + "IsCustomNode": false, + "Description": "", + "Name": "Defect_MAGN_8827", + "ElementResolver": { + "ResolutionMap": {} + }, + "Inputs": [], + "Outputs": [], + "Nodes": [ + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "923ff0c709794327942ee41ebe7536fd", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "0d8194bc16bb429baa065e097c96baf9", + "Name": "x", + "Description": "Integer value, double value or string\n\nvar[]..[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "82ddfabae3724692b49766a0ec4e2310", + "Name": "y", + "Description": "Integer value, double value or string\n\nvar[]..[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "a42291b785e14b11932a3597c1e48906", + "Name": "var", + "Description": "The sum of two input numbers, or the concatenation of two strings", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "+@var[]..[],var[]..[]", + "Replication": "Auto", + "Description": "Returns addition of x and y\n\n+ (x: var[]..[], y: var[]..[]): var[]..[]" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "0ce96568fb3748bba92040857f1579f3", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "57c35009031f4ae8a4dc7de15430bbd1", + "Name": "x", + "Description": "Integer value, double value or string\n\nvar[]..[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "96fb9d1da778427a9b9de9bfaeffdbdd", + "Name": "y", + "Description": "Integer value, double value or string\n\nvar[]..[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "5489b2cfce67463e82db1be0e673887e", + "Name": "var", + "Description": "The sum of two input numbers, or the concatenation of two strings", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "+@var[]..[],var[]..[]", + "Replication": "Auto", + "Description": "Returns addition of x and y\n\n+ (x: var[]..[], y: var[]..[]): var[]..[]" + } + ], + "Connectors": [ + { + "Start": "a42291b785e14b11932a3597c1e48906", + "End": "57c35009031f4ae8a4dc7de15430bbd1", + "Id": "7c108c156b0e4b10880806651a8a34f5", + "IsHidden": "False" + }, + { + "Start": "a42291b785e14b11932a3597c1e48906", + "End": "96fb9d1da778427a9b9de9bfaeffdbdd", + "Id": "99a86a8f7a154409abeb797971a9e2f3", + "IsHidden": "False" + }, + { + "Start": "5489b2cfce67463e82db1be0e673887e", + "End": "82ddfabae3724692b49766a0ec4e2310", + "Id": "2beb523dfcaf489faebdf90ae0e303a2", + "IsHidden": "False" + }, + { + "Start": "5489b2cfce67463e82db1be0e673887e", + "End": "0d8194bc16bb429baa065e097c96baf9", + "Id": "507c06416c194a1fa00ebcb2a7a58ba9", + "IsHidden": "False" + } + ], + "Dependencies": [], + "NodeLibraryDependencies": [], + "EnableLegacyPolyCurveBehavior": null, + "Thumbnail": null, + "GraphDocumentationURL": null, + "ExtensionWorkspaceData": [ + { + "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670", + "Name": "Properties", + "Version": "4.1", + "Data": {} + } + ], + "Author": "None provided", + "Linting": { + "activeLinter": "None", + "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a", + "warningCount": 0, + "errorCount": 0 + }, + "Bindings": [], + "View": { + "Dynamo": { + "ScaleFactor": 1.0, + "HasRunWithoutCrash": true, + "IsVisibleInDynamoLibrary": true, + "Version": "4.1.0.2940", + "RunType": "Manual", + "RunPeriod": "1000" + }, + "Camera": { + "Name": "_Background Preview", + "EyeX": -17.0, + "EyeY": 24.0, + "EyeZ": 50.0, + "LookX": 12.0, + "LookY": -13.0, + "LookZ": -58.0, + "UpX": 0.0, + "UpY": 1.0, + "UpZ": 0.0 + }, + "ConnectorPins": [], + "NodeViews": [ + { + "Id": "923ff0c709794327942ee41ebe7536fd", + "Name": "+", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 495.5, + "Y": 142.0 + }, + { + "Id": "0ce96568fb3748bba92040857f1579f3", + "Name": "+", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 528.5, + "Y": 341.0 + } + ], + "Annotations": [], + "X": 0.0, + "Y": 0.0, + "Zoom": 1.0 + } +} \ No newline at end of file diff --git a/test/core/WorkflowTestFiles/File Migration/File.dyn b/test/core/WorkflowTestFiles/File Migration/File.dyn index cc42195d0dc..3294cae2841 100644 --- a/test/core/WorkflowTestFiles/File Migration/File.dyn +++ b/test/core/WorkflowTestFiles/File Migration/File.dyn @@ -1,38 +1,692 @@ - - - - - File_Migration.txt - - - - - - - - File_Migration.png - - - No file selected. - - - File_Migration_Write.txt - - - File_Migration.xlsx - - - - - - - - - - - - - - - - \ No newline at end of file +{ + "Uuid": "3c9d0464-8643-5ffe-96e5-ab1769818209", + "IsCustomNode": false, + "Description": "", + "Name": "File", + "ElementResolver": { + "ResolutionMap": { + "FileSystem": { + "Key": "DSCore.IO.FileSystem", + "Value": "DSCoreNodes.dll" + }, + "Image": { + "Key": "DSCore.IO.Image", + "Value": "DSCoreNodes.dll" + } + } + }, + "Inputs": [], + "Outputs": [], + "Nodes": [ + { + "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", + "Id": "75b9d0a3e95442b58ccf66845b122e3f", + "NodeType": "CodeBlockNode", + "Inputs": [ + { + "Id": "bb485b43322b4579b96c952531b1bd1b", + "Name": "a", + "Description": "a", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "1f056f08daac4518803802461a1c8c6c", + "Name": "c", + "Description": "c = DSCore.IO.Image.ReadFromFile(a)", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "9bd339b3572744e1b97dcc50c7843ec6", + "Name": "function", + "Description": "DSCore.IO.Image.WriteToFile(\"Image.png\", c)", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows for DesignScript code to be authored directly", + "Code": "c = Image.ReadFromFile(a);\nImage.WriteToFile(\"Image.png\", c);" + }, + { + "ConcreteType": "CoreNodeModels.Input.Filename, CoreNodeModels", + "Id": "545b092b8b2c4cd4b15e9e4162dd4579", + "NodeType": "ExtensionNode", + "Inputs": [], + "Outputs": [ + { + "Id": "718e6f5204fb4860846c4b444ace9822", + "Name": "", + "Description": "File Path", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows you to select a file on the system and returns its file path", + "HintPath": "C:\\dev\\Dynamo\\test\\core\\WorkflowTestFiles\\File Migration\\File_Migration.txt", + "InputValue": "File_Migration.txt" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", + "Id": "c865c5b38dd84a9b97a5a9aaa87ea0a9", + "NodeType": "CodeBlockNode", + "Inputs": [], + "Outputs": [ + { + "Id": "3da6c2a43b154b6da2a83173c03b0a05", + "Name": "integer", + "Description": "10", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows for DesignScript code to be authored directly", + "Code": "10;" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "3ddc75fbe60749328e08f215ee86211e", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "b4e8aac202f344a69cd9e28a9fc5509b", + "Name": "filePath", + "Description": "string", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "2f0c8366202644dd9eeac2a9ef3edb1f", + "Name": "data", + "Description": "var[][]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "58e9f415db33428fbb437c19d041eaf0", + "Name": "void", + "Description": "void", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSOffice.Data.ExportCSV@string,var[][]", + "Replication": "Auto", + "Description": "Data.ExportCSV (filePath: string, data: var[][]): void" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "ac1e30c227c546ef88c952f0a2c0d1d9", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "49d9ebe6d7d347f0adbf0472c5528c08", + "Name": "filePath", + "Description": "Path to write to\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "bf34a96c6c924769853228168b36942d", + "Name": "text", + "Description": "Text content\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "052151ea6099482789ed3c294db7fc25", + "Name": "void", + "Description": "No output", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.IO.FileSystem.WriteText@string,string", + "Replication": "Auto", + "Description": "Write the text content to a file specified by the path\n\nFileSystem.WriteText (filePath: string, text: string): void" + }, + { + "ConcreteType": "CoreNodeModels.Input.Filename, CoreNodeModels", + "Id": "c20d8f164bf7465f93ca6afd05fe02a2", + "NodeType": "ExtensionNode", + "Inputs": [], + "Outputs": [ + { + "Id": "ffc25e74eb244ffeb70e9bba35594b62", + "Name": "", + "Description": "File Path", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows you to select a file on the system and returns its file path", + "HintPath": "C:\\dev\\Dynamo\\test\\core\\WorkflowTestFiles\\File Migration\\File_Migration.png", + "InputValue": "File_Migration.png" + }, + { + "ConcreteType": "CoreNodeModels.Input.Filename, CoreNodeModels", + "Id": "23f8f80beca74651a0827e2cce93c88d", + "NodeType": "ExtensionNode", + "Inputs": [], + "Outputs": [ + { + "Id": "4a5cba49112943c1a51852cb760c4329", + "Name": "", + "Description": "File Path", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows you to select a file on the system and returns its file path", + "HintPath": "C:\\dev\\Dynamo\\test\\core\\WorkflowTestFiles\\File Migration\\File_Migration_Write.txt", + "InputValue": "File_Migration_Write.txt" + }, + { + "ConcreteType": "CoreNodeModels.Input.Filename, CoreNodeModels", + "Id": "b8f8f48bc5464ae8b7f645e52310e361", + "NodeType": "ExtensionNode", + "Inputs": [], + "Outputs": [ + { + "Id": "df99b9bd727a4387b9b168bf76a3561a", + "Name": "", + "Description": "File Path", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows you to select a file on the system and returns its file path", + "HintPath": "C:\\dev\\Dynamo\\test\\core\\WorkflowTestFiles\\File Migration\\File_Migration.xlsx", + "InputValue": "File_Migration.xlsx" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "6d87386652e846feb58e307858577eed", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "d8438cb051014df99e51ed993ab6294c", + "Name": "file", + "Description": "File object to load image from\n\nvar", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "39b0b9366d154d588292e152b519e44f", + "Name": "image", + "Description": "Image object from file", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.IO.Image.ReadFromFile@var", + "Replication": "Auto", + "Description": "Loads the file as a bitmap.\n\nImage.ReadFromFile (file: var): var" + }, + { + "ConcreteType": "CoreNodeModels.Input.FileObject, CoreNodeModels", + "Id": "36d986a07b7b46b784d9af50b728f2aa", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "3dbde6dc7c3e45cfb865b1de46b45d17", + "Name": "path", + "Description": "Path to the file as string.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "ddded49a51f14844ad10d4876e94a904", + "Name": "file", + "Description": "File object", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Creates a file object from the given path" + }, + { + "ConcreteType": "CoreNodeModels.Input.FileObject, CoreNodeModels", + "Id": "1bee281532b84839a2765f28379026eb", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "02d961911c8047a69ecddef0aa728ad2", + "Name": "path", + "Description": "Path to the file as string.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "17d1d0694b6c41d288ccff99ae96f6f0", + "Name": "file", + "Description": "File object", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Creates a file object from the given path" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "f866a25bdf8f4c11a57a6483d007d432", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "6d226cc4a5ff41d98239f7940a72c4fa", + "Name": "image", + "Description": "Image object to get pixel colors from\n\nvar", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "6d66a62761d7452eb688d86e970298ba", + "Name": "xSamples", + "Description": "Number of sample grid points in the X direction.\n\nint", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "5c184a0d275f4572a1184c5be0c8c9cb", + "Name": "ySamples", + "Description": "Number of sample grid points in the Y direction.\n\nint", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "b4259091352a4af482ca7b1132a8cc5a", + "Name": "colors", + "Description": "Colors at the specified grid points", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.IO.Image.Pixels@var,int,int", + "Replication": "Auto", + "Description": "Reads an image file and returns the color values at the specified grid locations.\n\nImage.Pixels (image: var, xSamples: int, ySamples: int): Color[][]" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "2d8d78913de240d6bd115cd46f983030", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "747d39ff35a448ad80e6ec2c6b863952", + "Name": "file", + "Description": "File object to read text from\n\nvar", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "11fe0e6c3f994d8d87ec21ce1e8c4803", + "Name": "string", + "Description": "Contents of the text file.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.IO.FileSystem.ReadText@var", + "Replication": "Auto", + "Description": "Reads a text file and returns the contents as a string.\n\nFileSystem.ReadText (file: var): string" + } + ], + "Connectors": [ + { + "Start": "718e6f5204fb4860846c4b444ace9822", + "End": "3dbde6dc7c3e45cfb865b1de46b45d17", + "Id": "16ef962caed7496bb64fc079ec863e72", + "IsHidden": "False" + }, + { + "Start": "3da6c2a43b154b6da2a83173c03b0a05", + "End": "6d66a62761d7452eb688d86e970298ba", + "Id": "548477bb2d0244e0853eb2a47344bc74", + "IsHidden": "False" + }, + { + "Start": "3da6c2a43b154b6da2a83173c03b0a05", + "End": "5c184a0d275f4572a1184c5be0c8c9cb", + "Id": "c1387aae186f43c0a298a50a6b043f28", + "IsHidden": "False" + }, + { + "Start": "ffc25e74eb244ffeb70e9bba35594b62", + "End": "02d961911c8047a69ecddef0aa728ad2", + "Id": "1c7834b5508e4863aedd9ad261242067", + "IsHidden": "False" + }, + { + "Start": "4a5cba49112943c1a51852cb760c4329", + "End": "49d9ebe6d7d347f0adbf0472c5528c08", + "Id": "e5b1c7f6e555446c96499b05c2dcc16e", + "IsHidden": "False" + }, + { + "Start": "df99b9bd727a4387b9b168bf76a3561a", + "End": "b4e8aac202f344a69cd9e28a9fc5509b", + "Id": "bd871806b8f8455791886f08547a8da5", + "IsHidden": "False" + }, + { + "Start": "39b0b9366d154d588292e152b519e44f", + "End": "6d226cc4a5ff41d98239f7940a72c4fa", + "Id": "8fbec6b9539e4b30afef4d6f3f7089ec", + "IsHidden": "False" + }, + { + "Start": "ddded49a51f14844ad10d4876e94a904", + "End": "747d39ff35a448ad80e6ec2c6b863952", + "Id": "0db436b64f914720ac141f44fda8b335", + "IsHidden": "False" + }, + { + "Start": "17d1d0694b6c41d288ccff99ae96f6f0", + "End": "d8438cb051014df99e51ed993ab6294c", + "Id": "f695ddb081f341eebc8c0cd39b71c5a9", + "IsHidden": "False" + }, + { + "Start": "17d1d0694b6c41d288ccff99ae96f6f0", + "End": "bb485b43322b4579b96c952531b1bd1b", + "Id": "1050909672b9469eaa2fb862fb787a06", + "IsHidden": "False" + }, + { + "Start": "b4259091352a4af482ca7b1132a8cc5a", + "End": "2f0c8366202644dd9eeac2a9ef3edb1f", + "Id": "74f7d7aed8bb470dbcb61979fd181480", + "IsHidden": "False" + }, + { + "Start": "11fe0e6c3f994d8d87ec21ce1e8c4803", + "End": "bf34a96c6c924769853228168b36942d", + "Id": "aa66caef394449c1a8fcb0314046e191", + "IsHidden": "False" + } + ], + "Dependencies": [], + "NodeLibraryDependencies": [ + { + "Name": "File_Migration.txt", + "ReferenceType": "External", + "Nodes": [ + "545b092b8b2c4cd4b15e9e4162dd4579" + ] + }, + { + "Name": "File_Migration.png", + "ReferenceType": "External", + "Nodes": [ + "c20d8f164bf7465f93ca6afd05fe02a2" + ] + }, + { + "Name": "File_Migration_Write.txt", + "ReferenceType": "External", + "Nodes": [ + "23f8f80beca74651a0827e2cce93c88d" + ] + }, + { + "Name": "File_Migration.xlsx", + "ReferenceType": "External", + "Nodes": [ + "b8f8f48bc5464ae8b7f645e52310e361" + ] + } + ], + "EnableLegacyPolyCurveBehavior": true, + "Thumbnail": "", + "GraphDocumentationURL": null, + "ExtensionWorkspaceData": [ + { + "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670", + "Name": "Properties", + "Version": "4.1", + "Data": {} + } + ], + "Author": "None provided", + "Linting": { + "activeLinter": "None", + "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a", + "warningCount": 0, + "errorCount": 0 + }, + "Bindings": [], + "View": { + "Dynamo": { + "ScaleFactor": 1.0, + "HasRunWithoutCrash": true, + "IsVisibleInDynamoLibrary": true, + "Version": "4.1.0.2940", + "RunType": "Manual", + "RunPeriod": "1000" + }, + "Camera": { + "Name": "_Background Preview", + "EyeX": -17.0, + "EyeY": 24.0, + "EyeZ": 50.0, + "LookX": 12.0, + "LookY": -13.0, + "LookZ": -58.0, + "UpX": 0.0, + "UpY": 1.0, + "UpZ": 0.0 + }, + "ConnectorPins": [], + "NodeViews": [ + { + "Id": "75b9d0a3e95442b58ccf66845b122e3f", + "Name": "Code Block", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 483.3649851632049, + "Y": 267.6824925816024 + }, + { + "Id": "545b092b8b2c4cd4b15e9e4162dd4579", + "Name": "File Path", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 118.0, + "Y": 185.5 + }, + { + "Id": "c865c5b38dd84a9b97a5a9aaa87ea0a9", + "Name": "Code Block", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 171.60830860534134, + "Y": 642.1899109792284 + }, + { + "Id": "3ddc75fbe60749328e08f215ee86211e", + "Name": "Data.ExportCSV", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 805.0, + "Y": 444.5 + }, + { + "Id": "ac1e30c227c546ef88c952f0a2c0d1d9", + "Name": "FileSystem.WriteText", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 995.4154302670622, + "Y": 48.97477744807122 + }, + { + "Id": "c20d8f164bf7465f93ca6afd05fe02a2", + "Name": "File Path", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 91.0, + "Y": 301.5 + }, + { + "Id": "23f8f80beca74651a0827e2cce93c88d", + "Name": "File Path", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 570.5, + "Y": -80.5 + }, + { + "Id": "b8f8f48bc5464ae8b7f645e52310e361", + "Name": "File Path", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 141.5, + "Y": 78.5 + }, + { + "Id": "6d87386652e846feb58e307858577eed", + "Name": "Image.ReadFromFile", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 477.3545994065279, + "Y": 494.4050445103858 + }, + { + "Id": "36d986a07b7b46b784d9af50b728f2aa", + "Name": "File From Path", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 527.3783382789319, + "Y": 127.84569732937695 + }, + { + "Id": "1bee281532b84839a2765f28379026eb", + "Name": "File From Path", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 250.82047477744823, + "Y": 434.07715133531156 + }, + { + "Id": "f866a25bdf8f4c11a57a6483d007d432", + "Name": "Image.Pixels", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 596.2210682492579, + "Y": 663.1572700296737 + }, + { + "Id": "2d8d78913de240d6bd115cd46f983030", + "Name": "FileSystem.ReadText", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 739.8412462908013, + "Y": 110.04154302670611 + } + ], + "Annotations": [], + "X": 16.558749999999918, + "Y": 103.66499999999996, + "Zoom": 0.8425 + } +} \ No newline at end of file diff --git a/test/core/json/JSON_Nodes_Test.dyn b/test/core/json/JSON_Nodes_Test.dyn index a8f326bd450..3e2867ff840 100644 --- a/test/core/json/JSON_Nodes_Test.dyn +++ b/test/core/json/JSON_Nodes_Test.dyn @@ -36,15 +36,14 @@ "Nodes": [ { "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", - "NodeType": "CodeBlockNode", - "Code": "[\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"false\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"[false]\")[0]),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"{\\\"foo\\\": false}\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"\\\"another test\\\"\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"12\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"\\\"2009-02-15T00:00:00Z\\\"\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"1e10\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"{\\\"foo\\\": [1,{},3]}\"))\n];", "Id": "9dca6adcdcf2436a931743a0af5195bc", + "NodeType": "CodeBlockNode", "Inputs": [], "Outputs": [ { "Id": "a007ba6a79be46a1867ea53b5034a123", - "Name": "", - "Description": "Value of expression at line 1", + "Name": "list", + "Description": "[DSCore.Object.Type(DSCore.Data.ParseJSON(\"false\")), DSCore.Object.Type(DesignScript.Builtin.Get.ValueAtIndex(DSCore.Data.ParseJSON(\"[false]\"), 0)), DSCore.Object.Type(DSCore.Data.ParseJSON(\"{\"foo\": false}\")), DSCore.Object.Type(DSCore.Data.ParseJSON(\"\"another test\"\")), DSCore.Object.Type(DSCore.Data.ParseJSON(\"12\")), DSCore.Object.Type(DSCore.Data.ParseJSON(\"\"2009-02-15T00:00:00Z\"\")), DSCore.Object.Type(DSCore.Data.ParseJSON(\"1e10\")), DSCore.Object.Type(DSCore.Data.ParseJSON(\"{\"foo\": [1,{},3...", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -52,19 +51,19 @@ } ], "Replication": "Disabled", - "Description": "Allows for DesignScript code to be authored directly" + "Description": "Allows for DesignScript code to be authored directly", + "Code": "[\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"false\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"[false]\")[0]),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"{\\\"foo\\\": false}\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"\\\"another test\\\"\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"12\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"\\\"2009-02-15T00:00:00Z\\\"\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"1e10\")),\n\tDSCore.Object.Type(DSCore.Data.ParseJSON(\"{\\\"foo\\\": [1,{},3]}\"))\n];" }, { "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", - "NodeType": "CodeBlockNode", - "Code": "[\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON({ \"foo\" : 5 })),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(12)),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON([1,2,3])[0]),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(Color.ByARGB())),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(\"foo\")),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(null)),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(false)),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(DSCore.DateTime.Now))\n];", "Id": "31f973f9076447e1b7707b6b97d8803e", + "NodeType": "CodeBlockNode", "Inputs": [], "Outputs": [ { "Id": "a8d0f07239f64d76a8d58569da303264", - "Name": "", - "Description": "Value of expression at line 1", + "Name": "list", + "Description": "[DSCore.Object.Type(DSCore.Data.StringifyJSON(DesignScript.Builtin.Dictionary.ByKeysValues([\"foo\"], [5]))), DSCore.Object.Type(DSCore.Data.StringifyJSON(12)), DSCore.Object.Type(DesignScript.Builtin.Get.ValueAtIndex(DSCore.Data.StringifyJSON([1, 2, 3]), 0)), DSCore.Object.Type(DSCore.Data.StringifyJSON(DSCore.Color.ByARGB())), DSCore.Object.Type(DSCore.Data.StringifyJSON(\"foo\")), DSCore.Object.Type(DSCore.Data.StringifyJSON(null)), DSCore.Object.Type(DSCore.Data.StringifyJSON(false)), DSCore....", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -72,43 +71,13 @@ } ], "Replication": "Disabled", - "Description": "Allows for DesignScript code to be authored directly" - }, - { - "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DSCore.IO.FileSystem.ReadText@var", - "Id": "25c7e61f2a2a4c3faf50075c0b214d99", - "Inputs": [ - { - "Id": "79dcb87afcca4b3291b48c36af2f368e", - "Name": "file", - "Description": "var", - "UsingDefaultValue": false, - "Level": 2, - "UseLevels": false, - "KeepListStructure": false - } - ], - "Outputs": [ - { - "Id": "ee731216251441549065bc3f00c2d7db", - "Name": "str", - "Description": "Contents of the text file.", - "UsingDefaultValue": false, - "Level": 2, - "UseLevels": false, - "KeepListStructure": false - } - ], - "Replication": "Auto", - "Description": "Reads a text file and returns the contents as a string.\n\nFileSystem.ReadText (file: var): string" + "Description": "Allows for DesignScript code to be authored directly", + "Code": "[\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON({ \"foo\" : 5 })),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(12)),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON([1,2,3])[0]),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(Color.ByARGB())),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(\"foo\")),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(null)),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(false)),\n\tDSCore.Object.Type(DSCore.Data.StringifyJSON(DSCore.DateTime.Now))\n];" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DSCore.Data.ParseJSON@string", "Id": "aa367b7b22c5492ebe309690c8a45960", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "d50dec447a904b7a8e84beb65aa39eb0", @@ -131,20 +100,20 @@ "KeepListStructure": false } ], + "FunctionSignature": "DSCore.Data.ParseJSON@string", "Replication": "Auto", "Description": "Parse converts an arbitrary JSON string to a value. It is the opposite of JSON.Stringify.\n\nData.ParseJSON (json: string): var[]..[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", - "NodeType": "CodeBlockNode", - "Code": "\".\\\\JSONFile.json\";", "Id": "383b2d48b8794dc68f908c99ac9ebe3d", + "NodeType": "CodeBlockNode", "Inputs": [], "Outputs": [ { "Id": "e8bda62e07b84f7d8b6ea2a0dab2a590", - "Name": "", - "Description": "Value of expression at line 1", + "Name": "string", + "Description": "\".\\JSONFile.json\"", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -152,13 +121,13 @@ } ], "Replication": "Disabled", - "Description": "Allows for DesignScript code to be authored directly" + "Description": "Allows for DesignScript code to be authored directly", + "Code": "\".\\\\JSONFile.json\";" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DesignScript.Builtin.Dictionary.Keys", "Id": "ee83c75e9e244c518cf5ba9949ac9bc8", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "3b615796268243939a410ee6dca88b43", @@ -174,27 +143,27 @@ { "Id": "0bb1d001f4ff4bdd8a8fc2100efd9dbd", "Name": "keys", - "Description": "The keys of the Dictionary", + "Description": "Keys of the Dictionary", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DesignScript.Builtin.Dictionary.Keys", "Replication": "Auto", "Description": "Produces the keys in a Dictionary.\n\nDictionary.Keys: string[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", - "NodeType": "CodeBlockNode", - "Code": "{\n\t\"Lisa Rose\": {\n\t\t\"Lady in the Water\": 2.5,\n\t\t\"Snakes on a Plane\": 3.5,\n \t\t\"Just My Luck\": 3.0,\n \t\t\"Superman Returns\": 3.5,\n \t\t\"You, Me and Dupree\": 2.5,\n \t\t\"The Night Listener\": 3.0\n \t},\n\t\"Gene Seymour\": {\n\t\t\"Lady in the Water\": 3.0,\n\t\t\"Snakes on a Plane\": 3.5,\n \t\t\"Just My Luck\": 1.5,\n \t\t\"Superman Returns\": 5.0,\n \t\t\"The Night Listener\": 3.0,\n \t\t\"You, Me and Dupree\": 3.5\n \t},\n\t\"Michael Phillips\": {\n\t\t\"Lady in the Water\": 2.5,\n\t\t\"Snakes on a Plane\": 3.0,\n \t\t\"Superman Returns\": 3.5,\n \t\t\"The Night Listener\": 4.0\n \t},\n\t\"Claudia Puig\": {\n\t\t\"Snakes on a Plane\": 3.5,\n\t\t\"Just My Luck\": 3.0,\n \t\t\"The Night Listener\": 4.5,\n \t\t\"Superman Returns\": 4.0,\n \t\t\"You, Me and Dupree\": 2.5\n \t},\n\t\"Mick LaSalle\": {\n\t\t\"Lady in the Water\": 3.0,\n\t\t\"Snakes on a Plane\": 4.0,\n \t\t\"Just My Luck\": 2.0,\n \t\t\"Superman Returns\": 3.0,\n \t\t\"The Night Listener\": 3.0,\n \t\t\"You, Me and Dupree\": 2.0\n \t},\n\t\"Jack Matthews\": {\n\t\t\"Lady in the Water\": 3.0,\n\t\t\"Snakes on a Plane\": 4.0,\n \t\t\"The Night Listener\": 3.0,\n \t\t\"Superman Returns\": 5.0,\n \t\t\"You, Me and Dupree\": 3.5\n \t},\n\t\"Toby\": {\n\t\t\"Snakes on a Plane\":4.5,\n\t\t\"You, Me and Dupree\":1.0,\n\t\t\"Superman Returns\":4.0\n\t}\n};", "Id": "5e432217ec7f4dd9b2d3051e90b15c4b", + "NodeType": "CodeBlockNode", "Inputs": [], "Outputs": [ { "Id": "bfc9d95d90654ec4a586c80e08ba9c03", - "Name": "", - "Description": "Value of expression at line 1", + "Name": "function", + "Description": "DesignScript.Builtin.Dictionary.ByKeysValues([\"Lisa Rose\", \"Gene Seymour\", \"Michael Phillips\", \"Claudia Puig\", \"Mick LaSalle\", \"Jack Matthews\", \"Toby\"], [DesignScript.Builtin.Dictionary.ByKeysValues([\"Lady in the Water\", \"Snakes on a Plane\", \"Just My Luck\", \"Superman Returns\", \"You, Me and Dupree\", \"The Night Listener\"], [2.5, 3.5, 3, 3.5, 2.5, 3]), DesignScript.Builtin.Dictionary.ByKeysValues([\"Lady in the Water\", \"Snakes on a Plane\", \"Just My Luck\", \"Superman Returns\", \"The Night Listener\",...", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -202,18 +171,18 @@ } ], "Replication": "Disabled", - "Description": "Allows for DesignScript code to be authored directly" + "Description": "Allows for DesignScript code to be authored directly", + "Code": "{\n\t\"Lisa Rose\": {\n\t\t\"Lady in the Water\": 2.5,\n\t\t\"Snakes on a Plane\": 3.5,\n \t\t\"Just My Luck\": 3.0,\n \t\t\"Superman Returns\": 3.5,\n \t\t\"You, Me and Dupree\": 2.5,\n \t\t\"The Night Listener\": 3.0\n \t},\n\t\"Gene Seymour\": {\n\t\t\"Lady in the Water\": 3.0,\n\t\t\"Snakes on a Plane\": 3.5,\n \t\t\"Just My Luck\": 1.5,\n \t\t\"Superman Returns\": 5.0,\n \t\t\"The Night Listener\": 3.0,\n \t\t\"You, Me and Dupree\": 3.5\n \t},\n\t\"Michael Phillips\": {\n\t\t\"Lady in the Water\": 2.5,\n\t\t\"Snakes on a Plane\": 3.0,\n \t\t\"Superman Returns\": 3.5,\n \t\t\"The Night Listener\": 4.0\n \t},\n\t\"Claudia Puig\": {\n\t\t\"Snakes on a Plane\": 3.5,\n\t\t\"Just My Luck\": 3.0,\n \t\t\"The Night Listener\": 4.5,\n \t\t\"Superman Returns\": 4.0,\n \t\t\"You, Me and Dupree\": 2.5\n \t},\n\t\"Mick LaSalle\": {\n\t\t\"Lady in the Water\": 3.0,\n\t\t\"Snakes on a Plane\": 4.0,\n \t\t\"Just My Luck\": 2.0,\n \t\t\"Superman Returns\": 3.0,\n \t\t\"The Night Listener\": 3.0,\n \t\t\"You, Me and Dupree\": 2.0\n \t},\n\t\"Jack Matthews\": {\n\t\t\"Lady in the Water\": 3.0,\n\t\t\"Snakes on a Plane\": 4.0,\n \t\t\"The Night Listener\": 3.0,\n \t\t\"Superman Returns\": 5.0,\n \t\t\"You, Me and Dupree\": 3.5\n \t},\n\t\"Toby\": {\n\t\t\"Snakes on a Plane\":4.5,\n\t\t\"You, Me and Dupree\":1.0,\n\t\t\"Superman Returns\":4.0\n\t}\n};" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "==@var[]..[],var[]..[]", "Id": "f0996771675a44ff9514b60c781dc454", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "580a7d64459c43539d78fece42485a64", "Name": "x", - "Description": "x value.\n\nvar[]..[]", + "Description": "Basic type object to compare (e.g. bool, int, double, string, etc.)\n\nvar[]..[]", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -222,7 +191,7 @@ { "Id": "501390103a734424b563cc4ac53ba8a7", "Name": "y", - "Description": "y value.\n\nvar[]..[]", + "Description": "Basic type object to compare (e.g. bool, int, double, string, etc.)\n\nvar[]..[]", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -232,22 +201,22 @@ "Outputs": [ { "Id": "3771ff4337d4454797ddca60d99526cc", - "Name": "var[]..[]", - "Description": "var[]..[]", + "Name": "bool", + "Description": "Result of equality check", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "==@var[]..[],var[]..[]", "Replication": "Auto", - "Description": "Equal x to y?\n\n== (x: var[]..[], y: var[]..[]): var[]..[]" + "Description": "Compares if x and y are equal\n\n== (x: var[]..[], y: var[]..[]): var[]..[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DesignScript.Builtin.Dictionary.ValueAtKey@string", "Id": "ae6d01ce5bff48afa62a329889e7eab6", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "a778feab2a564314bc08844bdc03d95e", @@ -261,7 +230,7 @@ { "Id": "7f08eee003db4e429cf48dc5589a44ad", "Name": "key", - "Description": "The key in the Dictionary to obtain.\n\nstring", + "Description": "The key in the Dictionary to obtain value for\n\nstring", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -272,21 +241,21 @@ { "Id": "c06c4838d590405ab17ab67d9ee4a88d", "Name": "value", - "Description": "The value at the specified key or null if it is not set.", + "Description": "Value at the specified key or null if it is not set", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DesignScript.Builtin.Dictionary.ValueAtKey@string", "Replication": "Auto", "Description": "Obtain the value at a specified key\n\nDictionary.ValueAtKey (key: string): var[]..[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DesignScript.Builtin.Dictionary.ValueAtKey@string", "Id": "811158cdc6374216b5aa9c57466e6180", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "682745e3bb714fae844321721f7ddabc", @@ -300,7 +269,7 @@ { "Id": "52cd687ec6c44a8c810ad4f6623d878e", "Name": "key", - "Description": "The key in the Dictionary to obtain.\n\nstring", + "Description": "The key in the Dictionary to obtain value for\n\nstring", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -311,21 +280,21 @@ { "Id": "e4d3839ec51c455c8c68a1727ba7a303", "Name": "value", - "Description": "The value at the specified key or null if it is not set.", + "Description": "Value at the specified key or null if it is not set", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DesignScript.Builtin.Dictionary.ValueAtKey@string", "Replication": "Auto", "Description": "Obtain the value at a specified key\n\nDictionary.ValueAtKey (key: string): var[]..[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DesignScript.Builtin.Dictionary.Keys", "Id": "15df70eaad6f4953ba6d4886a09abbd2", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "a25f2ec2dc1d40839a73e2d7bcec64c7", @@ -341,21 +310,21 @@ { "Id": "d924856fa3be434186905b168c39e23d", "Name": "keys", - "Description": "The keys of the Dictionary", + "Description": "Keys of the Dictionary", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DesignScript.Builtin.Dictionary.Keys", "Replication": "Auto", "Description": "Produces the keys in a Dictionary.\n\nDictionary.Keys: string[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DesignScript.Builtin.Dictionary.Values", "Id": "cc352f459dc944ff92d842b06e47a691", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "986a61fbc4a94e17a20114a69c6de74e", @@ -371,21 +340,21 @@ { "Id": "cd9dfb19e9cc436d92b7ea4f610ffb62", "Name": "values", - "Description": "The values of the Dictionary", + "Description": "Values of the dictionary", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DesignScript.Builtin.Dictionary.Values", "Replication": "Auto", "Description": "Produces the values in a Dictionary.\n\nDictionary.Values: var[]..[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DesignScript.Builtin.Dictionary.Values", "Id": "510f8d6b044e49b9b5c87fed028c884d", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "548429d8a0c147b89245219f4bdab0bf", @@ -401,21 +370,21 @@ { "Id": "e8c7672d47e949509bca0876febb4711", "Name": "values", - "Description": "The values of the Dictionary", + "Description": "Values of the dictionary", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DesignScript.Builtin.Dictionary.Values", "Replication": "Auto", "Description": "Produces the values in a Dictionary.\n\nDictionary.Values: var[]..[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DesignScript.Builtin.Dictionary.Keys", "Id": "784b9f3fd5fc4a5db31f491ccddfe16b", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "beae94429ef542fb8f4545a5acc6a213", @@ -431,26 +400,26 @@ { "Id": "8d9f20e936094d0c8ce2df76581511da", "Name": "keys", - "Description": "The keys of the Dictionary", + "Description": "Keys of the Dictionary", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DesignScript.Builtin.Dictionary.Keys", "Replication": "Auto", "Description": "Produces the keys in a Dictionary.\n\nDictionary.Keys: string[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "==@var[]..[],var[]..[]", "Id": "386b516001104b30b85b38b3d22a678e", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "2ff64e0fb4e3410db75f695d15e9de18", "Name": "x", - "Description": "x value.\n\nvar[]..[]", + "Description": "Basic type object to compare (e.g. bool, int, double, string, etc.)\n\nvar[]..[]", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -459,7 +428,7 @@ { "Id": "18e7f779879947859fc938279164e5e7", "Name": "y", - "Description": "y value.\n\nvar[]..[]", + "Description": "Basic type object to compare (e.g. bool, int, double, string, etc.)\n\nvar[]..[]", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, @@ -469,22 +438,22 @@ "Outputs": [ { "Id": "c36e0815a9b44211a06a3966fe665598", - "Name": "var[]..[]", - "Description": "var[]..[]", + "Name": "bool", + "Description": "Result of equality check", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "==@var[]..[],var[]..[]", "Replication": "Auto", - "Description": "Equal x to y?\n\n== (x: var[]..[], y: var[]..[]): var[]..[]" + "Description": "Compares if x and y are equal\n\n== (x: var[]..[], y: var[]..[]): var[]..[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DSCore.List.Flatten@var[]..[],int", "Id": "71fe687ab0e94de7bfa094de3c7aaeb5", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "5480b64a4ba242249888a8a1ea26a1fe", @@ -497,8 +466,8 @@ }, { "Id": "0a9dd7d0b48a48f3ac2a841083a2fe07", - "Name": "amt", - "Description": "Layers of nesting to remove.\n\nint\nDefault value : -1", + "Name": "amount", + "Description": "Layers of list nesting to remove (-1 will remove all list nestings)\n\nint\nDefault value : -1", "UsingDefaultValue": true, "Level": 2, "UseLevels": false, @@ -508,22 +477,22 @@ "Outputs": [ { "Id": "e280e8fee81a40b8ac0de417ef75a963", - "Name": "var[]..[]", - "Description": "var[]..[]", + "Name": "list", + "Description": "Flattened list by amount", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DSCore.List.Flatten@var[]..[],int", "Replication": "Auto", - "Description": "Flattens a nested list of lists by a certain amount.\n\nList.Flatten (list: var[]..[], amt: int = -1): var[]..[]" + "Description": "Flattens a nested list of lists by a certain amount.\n\nList.Flatten (list: var[]..[], amount: int = -1): var[]..[]" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DSCore.List.AllTrue@var[]..[]", "Id": "3464510891444af98b3ede7f8458d805", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "0770854ba1414466b2188f695dee84ff", @@ -539,21 +508,21 @@ { "Id": "a90d8b1fe7d0438ca0c24d6dc28ceeca", "Name": "bool", - "Description": "Whether all items are true.", + "Description": "True if all items from list are true, false if one or more items is not true", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DSCore.List.AllTrue@var[]..[]", "Replication": "Auto", "Description": "Determines if all items in the given list is a boolean and has a true value.\n\nList.AllTrue (list: var[]..[]): bool" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DSCore.List.AllTrue@var[]..[]", "Id": "5b0b1abaee6b420eaa12e54270c00718", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "f1d53a23fce644e4929b611d524dbbc3", @@ -569,21 +538,21 @@ { "Id": "058c126dab6b4f5b86f38f6ce5430f99", "Name": "bool", - "Description": "Whether all items are true.", + "Description": "True if all items from list are true, false if one or more items is not true", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DSCore.List.AllTrue@var[]..[]", "Replication": "Auto", "Description": "Determines if all items in the given list is a boolean and has a true value.\n\nList.AllTrue (list: var[]..[]): bool" }, { "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", - "NodeType": "FunctionNode", - "FunctionSignature": "DSCore.List.Flatten@var[]..[],int", "Id": "9e7eeb2338c84b2c9c9cd1a1e149772b", + "NodeType": "FunctionNode", "Inputs": [ { "Id": "997dc36edd6242bea339946bf966d8dd", @@ -596,8 +565,8 @@ }, { "Id": "266b2493c8a445d9a6e801691d033594", - "Name": "amt", - "Description": "Layers of nesting to remove.\n\nint\nDefault value : -1", + "Name": "amount", + "Description": "Layers of list nesting to remove (-1 will remove all list nestings)\n\nint\nDefault value : -1", "UsingDefaultValue": true, "Level": 2, "UseLevels": false, @@ -607,128 +576,232 @@ "Outputs": [ { "Id": "5825a7cd0fa6491e88f4a2cf9a3fe8b4", - "Name": "var[]..[]", - "Description": "var[]..[]", + "Name": "list", + "Description": "Flattened list by amount", "UsingDefaultValue": false, "Level": 2, "UseLevels": false, "KeepListStructure": false } ], + "FunctionSignature": "DSCore.List.Flatten@var[]..[],int", "Replication": "Auto", - "Description": "Flattens a nested list of lists by a certain amount.\n\nList.Flatten (list: var[]..[], amt: int = -1): var[]..[]" + "Description": "Flattens a nested list of lists by a certain amount.\n\nList.Flatten (list: var[]..[], amount: int = -1): var[]..[]" + }, + { + "ConcreteType": "CoreNodeModels.Input.FileObject, CoreNodeModels", + "Id": "38b2eff9233d46d9b4758c4a176ce823", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "bfb4fb180c9e4f75b95331df72022971", + "Name": "path", + "Description": "Path to the file as string.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "265bbe5257224bf0ad437970e4fc3bb9", + "Name": "file", + "Description": "File object", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Creates a file object from the given path" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "a27989358e4c4c1b82f7b0faeb7fe609", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "f845bc4d6af14e8b8adcfd578f900f85", + "Name": "file", + "Description": "File object to read text from\n\nvar", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "235b17f86871400cbf02a03420f5e461", + "Name": "string", + "Description": "Contents of the text file.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.IO.FileSystem.ReadText@var", + "Replication": "Auto", + "Description": "Reads a text file and returns the contents as a string.\n\nFileSystem.ReadText (file: var): string" } ], "Connectors": [ - { - "Start": "ee731216251441549065bc3f00c2d7db", - "End": "d50dec447a904b7a8e84beb65aa39eb0", - "Id": "b7e27aa7bad14f0a8c6aeb50e08a12a5" - }, { "Start": "1cf7f91f6e784fd4bfe2d552d42d1fbe", "End": "3b615796268243939a410ee6dca88b43", - "Id": "87046c304787435fa4e7d9efef95ae00" + "Id": "87046c304787435fa4e7d9efef95ae00", + "IsHidden": "False" }, { "Start": "1cf7f91f6e784fd4bfe2d552d42d1fbe", "End": "682745e3bb714fae844321721f7ddabc", - "Id": "5fc8c994616444edac58b4a4e3ded9ca" + "Id": "5fc8c994616444edac58b4a4e3ded9ca", + "IsHidden": "False" }, { "Start": "e8bda62e07b84f7d8b6ea2a0dab2a590", - "End": "79dcb87afcca4b3291b48c36af2f368e", - "Id": "d6daa17e9be64d5da9b58abd063b2ef4" + "End": "bfb4fb180c9e4f75b95331df72022971", + "Id": "aa1d1b5c09104eb4a37c0448f9f08665", + "IsHidden": "False" }, { "Start": "0bb1d001f4ff4bdd8a8fc2100efd9dbd", "End": "7f08eee003db4e429cf48dc5589a44ad", - "Id": "58339ad3ed684833aff7a5646b01f8d3" + "Id": "58339ad3ed684833aff7a5646b01f8d3", + "IsHidden": "False" }, { "Start": "0bb1d001f4ff4bdd8a8fc2100efd9dbd", "End": "52cd687ec6c44a8c810ad4f6623d878e", - "Id": "44c80ece6fa54bd5853ab9ef8e08e995" + "Id": "44c80ece6fa54bd5853ab9ef8e08e995", + "IsHidden": "False" }, { "Start": "bfc9d95d90654ec4a586c80e08ba9c03", "End": "a778feab2a564314bc08844bdc03d95e", - "Id": "9a41a754c3564bad9b988b7a408ce0fd" + "Id": "9a41a754c3564bad9b988b7a408ce0fd", + "IsHidden": "False" }, { "Start": "3771ff4337d4454797ddca60d99526cc", "End": "997dc36edd6242bea339946bf966d8dd", - "Id": "0bbfc4f6e25147dc96799ef1fc1e1330" + "Id": "0bbfc4f6e25147dc96799ef1fc1e1330", + "IsHidden": "False" }, { "Start": "c06c4838d590405ab17ab67d9ee4a88d", "End": "beae94429ef542fb8f4545a5acc6a213", - "Id": "f3176848026e4d0a84ed7bf7f1c7bd3a" + "Id": "f3176848026e4d0a84ed7bf7f1c7bd3a", + "IsHidden": "False" }, { "Start": "c06c4838d590405ab17ab67d9ee4a88d", "End": "548429d8a0c147b89245219f4bdab0bf", - "Id": "90925e714d964573a885c4f353960244" + "Id": "90925e714d964573a885c4f353960244", + "IsHidden": "False" }, { "Start": "e4d3839ec51c455c8c68a1727ba7a303", "End": "a25f2ec2dc1d40839a73e2d7bcec64c7", - "Id": "787ea63950c64a4d9c51433581be891e" + "Id": "787ea63950c64a4d9c51433581be891e", + "IsHidden": "False" }, { "Start": "e4d3839ec51c455c8c68a1727ba7a303", "End": "986a61fbc4a94e17a20114a69c6de74e", - "Id": "d977ab5eb41f4e1995b89d226d922de0" + "Id": "d977ab5eb41f4e1995b89d226d922de0", + "IsHidden": "False" }, { "Start": "d924856fa3be434186905b168c39e23d", "End": "580a7d64459c43539d78fece42485a64", - "Id": "8f37c460f555489f9741470850a4f8f5" + "Id": "8f37c460f555489f9741470850a4f8f5", + "IsHidden": "False" }, { "Start": "cd9dfb19e9cc436d92b7ea4f610ffb62", "End": "2ff64e0fb4e3410db75f695d15e9de18", - "Id": "c0d71765b81d4407a1d393595e4001d0" + "Id": "c0d71765b81d4407a1d393595e4001d0", + "IsHidden": "False" }, { "Start": "e8c7672d47e949509bca0876febb4711", "End": "18e7f779879947859fc938279164e5e7", - "Id": "8ad424d033fe4ba3abe7647c5bc3402c" + "Id": "8ad424d033fe4ba3abe7647c5bc3402c", + "IsHidden": "False" }, { "Start": "8d9f20e936094d0c8ce2df76581511da", "End": "501390103a734424b563cc4ac53ba8a7", - "Id": "fdbc342e5f924662b205e5b4d752142e" + "Id": "fdbc342e5f924662b205e5b4d752142e", + "IsHidden": "False" }, { "Start": "c36e0815a9b44211a06a3966fe665598", "End": "5480b64a4ba242249888a8a1ea26a1fe", - "Id": "d78239b88c004d3cb7d71916e406d205" + "Id": "d78239b88c004d3cb7d71916e406d205", + "IsHidden": "False" }, { "Start": "e280e8fee81a40b8ac0de417ef75a963", "End": "0770854ba1414466b2188f695dee84ff", - "Id": "16bd76eac3f4433e973d82eef2ec66bf" + "Id": "16bd76eac3f4433e973d82eef2ec66bf", + "IsHidden": "False" }, { "Start": "5825a7cd0fa6491e88f4a2cf9a3fe8b4", "End": "f1d53a23fce644e4929b611d524dbbc3", - "Id": "831bfe68d4614fa8b73140f81e4a87ed" + "Id": "831bfe68d4614fa8b73140f81e4a87ed", + "IsHidden": "False" + }, + { + "Start": "265bbe5257224bf0ad437970e4fc3bb9", + "End": "f845bc4d6af14e8b8adcfd578f900f85", + "Id": "a3d24aab2d5340808b96f19ce1498cfe", + "IsHidden": "False" + }, + { + "Start": "235b17f86871400cbf02a03420f5e461", + "End": "d50dec447a904b7a8e84beb65aa39eb0", + "Id": "215a750ead5c459a86807e2b1697d835", + "IsHidden": "False" } ], "Dependencies": [], + "NodeLibraryDependencies": [], + "EnableLegacyPolyCurveBehavior": true, + "Thumbnail": null, + "GraphDocumentationURL": null, + "ExtensionWorkspaceData": [ + { + "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670", + "Name": "Properties", + "Version": "4.1", + "Data": {} + } + ], + "Author": "None provided", + "Linting": { + "activeLinter": "None", + "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a", + "warningCount": 0, + "errorCount": 0 + }, "Bindings": [], "View": { "Dynamo": { "ScaleFactor": 1.0, "HasRunWithoutCrash": true, "IsVisibleInDynamoLibrary": true, - "Version": "2.1.0.7026", + "Version": "4.1.0.3057", "RunType": "Automatic", "RunPeriod": "1000" }, "Camera": { - "Name": "Background Preview", + "Name": "_Background Preview", "EyeX": -17.0, "EyeY": 24.0, "EyeZ": 50.0, @@ -739,236 +812,276 @@ "UpY": 1.0, "UpZ": 0.0 }, + "ConnectorPins": [], "NodeViews": [ { - "ShowGeometry": true, - "Name": "PARSE_JSON", "Id": "9dca6adcdcf2436a931743a0af5195bc", + "Name": "PARSE_JSON", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 55.2341807391179, "Y": 130.03048296842132 }, { - "ShowGeometry": true, - "Name": "STRINGIFY_JSON", "Id": "31f973f9076447e1b7707b6b97d8803e", + "Name": "STRINGIFY_JSON", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 53.489559029699876, "Y": 478.22668691129803 }, { - "ShowGeometry": true, - "Name": "FileSystem.ReadText", - "Id": "25c7e61f2a2a4c3faf50075c0b214d99", - "IsSetAsInput": false, - "IsSetAsOutput": false, - "Excluded": false, - "X": 937.95630320271778, - "Y": 263.03513373087515 - }, - { - "ShowGeometry": true, - "Name": "Data.ParseJSON", "Id": "aa367b7b22c5492ebe309690c8a45960", + "Name": "Data.ParseJSON", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 1109.9465455331144, - "Y": 262.70882389437918 + "Y": 262.7088238943792 }, { - "ShowGeometry": true, - "Name": "Code Block", "Id": "383b2d48b8794dc68f908c99ac9ebe3d", + "Name": "Code Block", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 735.495343986644, - "Y": 267.33537191864218 + "Y": 267.3353719186422 }, { - "ShowGeometry": true, - "Name": "Dictionary.Keys", "Id": "ee83c75e9e244c518cf5ba9949ac9bc8", + "Name": "Dictionary.Keys", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 1325.3469678698737, - "Y": 258.031920208076 + "Y": 258.0319202080759 }, { - "ShowGeometry": true, - "Name": "Dynamo Dictionary", "Id": "5e432217ec7f4dd9b2d3051e90b15c4b", + "Name": "Dynamo Dictionary", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, - "X": 731.2622937420341, + "ShowGeometry": true, + "X": 731.262293742034, "Y": 363.24987499769327 }, { - "ShowGeometry": true, - "Name": "==", "Id": "f0996771675a44ff9514b60c781dc454", + "Name": "==", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 2135.5100804819076, - "Y": 137.79639184509725 + "Y": 137.79639184509722 }, { - "ShowGeometry": true, - "Name": "Dictionary.ValueAtKey", "Id": "ae6d01ce5bff48afa62a329889e7eab6", + "Name": "Dictionary.ValueAtKey", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 1597.6646099491802, "Y": 300.08592598745474 }, { - "ShowGeometry": true, - "Name": "Dictionary.ValueAtKey", "Id": "811158cdc6374216b5aa9c57466e6180", + "Name": "Dictionary.ValueAtKey", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, - "X": 1599.7404549530061, + "ShowGeometry": true, + "X": 1599.740454953006, "Y": 143.56331847211015 }, { - "ShowGeometry": true, - "Name": "Dictionary.Keys", "Id": "15df70eaad6f4953ba6d4886a09abbd2", + "Name": "Dictionary.Keys", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 1855.1415953563599, - "Y": 97.373300957078015 + "Y": 97.37330095707807 }, { - "ShowGeometry": true, - "Name": "Dictionary.Values", "Id": "cc352f459dc944ff92d842b06e47a691", + "Name": "Dictionary.Values", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, - "X": 1852.7585865109879, - "Y": 182.85606327942892 + "ShowGeometry": true, + "X": 1852.758586510988, + "Y": 182.8560632794289 }, { - "ShowGeometry": true, - "Name": "Dictionary.Values", "Id": "510f8d6b044e49b9b5c87fed028c884d", + "Name": "Dictionary.Values", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, - "X": 1849.4677560510379, - "Y": 351.54424353735931 + "ShowGeometry": true, + "X": 1849.467756051038, + "Y": 351.5442435373593 }, { - "ShowGeometry": true, - "Name": "Dictionary.Keys", "Id": "784b9f3fd5fc4a5db31f491ccddfe16b", + "Name": "Dictionary.Keys", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 1856.6991963835824, - "Y": 264.84937334321478 + "Y": 264.8493733432148 }, { - "ShowGeometry": true, - "Name": "==", "Id": "386b516001104b30b85b38b3d22a678e", + "Name": "==", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 2138.7085986397715, "Y": 265.35905188269794 }, { - "ShowGeometry": true, - "Name": "List.Flatten", "Id": "71fe687ab0e94de7bfa094de3c7aaeb5", + "Name": "List.Flatten", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, - "X": 2323.4834820077831, - "Y": 266.22087133897156 + "ShowGeometry": true, + "X": 2323.483482007783, + "Y": 266.2208713389716 }, { - "ShowGeometry": true, - "Name": "List.AllTrue", "Id": "3464510891444af98b3ede7f8458d805", + "Name": "List.AllTrue", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, - "X": 2561.5346310478508, + "ShowGeometry": true, + "X": 2561.534631047851, "Y": 304.52074076270105 }, { - "ShowGeometry": true, - "Name": "List.AllTrue", "Id": "5b0b1abaee6b420eaa12e54270c00718", + "Name": "List.AllTrue", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 2566.0103286748536, - "Y": 75.739845443382762 + "Y": 75.73984544338276 }, { - "ShowGeometry": true, - "Name": "List.Flatten", "Id": "9e7eeb2338c84b2c9c9cd1a1e149772b", + "Name": "List.Flatten", "IsSetAsInput": false, "IsSetAsOutput": false, "Excluded": false, + "ShowGeometry": true, "X": 2327.7228888068685, - "Y": 137.40030161311194 + "Y": 137.40030161311188 + }, + { + "Id": "38b2eff9233d46d9b4758c4a176ce823", + "Name": "File From Path", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 841.2201612258996, + "Y": 91.13725999360767 + }, + { + "Id": "a27989358e4c4c1b82f7b0faeb7fe609", + "Name": "FileSystem.ReadText", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 1063.195895240425, + "Y": 86.41437203585184 } ], "Annotations": [ { "Id": "fb0e56f017914521b0ac990c45999ebb", "Title": "ParseJSON()\r\n9dca6adc-dcf2-436a-9317-43a0af5195bc", + "DescriptionText": null, + "IsExpanded": true, + "WidthAdjustment": 0.0, + "HeightAdjustment": 0.0, + "UserSetWidth": 0.0, + "UserSetHeight": 0.0, "Nodes": [ "9dca6adcdcf2436a931743a0af5195bc" ], + "HasNestedGroups": false, "Left": 45.2341807391179, - "Top": 33.530482968421325, - "Width": 662.90000000000009, - "Height": 339.0, + "Top": 14.030482968421325, + "Width": 685.0, + "Height": 388.0, "FontSize": 36.0, + "GroupStyleId": "00000000-0000-0000-0000-000000000000", "InitialTop": 130.03048296842132, "InitialHeight": 145.0, - "TextblockHeight": 86.5, + "TextblockHeight": 106.0, + "IsOptionalInPortsCollapsed": false, + "IsUnconnectedOutPortsCollapsed": false, + "HasToggledOptionalInPorts": false, + "HasToggledUnconnectedOutPorts": false, "Background": "#FFC1D676" }, { "Id": "4f422d1045f8437ca3b42ecc87029398", "Title": "StringifyJSON()\r\n31f973f9-0764-47e1-b770-7b6b97d8803e", + "DescriptionText": null, + "IsExpanded": true, + "WidthAdjustment": 0.0, + "HeightAdjustment": 0.0, + "UserSetWidth": 0.0, + "UserSetHeight": 0.0, "Nodes": [ "31f973f9076447e1b7707b6b97d8803e" ], + "HasNestedGroups": false, "Left": 43.489559029699876, - "Top": 381.72668691129803, - "Width": 678.22333333333336, - "Height": 339.0, + "Top": 318.22668691129803, + "Width": 688.2233333333334, + "Height": 431.99999999999994, "FontSize": 36.0, + "GroupStyleId": "00000000-0000-0000-0000-000000000000", "InitialTop": 478.22668691129803, - "InitialHeight": 145.0, - "TextblockHeight": 86.5, + "InitialHeight": 144.99999999999994, + "TextblockHeight": 150.0, + "IsOptionalInPortsCollapsed": false, + "IsUnconnectedOutPortsCollapsed": false, + "HasToggledOptionalInPorts": false, + "HasToggledUnconnectedOutPorts": false, "Background": "#FFC1D676" }, { "Id": "8ce677344de249e093b938339e16d6cc", "Title": "Compare JSON/Dictionary Key/Values", + "DescriptionText": null, + "IsExpanded": true, + "WidthAdjustment": 0.0, + "HeightAdjustment": 0.0, + "UserSetWidth": 0.0, + "UserSetHeight": 0.0, "Nodes": [ - "25c7e61f2a2a4c3faf50075c0b214d99", "aa367b7b22c5492ebe309690c8a45960", "383b2d48b8794dc68f908c99ac9ebe3d", "ee83c75e9e244c518cf5ba9949ac9bc8", @@ -982,53 +1095,85 @@ "784b9f3fd5fc4a5db31f491ccddfe16b", "386b516001104b30b85b38b3d22a678e", "71fe687ab0e94de7bfa094de3c7aaeb5", - "9e7eeb2338c84b2c9c9cd1a1e149772b" + "9e7eeb2338c84b2c9c9cd1a1e149772b", + "a27989358e4c4c1b82f7b0faeb7fe609", + "38b2eff9233d46d9b4758c4a176ce823" ], - "Left": 721.2622937420341, - "Top": 44.373300957078015, - "Width": 1802.4605950648343, - "Height": 1281.3765740406152, + "HasNestedGroups": false, + "Left": 721.262293742034, + "Top": 13.41437203585184, + "Width": 1811.4605950648345, + "Height": 1291.8355029618415, "FontSize": 36.0, - "InitialTop": 97.373300957078015, - "InitialHeight": 1258.3765740406152, - "TextblockHeight": 43.0, + "GroupStyleId": "00000000-0000-0000-0000-000000000000", + "InitialTop": 86.41437203585184, + "InitialHeight": 410.87657404061525, + "TextblockHeight": 63.0, + "IsOptionalInPortsCollapsed": false, + "IsUnconnectedOutPortsCollapsed": false, + "HasToggledOptionalInPorts": false, + "HasToggledUnconnectedOutPorts": false, "Background": "#FFB5B5B5" }, { "Id": "7a5b7aa2b25246fdad452af61771d38f", "Title": "All Values Match\r\n5b0b1aba-ee6b-420e-aa12-e54270c00718", + "DescriptionText": null, + "IsExpanded": true, + "WidthAdjustment": 0.0, + "HeightAdjustment": 0.0, + "UserSetWidth": 0.0, + "UserSetHeight": 0.0, "Nodes": [ "3464510891444af98b3ede7f8458d805" ], - "Left": 2551.5346310478508, - "Top": 208.02074076270105, - "Width": 686.17000000000007, - "Height": 189.5, + "HasNestedGroups": false, + "Left": 2551.534631047851, + "Top": 144.52074076270105, + "Width": 696.1700000000001, + "Height": 292.0, "FontSize": 36.0, + "GroupStyleId": "00000000-0000-0000-0000-000000000000", "InitialTop": 304.52074076270105, - "InitialHeight": 123.0, - "TextblockHeight": 86.5, + "InitialHeight": 145.0, + "TextblockHeight": 150.0, + "IsOptionalInPortsCollapsed": false, + "IsUnconnectedOutPortsCollapsed": false, + "HasToggledOptionalInPorts": false, + "HasToggledUnconnectedOutPorts": false, "Background": "#FFC1D676" }, { "Id": "eed2e986223a43f2b63d483b04e0a40f", "Title": "All Keys Match\r\n5b0b1aba-ee6b-420e-aa12-e54270c00718", + "DescriptionText": null, + "IsExpanded": true, + "WidthAdjustment": 0.0, + "HeightAdjustment": 0.0, + "UserSetWidth": 0.0, + "UserSetHeight": 0.0, "Nodes": [ "5b0b1abaee6b420eaa12e54270c00718" ], + "HasNestedGroups": false, "Left": 2556.0103286748536, - "Top": -20.760154556617238, - "Width": 686.17000000000007, - "Height": 189.5, + "Top": -84.26015455661724, + "Width": 696.1700000000001, + "Height": 292.0, "FontSize": 36.0, - "InitialTop": 75.739845443382762, - "InitialHeight": 123.0, - "TextblockHeight": 86.5, + "GroupStyleId": "00000000-0000-0000-0000-000000000000", + "InitialTop": 75.73984544338276, + "InitialHeight": 145.0, + "TextblockHeight": 150.0, + "IsOptionalInPortsCollapsed": false, + "IsUnconnectedOutPortsCollapsed": false, + "HasToggledOptionalInPorts": false, + "HasToggledUnconnectedOutPorts": false, "Background": "#FFC1D676" } ], - "X": 95.675757742115252, - "Y": 179.97415057092428, - "Zoom": 0.42560868662467261 + "X": -15.786789243254589, + "Y": 129.20277404354502, + "Zoom": 0.48918232293286545 } } \ No newline at end of file diff --git a/test/core/migration/ReadImageFile_2649.dyn b/test/core/migration/ReadImageFile_2649.dyn deleted file mode 100644 index 340f11e0706..00000000000 --- a/test/core/migration/ReadImageFile_2649.dyn +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - D:\FromF\DynamoProject\Graphs\MigrationDYN\StandAlone\MAGN-2649.png - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/core/migration/TestMigration_Core_Strings.dyn b/test/core/migration/TestMigration_Core_Strings.dyn index 29572c419cc..e11fcf53cf6 100644 --- a/test/core/migration/TestMigration_Core_Strings.dyn +++ b/test/core/migration/TestMigration_Core_Strings.dyn @@ -1,23 +1,493 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +{ + "Uuid": "3c9d0464-8643-5ffe-96e5-ab1769818209", + "IsCustomNode": false, + "Description": "", + "Name": "TestMigration_Core_Strings", + "ElementResolver": { + "ResolutionMap": {} + }, + "Inputs": [], + "Outputs": [], + "Nodes": [ + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSVarArgFunction, DynamoCore", + "FunctionSignature": "DSCore.String.Concat@string[]", + "FunctionType": "VariableArgument", + "Id": "a1060235e86b4a8abc3299317081402e", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "bf9cf4f4651440fd8b16cd68c97f2e8a", + "Name": "string0", + "Description": "List of strings to concatenate.\n\nstring[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "b05f1cd0541d4837bdb38d9b3f15511d", + "Name": "string1", + "Description": "string[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "d22881230daa491390d6bdc421dd8477", + "Name": "string", + "Description": "String made from list of strings.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Concatenates multiple strings into a single string.\n\nString.Concat (strings: string[]): string" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "16abfb1187a84bd0924b40173a197681", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "8cbf707756ff4d50b94c0992dcbf7b6f", + "Name": "list", + "Description": "List to fetch an item from.\n\nvar[]..[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "00407196377749b397545dba53a57ac8", + "Name": "index", + "Description": "Index of the item to be fetched.\n\nint", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "d0f84010b29a4527be5cbd8433ab89d7", + "Name": "item", + "Description": "Item in the list at the given index.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.List.GetItemAtIndex@var[]..[],int", + "Replication": "Disabled", + "Description": "Returns an item from the given list that's located at the specified index.\n\nList.GetItemAtIndex (list: var[]..[], index: int): var[]..[]" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSVarArgFunction, DynamoCore", + "FunctionSignature": "DSCore.String.Join@string,string[]", + "FunctionType": "VariableArgument", + "Id": "61a2c446cbf94c82ac205e3de9be90ac", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "3e003ada7bf340588e0ade293b94a14b", + "Name": "separator", + "Description": "String to be inserted between joined strings.\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "15dce99416f342f3a64d86b150b5e6e5", + "Name": "string0", + "Description": "Strings to be joined into a single string.\n\nstring[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "fe81c3200a004b18b2170c3780aad37f", + "Name": "string", + "Description": "A string made from the list of strings including the separator character.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Concatenates multiple strings into a single string, inserting the given separator between each joined string.\n\nString.Join (separator: string, strings: string[]): string" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.CodeBlockNodeModel, DynamoCore", + "Id": "b228439eff5649e2b583611694ff6f00", + "NodeType": "CodeBlockNode", + "Inputs": [], + "Outputs": [ + { + "Id": "28cd7e06346d4d048ea5d8021e9a94b6", + "Name": "integer", + "Description": "0", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows for DesignScript code to be authored directly", + "Code": "0;" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSVarArgFunction, DynamoCore", + "FunctionSignature": "DSCore.String.Split@string,string[]", + "FunctionType": "VariableArgument", + "Id": "863cd294fd0f49f1be55e20b96101f23", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "3f4dc56ef74e40229b33707a3e1cf1e9", + "Name": "string", + "Description": "String to split up\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "7b10f01af0ba4597852e36edb05db4bc", + "Name": "separator0", + "Description": "Strings that, if present, determine the end and start of a split.\n\nstring[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "7a2c677340564b7fbb502680f8231c12", + "Name": "strings", + "Description": "List of strings made from the input string", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Divides a single string into a list of strings, with divisions determined by the given separator strings.\n\nString.Split (string: string, separators: string[]): string[]" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "32ec6f9221c1406987ec7faa0416c8ba", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "a25783cfd7e143eb98fc3515bab4a5e0", + "Name": "string", + "Description": "String to be made uppercase or lowercase.\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "aa93e4e737574c66948c9a83b214b386", + "Name": "upper", + "Description": "True to convert to uppercase, false to convert to lowercase.\n\nbool", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "f310d2a039d94b4da6755ba6a36af466", + "Name": "string", + "Description": "String with converted case.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.String.ChangeCase@string,bool", + "Replication": "Disabled", + "Description": "Converts the given string to all uppercase characters or all lowercase characters based on a boolean parameter.\n\nString.ChangeCase (string: string, upper: bool): string" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "78394aa8856b4312b24f9ab63c2f1ef0", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "e202fd2eb2354dd182bf2c59483a9161", + "Name": "string", + "Description": "String to find the length of\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "b2d09399885b47dabca856e1ce714e7d", + "Name": "int", + "Description": "Number of characters in the string", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.String.Length@string", + "Replication": "Disabled", + "Description": "Returns the number of characters contained in the given string.\n\nString.Length (string: string): int" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "2248539492744999bf8f1e6c8ffb6fbf", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "5db81d04a5ee400b9e6f297fc25b636c", + "Name": "string", + "Description": "String to be converted\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "cc2dca5a820643c8830529486d799015", + "Name": "number", + "Description": "Integer or double-type number", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.String.ToNumber@string", + "Replication": "Longest", + "Description": "Converts a string to an integer or a double.\n\nString.ToNumber (string: string): var[]..[]" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "4fc6fbbc8c9e4422908c322616776310", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "a755567021894fb78f3482ff2f15268b", + "Name": "string", + "Description": "String to take substring of\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "45e92695b45241f981518a46bd51bbad", + "Name": "startIndex", + "Description": "Starting character position of the substring in the original string\n\nint", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "e2b4b764d7ca46d8bba947e3ac6777db", + "Name": "length", + "Description": "Number of characters in the substring\n\nint", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "7780ae566a754c5383c8494a77d9a350", + "Name": "string", + "Description": "Substring made from the original string", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.String.Substring@string,int,int", + "Replication": "Disabled", + "Description": "Retrieves a substring from the given string. The substring starts at the given character position and has the given length.\n\nString.Substring (string: string, startIndex: int, length: int): string" + } + ], + "Connectors": [ + { + "Start": "fe81c3200a004b18b2170c3780aad37f", + "End": "8cbf707756ff4d50b94c0992dcbf7b6f", + "Id": "5f0d0692895343d7a33a508dc748d959", + "IsHidden": "False" + }, + { + "Start": "28cd7e06346d4d048ea5d8021e9a94b6", + "End": "00407196377749b397545dba53a57ac8", + "Id": "e0a526f1b9d04aee895332276c82a8ad", + "IsHidden": "False" + } + ], + "Dependencies": [], + "NodeLibraryDependencies": [], + "EnableLegacyPolyCurveBehavior": null, + "Thumbnail": null, + "GraphDocumentationURL": null, + "ExtensionWorkspaceData": [ + { + "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670", + "Name": "Properties", + "Version": "4.1", + "Data": {} + } + ], + "Author": "None provided", + "Linting": { + "activeLinter": "None", + "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a", + "warningCount": 0, + "errorCount": 0 + }, + "Bindings": [], + "View": { + "Dynamo": { + "ScaleFactor": 1.0, + "HasRunWithoutCrash": false, + "IsVisibleInDynamoLibrary": true, + "Version": "4.1.0.3107", + "RunType": "Manual", + "RunPeriod": "1000" + }, + "Camera": { + "Name": "_Background Preview", + "EyeX": -17.0, + "EyeY": 24.0, + "EyeZ": 50.0, + "LookX": 12.0, + "LookY": -13.0, + "LookZ": -58.0, + "UpX": 0.0, + "UpY": 1.0, + "UpZ": 0.0 + }, + "ConnectorPins": [], + "NodeViews": [ + { + "Id": "a1060235e86b4a8abc3299317081402e", + "Name": "String.Concat", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": -181.0, + "Y": 205.5 + }, + { + "Id": "16abfb1187a84bd0924b40173a197681", + "Name": "List.GetItemAtIndex", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": -181.0, + "Y": 436.5 + }, + { + "Id": "61a2c446cbf94c82ac205e3de9be90ac", + "Name": "String.Join", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": -331.0, + "Y": 536.5 + }, + { + "Id": "b228439eff5649e2b583611694ff6f00", + "Name": "Code Block", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": -331.0, + "Y": 636.5 + }, + { + "Id": "863cd294fd0f49f1be55e20b96101f23", + "Name": "String.Split", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 234.0, + "Y": 428.5 + }, + { + "Id": "32ec6f9221c1406987ec7faa0416c8ba", + "Name": "String.ChangeCase", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": -181.0, + "Y": -25.5 + }, + { + "Id": "78394aa8856b4312b24f9ab63c2f1ef0", + "Name": "String.Length", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": -181.0, + "Y": 90.0 + }, + { + "Id": "2248539492744999bf8f1e6c8ffb6fbf", + "Name": "String.ToNumber", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": -181.0, + "Y": 321.0 + }, + { + "Id": "4fc6fbbc8c9e4422908c322616776310", + "Name": "String.Substring", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 234.0, + "Y": 127.833333333333 + } + ], + "Annotations": [], + "X": 572.0, + "Y": 213.0, + "Zoom": 1.0 + } +} \ No newline at end of file diff --git a/test/core/migration/TestMigration_InputOutput_File.dyn b/test/core/migration/TestMigration_InputOutput_File.dyn deleted file mode 100644 index 57fe8e9fdb2..00000000000 --- a/test/core/migration/TestMigration_InputOutput_File.dyn +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/core/string/TestObsoleteStringFunctions.dyn b/test/core/string/TestObsoleteStringFunctions.dyn deleted file mode 100644 index fc3a3e6b6ca..00000000000 --- a/test/core/string/TestObsoleteStringFunctions.dyn +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/core/string/TestToString_emptyString.dyn b/test/core/string/TestToString_emptyString.dyn index fed7185dd7f..7ef5bc72885 100644 --- a/test/core/string/TestToString_emptyString.dyn +++ b/test/core/string/TestToString_emptyString.dyn @@ -1,19 +1,198 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file +{ + "Uuid": "3c9d0464-8643-5ffe-96e5-ab1769818209", + "IsCustomNode": false, + "Description": "", + "Name": "TestToString_emptyString", + "ElementResolver": { + "ResolutionMap": {} + }, + "Inputs": [ + { + "Id": "f0e7da03ca534599b3ce509d60db45ae", + "Name": "String", + "Type": "string", + "Type2": "string", + "Value": "", + "Description": "Creates a string." + } + ], + "Outputs": [], + "Nodes": [ + { + "ConcreteType": "CoreNodeModels.Watch, CoreNodeModels", + "WatchWidth": 20.0, + "WatchHeight": 40.0, + "Id": "f72f6210b32f4dc49b2a61f0144a0109", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "ac0099e9a5cb44b5a6cd1d77dbc2ac9c", + "Name": "", + "Description": "Node to show output from", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "97b699a5b77f44ad925567fead6ffd4a", + "Name": "", + "Description": "Node output", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Visualizes a node's output" + }, + { + "ConcreteType": "CoreNodeModels.Input.StringInput, CoreNodeModels", + "SerializedWidth": 0.0, + "SerializedHeight": 0.0, + "Id": "f0e7da03ca534599b3ce509d60db45ae", + "NodeType": "StringInputNode", + "Inputs": [], + "Outputs": [ + { + "Id": "a2d8a40e595046a1b26d6a578a6e3dae", + "Name": "", + "Description": "String", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Creates a string.", + "InputValue": "" + }, + { + "ConcreteType": "CoreNodeModels.FromObject, CoreNodeModels", + "Id": "6220cd5de70146e7a45f3c7104eb417c", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "cbbf2a8b096f49f598e105acdeb0a9e9", + "Name": "object", + "Description": "Object to be serialized", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "37f5e6328c0a46d49481ffc78a6dd06c", + "Name": "string", + "Description": "String representation of the object", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Converts an object to a string representation" + } + ], + "Connectors": [ + { + "Start": "a2d8a40e595046a1b26d6a578a6e3dae", + "End": "cbbf2a8b096f49f598e105acdeb0a9e9", + "Id": "f490315d896d481197cb8995989bd2ad", + "IsHidden": "False" + }, + { + "Start": "37f5e6328c0a46d49481ffc78a6dd06c", + "End": "ac0099e9a5cb44b5a6cd1d77dbc2ac9c", + "Id": "952d5850753f44d0bbd4e25d6a7c4c96", + "IsHidden": "False" + } + ], + "Dependencies": [], + "NodeLibraryDependencies": [], + "EnableLegacyPolyCurveBehavior": null, + "Thumbnail": null, + "GraphDocumentationURL": null, + "ExtensionWorkspaceData": [ + { + "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670", + "Name": "Properties", + "Version": "4.0", + "Data": {} + } + ], + "Author": "None provided", + "Linting": { + "activeLinter": "None", + "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a", + "warningCount": 0, + "errorCount": 0 + }, + "Bindings": [], + "View": { + "Dynamo": { + "ScaleFactor": 1.0, + "HasRunWithoutCrash": true, + "IsVisibleInDynamoLibrary": true, + "Version": "4.0.0.2016", + "RunType": "Manual", + "RunPeriod": "1000" + }, + "Camera": { + "Name": "_Background Preview", + "EyeX": 958.3822021484375, + "EyeY": 974.3681640625, + "EyeZ": -152.89370727539062, + "LookX": -1360.763671875, + "LookY": -727.09033203125, + "LookZ": -281.5401306152344, + "UpX": 0.6294578313827515, + "UpY": -0.7660432457923889, + "UpZ": 0.13023266196250916 + }, + "ConnectorPins": [], + "NodeViews": [ + { + "Id": "f72f6210b32f4dc49b2a61f0144a0109", + "Name": "Watch", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 678.0, + "Y": 262.02 + }, + { + "Id": "f0e7da03ca534599b3ce509d60db45ae", + "Name": "String", + "IsSetAsInput": true, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 193.0, + "Y": 269.02 + }, + { + "Id": "6220cd5de70146e7a45f3c7104eb417c", + "Name": "String from Object", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 410.5, + "Y": 433.0 + } + ], + "Annotations": [], + "X": 0.0, + "Y": 0.0, + "Zoom": 1.0 + } +} \ No newline at end of file diff --git a/test/core/string/TestToString_fromFile.dyn b/test/core/string/TestToString_fromFile.dyn index c5d5edb731c..504e69dffde 100644 --- a/test/core/string/TestToString_fromFile.dyn +++ b/test/core/string/TestToString_fromFile.dyn @@ -1,19 +1,296 @@ - - - - - - - ..\..\..\test\core\string\TestToString_fromFile.txt - - - - - - - - - - - - \ No newline at end of file +{ + "Uuid": "3c9d0464-8643-5ffe-96e5-ab1769818209", + "IsCustomNode": false, + "Description": "", + "Name": "TestToString_fromFile", + "ElementResolver": { + "ResolutionMap": {} + }, + "Inputs": [ + { + "Id": "5ccbc3c1fdb1485b8d524ad11871ef5b", + "Name": "File Path", + "Type": "string", + "Type2": "string", + "Value": "..\\..\\..\\test\\core\\string\\TestToString_fromFile.txt", + "Description": "Allows you to select a file on the system and returns its file path" + } + ], + "Outputs": [], + "Nodes": [ + { + "ConcreteType": "CoreNodeModels.Watch, CoreNodeModels", + "WatchWidth": 148.0, + "WatchHeight": 40.0, + "Id": "f72f6210b32f4dc49b2a61f0144a0109", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "a8370d9ba43846d18520dd7cce825326", + "Name": "", + "Description": "Node to show output from", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "778bcfa7dc824b54838680dcee2536bb", + "Name": "", + "Description": "Node output", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Visualizes a node's output" + }, + { + "ConcreteType": "CoreNodeModels.Input.Filename, CoreNodeModels", + "Id": "5ccbc3c1fdb1485b8d524ad11871ef5b", + "NodeType": "ExtensionNode", + "Inputs": [], + "Outputs": [ + { + "Id": "bd62edd41b5347cc806d422adf3373a8", + "Name": "", + "Description": "File Path", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Allows you to select a file on the system and returns its file path", + "HintPath": "C:\\dev\\Dynamo\\test\\core\\string\\TestToString_fromFile.txt", + "InputValue": "..\\..\\..\\test\\core\\string\\TestToString_fromFile.txt" + }, + { + "ConcreteType": "CoreNodeModels.FromObject, CoreNodeModels", + "Id": "f66bc1d556c54b3587b118d36f689f22", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "84593e9567254e5987dc42509b651333", + "Name": "object", + "Description": "Object to be serialized", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "f78569410ae94ad189157fc0fe1131f1", + "Name": "string", + "Description": "String representation of the object", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Converts an object to a string representation" + }, + { + "ConcreteType": "CoreNodeModels.Input.FileObject, CoreNodeModels", + "Id": "f580e6e470a442fc8a19838f40cd17f9", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "01f00e17d7d34654b7ecd824814b4666", + "Name": "path", + "Description": "Path to the file as string.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "f399a91ea6ae4893ae20d85a7173638d", + "Name": "file", + "Description": "File object", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Creates a file object from the given path" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSFunction, DynamoCore", + "Id": "16e2dcad56504ca2871e36f4611d6b96", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "d7a271b536994142ae896ec93c3bb7dc", + "Name": "file", + "Description": "File object to read text from\n\nvar", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "e1e367a611cc461a8af97ba102d71b86", + "Name": "string", + "Description": "Contents of the text file.", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "FunctionSignature": "DSCore.IO.FileSystem.ReadText@var", + "Replication": "Auto", + "Description": "Reads a text file and returns the contents as a string.\n\nFileSystem.ReadText (file: var): string" + } + ], + "Connectors": [ + { + "Start": "bd62edd41b5347cc806d422adf3373a8", + "End": "01f00e17d7d34654b7ecd824814b4666", + "Id": "307a2cc88619403cabb7d40ce07f4845", + "IsHidden": "False" + }, + { + "Start": "f78569410ae94ad189157fc0fe1131f1", + "End": "a8370d9ba43846d18520dd7cce825326", + "Id": "88cdbb805af2462e876443e3f5cc0741", + "IsHidden": "False" + }, + { + "Start": "f399a91ea6ae4893ae20d85a7173638d", + "End": "d7a271b536994142ae896ec93c3bb7dc", + "Id": "55694740c93b40c3a1356530847402b8", + "IsHidden": "False" + }, + { + "Start": "e1e367a611cc461a8af97ba102d71b86", + "End": "84593e9567254e5987dc42509b651333", + "Id": "46d66a904b2947e7af8ee6db446808a7", + "IsHidden": "False" + } + ], + "Dependencies": [], + "NodeLibraryDependencies": [ + { + "Name": "TestToString_fromFile.txt", + "ReferenceType": "External", + "Nodes": [ + "5ccbc3c1fdb1485b8d524ad11871ef5b" + ] + } + ], + "EnableLegacyPolyCurveBehavior": null, + "Thumbnail": null, + "GraphDocumentationURL": null, + "ExtensionWorkspaceData": [ + { + "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670", + "Name": "Properties", + "Version": "4.0", + "Data": {} + } + ], + "Author": "None provided", + "Linting": { + "activeLinter": "None", + "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a", + "warningCount": 0, + "errorCount": 0 + }, + "Bindings": [], + "View": { + "Dynamo": { + "ScaleFactor": 1.0, + "HasRunWithoutCrash": true, + "IsVisibleInDynamoLibrary": true, + "Version": "4.0.0.2016", + "RunType": "Manual", + "RunPeriod": "1000" + }, + "Camera": { + "Name": "_Background Preview", + "EyeX": 958.3822021484375, + "EyeY": 974.3681640625, + "EyeZ": -152.89370727539062, + "LookX": -1360.763671875, + "LookY": -727.09033203125, + "LookZ": -281.5401306152344, + "UpX": 0.6294578313827515, + "UpY": -0.7660432457923889, + "UpZ": 0.13023266196250916 + }, + "ConnectorPins": [], + "NodeViews": [ + { + "Id": "f72f6210b32f4dc49b2a61f0144a0109", + "Name": "Watch", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 609.0, + "Y": 310.02 + }, + { + "Id": "5ccbc3c1fdb1485b8d524ad11871ef5b", + "Name": "File Path", + "IsSetAsInput": true, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 0.0, + "Y": 167.02 + }, + { + "Id": "f66bc1d556c54b3587b118d36f689f22", + "Name": "String from Object", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 603.5, + "Y": 493.0 + }, + { + "Id": "f580e6e470a442fc8a19838f40cd17f9", + "Name": "File From Path", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 67.5, + "Y": 461.0 + }, + { + "Id": "16e2dcad56504ca2871e36f4611d6b96", + "Name": "FileSystem.ReadText", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 296.5, + "Y": 468.0 + } + ], + "Annotations": [], + "X": 0.0, + "Y": 0.0, + "Zoom": 1.0 + } +} \ No newline at end of file diff --git a/test/core/string/TestToString_fromFunction.dyn b/test/core/string/TestToString_fromFunction.dyn index 26a55ae60aa..69507924cbb 100644 --- a/test/core/string/TestToString_fromFunction.dyn +++ b/test/core/string/TestToString_fromFunction.dyn @@ -1,25 +1,300 @@ - - - - - - - - 2 - - - - 123 - - - - - - - - - - - - - \ No newline at end of file +{ + "Uuid": "3c9d0464-8643-5ffe-96e5-ab1769818209", + "IsCustomNode": false, + "Description": "", + "Name": "TestToString_fromFunction", + "ElementResolver": { + "ResolutionMap": {} + }, + "Inputs": [ + { + "Id": "08de7e630c634fd687c0b0d4130fbd87", + "Name": "String", + "Type": "string", + "Type2": "string", + "Value": "2", + "Description": "Creates a string." + }, + { + "Id": "e27ed9e356804135b3c53defdf3852e1", + "Name": "String", + "Type": "string", + "Type2": "string", + "Value": "123", + "Description": "Creates a string." + } + ], + "Outputs": [], + "Nodes": [ + { + "ConcreteType": "CoreNodeModels.Watch, CoreNodeModels", + "WatchWidth": 200.0, + "WatchHeight": 200.0, + "Id": "f72f6210b32f4dc49b2a61f0144a0109", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "7cdcec990cc54d448aa8d183d4a90af2", + "Name": "", + "Description": "Node to show output from", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "dacda212c8fd475f835e7a9d6042554c", + "Name": "", + "Description": "Node output", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Visualizes a node's output" + }, + { + "ConcreteType": "Dynamo.Graph.Nodes.ZeroTouch.DSVarArgFunction, DynamoCore", + "FunctionSignature": "DSCore.String.Split@string,string[]", + "FunctionType": "VariableArgument", + "Id": "e9bb7995eba641aa847cf44bfbc1ad05", + "NodeType": "FunctionNode", + "Inputs": [ + { + "Id": "989e3a5592e94330bf1d0add589e98ff", + "Name": "string", + "Description": "String to split up\n\nstring", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + }, + { + "Id": "fe45895366f444ddb243425a062b5ac8", + "Name": "separator0", + "Description": "Strings that, if present, determine the end and start of a split.\n\nstring[]", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "30e0135fecbc43229dd0a66080a4e975", + "Name": "strings", + "Description": "List of strings made from the input string", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Divides a single string into a list of strings, with divisions determined by the given separator strings.\n\nString.Split (string: string, separators: string[]): string[]" + }, + { + "ConcreteType": "CoreNodeModels.Input.StringInput, CoreNodeModels", + "SerializedWidth": 0.0, + "SerializedHeight": 0.0, + "Id": "08de7e630c634fd687c0b0d4130fbd87", + "NodeType": "StringInputNode", + "Inputs": [], + "Outputs": [ + { + "Id": "08c702fb08f0457ab2666bb6832c744d", + "Name": "", + "Description": "String", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Creates a string.", + "InputValue": "2" + }, + { + "ConcreteType": "CoreNodeModels.Input.StringInput, CoreNodeModels", + "SerializedWidth": 0.0, + "SerializedHeight": 0.0, + "Id": "e27ed9e356804135b3c53defdf3852e1", + "NodeType": "StringInputNode", + "Inputs": [], + "Outputs": [ + { + "Id": "3cb916412503432f9f389e2d6d2a83f2", + "Name": "", + "Description": "String", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Creates a string.", + "InputValue": "123" + }, + { + "ConcreteType": "CoreNodeModels.FromObject, CoreNodeModels", + "Id": "b5d6e675abcc42c8aec6872918a95e3a", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "8e1858bf81a44acf97d7eccf6c94e8d3", + "Name": "object", + "Description": "Object to be serialized", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "6dbebe3981c440f88207a14ceff4d9ab", + "Name": "string", + "Description": "String representation of the object", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Converts an object to a string representation" + } + ], + "Connectors": [ + { + "Start": "30e0135fecbc43229dd0a66080a4e975", + "End": "8e1858bf81a44acf97d7eccf6c94e8d3", + "Id": "2854fb4948e447a480972f447a201daf", + "IsHidden": "False" + }, + { + "Start": "08c702fb08f0457ab2666bb6832c744d", + "End": "fe45895366f444ddb243425a062b5ac8", + "Id": "e181d9610bd14482bd2921a554fc3f0a", + "IsHidden": "False" + }, + { + "Start": "3cb916412503432f9f389e2d6d2a83f2", + "End": "989e3a5592e94330bf1d0add589e98ff", + "Id": "b8e20a22e3df4a329cf05b509757acb3", + "IsHidden": "False" + }, + { + "Start": "6dbebe3981c440f88207a14ceff4d9ab", + "End": "7cdcec990cc54d448aa8d183d4a90af2", + "Id": "5801625c615d4132b51c7ea3dc758d57", + "IsHidden": "False" + } + ], + "Dependencies": [], + "NodeLibraryDependencies": [], + "EnableLegacyPolyCurveBehavior": null, + "Thumbnail": null, + "GraphDocumentationURL": null, + "ExtensionWorkspaceData": [ + { + "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670", + "Name": "Properties", + "Version": "4.0", + "Data": {} + } + ], + "Author": "None provided", + "Linting": { + "activeLinter": "None", + "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a", + "warningCount": 0, + "errorCount": 0 + }, + "Bindings": [], + "View": { + "Dynamo": { + "ScaleFactor": 1.0, + "HasRunWithoutCrash": true, + "IsVisibleInDynamoLibrary": true, + "Version": "4.0.0.2016", + "RunType": "Manual", + "RunPeriod": "1000" + }, + "Camera": { + "Name": "_Background Preview", + "EyeX": 958.3822021484375, + "EyeY": 974.3681640625, + "EyeZ": -152.89370727539062, + "LookX": -1360.763671875, + "LookY": -727.09033203125, + "LookZ": -281.5401306152344, + "UpX": 0.6294578313827515, + "UpY": -0.7660432457923889, + "UpZ": 0.13023266196250916 + }, + "ConnectorPins": [], + "NodeViews": [ + { + "Id": "f72f6210b32f4dc49b2a61f0144a0109", + "Name": "Watch", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 678.0, + "Y": 262.02 + }, + { + "Id": "e9bb7995eba641aa847cf44bfbc1ad05", + "Name": "String.Split", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 184.0, + "Y": 251.02 + }, + { + "Id": "08de7e630c634fd687c0b0d4130fbd87", + "Name": "String", + "IsSetAsInput": true, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 65.0, + "Y": 314.02 + }, + { + "Id": "e27ed9e356804135b3c53defdf3852e1", + "Name": "String", + "IsSetAsInput": true, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 84.0, + "Y": 228.02 + }, + { + "Id": "b5d6e675abcc42c8aec6872918a95e3a", + "Name": "String from Object", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 461.5, + "Y": 425.0 + } + ], + "Annotations": [], + "X": 0.0, + "Y": 0.0, + "Zoom": 1.0 + } +} \ No newline at end of file diff --git a/test/core/string/TestToString_normal.dyn b/test/core/string/TestToString_normal.dyn index 35c33514934..3fbd48dc0f8 100644 --- a/test/core/string/TestToString_normal.dyn +++ b/test/core/string/TestToString_normal.dyn @@ -1,17 +1,198 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file +{ + "Uuid": "3c9d0464-8643-5ffe-96e5-ab1769818209", + "IsCustomNode": false, + "Description": "", + "Name": "TestToString_normal", + "ElementResolver": { + "ResolutionMap": {} + }, + "Inputs": [ + { + "Id": "972ba5e89a0b41b9bfe57d0ce8ceaef4", + "Name": "Number", + "Type": "number", + "Type2": "number", + "Value": "123456", + "NumberType": "Double", + "Description": "Creates a number." + } + ], + "Outputs": [], + "Nodes": [ + { + "ConcreteType": "CoreNodeModels.Watch, CoreNodeModels", + "WatchWidth": 65.0, + "WatchHeight": 40.0, + "Id": "f72f6210b32f4dc49b2a61f0144a0109", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "18185af555cf45829ebed56681c80b9f", + "Name": "", + "Description": "Node to show output from", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "d1f0a9b47de14612bbf8981f4635e68a", + "Name": "", + "Description": "Node output", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Visualizes a node's output" + }, + { + "ConcreteType": "CoreNodeModels.Input.DoubleInput, CoreNodeModels", + "NumberType": "Double", + "Id": "972ba5e89a0b41b9bfe57d0ce8ceaef4", + "NodeType": "NumberInputNode", + "Inputs": [], + "Outputs": [ + { + "Id": "7a6e74ee73e14a25adc1f284be44f2f7", + "Name": "", + "Description": "Double", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Creates a number.", + "InputValue": 123456.0 + }, + { + "ConcreteType": "CoreNodeModels.FromObject, CoreNodeModels", + "Id": "86ee7d9335d04e1485d89086aaba029a", + "NodeType": "ExtensionNode", + "Inputs": [ + { + "Id": "bff063dd57c0492fa6d0da3540059619", + "Name": "object", + "Description": "Object to be serialized", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Outputs": [ + { + "Id": "9d61101e7496451280ef90b9607beda0", + "Name": "string", + "Description": "String representation of the object", + "UsingDefaultValue": false, + "Level": 2, + "UseLevels": false, + "KeepListStructure": false + } + ], + "Replication": "Disabled", + "Description": "Converts an object to a string representation" + } + ], + "Connectors": [ + { + "Start": "7a6e74ee73e14a25adc1f284be44f2f7", + "End": "bff063dd57c0492fa6d0da3540059619", + "Id": "b01308e5a61d45dcb10ab55f5eaeb3bd", + "IsHidden": "False" + }, + { + "Start": "9d61101e7496451280ef90b9607beda0", + "End": "18185af555cf45829ebed56681c80b9f", + "Id": "b2859331730446268a1076ce371603ca", + "IsHidden": "False" + } + ], + "Dependencies": [], + "NodeLibraryDependencies": [], + "EnableLegacyPolyCurveBehavior": null, + "Thumbnail": null, + "GraphDocumentationURL": null, + "ExtensionWorkspaceData": [ + { + "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670", + "Name": "Properties", + "Version": "4.0", + "Data": {} + } + ], + "Author": "None provided", + "Linting": { + "activeLinter": "None", + "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a", + "warningCount": 0, + "errorCount": 0 + }, + "Bindings": [], + "View": { + "Dynamo": { + "ScaleFactor": 1.0, + "HasRunWithoutCrash": true, + "IsVisibleInDynamoLibrary": true, + "Version": "4.0.0.2016", + "RunType": "Manual", + "RunPeriod": "1000" + }, + "Camera": { + "Name": "_Background Preview", + "EyeX": 958.3822021484375, + "EyeY": 974.3681640625, + "EyeZ": -152.89370727539062, + "LookX": -1360.763671875, + "LookY": -727.09033203125, + "LookZ": -281.5401306152344, + "UpX": 0.6294578313827515, + "UpY": -0.7660432457923889, + "UpZ": 0.13023266196250916 + }, + "ConnectorPins": [], + "NodeViews": [ + { + "Id": "f72f6210b32f4dc49b2a61f0144a0109", + "Name": "Watch", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 609.0, + "Y": 310.02 + }, + { + "Id": "972ba5e89a0b41b9bfe57d0ce8ceaef4", + "Name": "Number", + "IsSetAsInput": true, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 207.0, + "Y": 305.02 + }, + { + "Id": "86ee7d9335d04e1485d89086aaba029a", + "Name": "String from Object", + "IsSetAsInput": false, + "IsSetAsOutput": false, + "Excluded": false, + "ShowGeometry": true, + "X": 389.5, + "Y": 487.0 + } + ], + "Annotations": [], + "X": 0.0, + "Y": 0.0, + "Zoom": 1.0 + } +} \ No newline at end of file