Skip to content

Commit c7b1524

Browse files
sm6srwsm6srw
authored
DYN-6626: Add paneling nodes as an experimental feature (#14920)
* First pass * Update naming * Update LibG 230 to 3.0.0.4074 * One more fix * One more. * One more fix
1 parent f20c50d commit c7b1524

File tree

23 files changed

+87
-28
lines changed

23 files changed

+87
-28
lines changed

‎src/DynamoCore/Configuration/PreferenceSettings.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1148,9 +1148,11 @@ internal void InitializeNamespacesToExcludeFromLibrary()
11481148
{
11491149
if (!NamespacesToExcludeFromLibrarySpecified)
11501150
{
1151-
NamespacesToExcludeFromLibrary.Add(
1152-
"ProtoGeometry.dll:Autodesk.DesignScript.Geometry.TSpline"
1153-
);
1151+
NamespacesToExcludeFromLibrary = new List<string>()
1152+
{
1153+
"ProtoGeometry.dll:Autodesk.DesignScript.Geometry.TSpline",
1154+
"ProtoGeometry.dll:Autodesk.DesignScript.Geometry.Panel"
1155+
};
11541156
NamespacesToExcludeFromLibrarySpecified = true;
11551157
}
11561158
}

‎src/DynamoCore/DynamoCore.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageReference Include="Autodesk.IDSDK" Version="1.1.8" />
3434
<PackageReference Include="Greg" Version="3.0.0.3175" />
3535
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.3331" GeneratePathProperty="true" />
36-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" GeneratePathProperty="true" />
36+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" GeneratePathProperty="true" />
3737
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
3838
<PackageReference Include="RestSharp" Version="108.0.1" CopyXML="true" />
3939
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
@@ -113,15 +113,15 @@
113113

114114
<Target Name="BeforeBuildOps" BeforeTargets="Build">
115115
<PropertyGroup>
116-
<LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\libg_locale</LibGProtoGeometryLibGLocale>
116+
<LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\libg_locale</LibGProtoGeometryLibGLocale>
117117
</PropertyGroup>
118118
<ItemGroup>
119-
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
120-
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
121-
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
119+
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
120+
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
121+
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
122122
<LibG229Deps Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
123123
<LibG230Deps Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
124-
<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
124+
<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
125125
<LibG230 Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_230_0_0\*" />
126126
<LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
127127
<SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />

‎src/DynamoCoreWpf/DynamoCoreWpf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
139139
<PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.24.0" />
140140
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
141-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
141+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
142142
<PackageReference Include="FontAwesome5" Version="2.1.11" />
143143
<PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
144144
<PackageReference Include="Greg" Version="3.0.0.3175" />

‎src/DynamoCoreWpf/Properties/Resources.Designer.cs

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/DynamoCoreWpf/Properties/Resources.en-US.resx

+5-1
Original file line numberDiff line numberDiff line change
@@ -3915,4 +3915,8 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
39153915
<data name="PublishPackageRetainFolderStructureToggleButtonText" xml:space="preserve">
39163916
<value>Retain folder structure</value>
39173917
</data>
3918-
</root>
3918+
<data name="PreferencesViewEnablePanelingNodes" xml:space="preserve">
3919+
<value>Enable Paneling nodes</value>
3920+
<comment>Preferences | Features | Experimental | Enable Paneling nodes</comment>
3921+
</data>
3922+
</root>

‎src/DynamoCoreWpf/Properties/Resources.resx

+5-1
Original file line numberDiff line numberDiff line change
@@ -3902,4 +3902,8 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
39023902
<data name="PublishPackageRetainFolderStructureToggleButtonText" xml:space="preserve">
39033903
<value>Retain folder structure</value>
39043904
</data>
3905-
</root>
3905+
<data name="PreferencesViewEnablePanelingNodes" xml:space="preserve">
3906+
<value>Enable Paneling nodes</value>
3907+
<comment>Preferences | Features | Experimental | Enable Paneling nodes</comment>
3908+
</data>
3909+
</root>

‎src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs

+20
Original file line numberDiff line numberDiff line change
@@ -1222,6 +1222,23 @@ public bool EnableTSplineIsChecked
12221222
}
12231223
}
12241224

1225+
/// <summary>
1226+
/// Controls the IsChecked property in the "Enable Paneling nodes" toogle button
1227+
/// </summary>
1228+
public bool EnablePanelingIsChecked
1229+
{
1230+
get
1231+
{
1232+
return !preferenceSettings.NamespacesToExcludeFromLibrary.Contains(
1233+
"ProtoGeometry.dll:Autodesk.DesignScript.Geometry.Panel");
1234+
}
1235+
set
1236+
{
1237+
HideUnhideNamespace(!value, "ProtoGeometry.dll", "Autodesk.DesignScript.Geometry.Panel");
1238+
RaisePropertyChanged(nameof(EnablePanelingIsChecked));
1239+
}
1240+
}
1241+
12251242
/// <summary>
12261243
/// This method updates the node search library to either hide or unhide nodes that belong
12271244
/// to a specified assembly name and namespace. These nodes will be hidden from the node
@@ -1770,6 +1787,9 @@ private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
17701787
case nameof(EnableTSplineIsChecked):
17711788
description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewEnableTSplineNodes), System.Globalization.CultureInfo.InvariantCulture);
17721789
goto default;
1790+
case nameof(EnablePanelingIsChecked):
1791+
description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewEnablePanelingNodes), System.Globalization.CultureInfo.InvariantCulture);
1792+
goto default;
17731793
case nameof(ShowPreviewBubbles):
17741794
description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewShowPreviewBubbles), System.Globalization.CultureInfo.InvariantCulture);
17751795
goto default;

‎src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml

+20
Original file line numberDiff line numberDiff line change
@@ -1021,6 +1021,7 @@
10211021
<Grid>
10221022
<Grid.RowDefinitions>
10231023
<RowDefinition Height="Auto"/>
1024+
<RowDefinition Height="*"/>
10241025
</Grid.RowDefinitions>
10251026

10261027
<StackPanel Orientation="Horizontal"
@@ -1045,6 +1046,25 @@
10451046
Foreground="{StaticResource PreferencesWindowFontColor}"/>
10461047
</StackPanel>
10471048
</StackPanel>
1049+
<StackPanel Orientation="Horizontal" Margin="0,12,0,0" Grid.Row="1">
1050+
<ToggleButton Name="EnablePanelToggle"
1051+
Width="{StaticResource ToggleButtonWidth}"
1052+
Height="{StaticResource ToggleButtonHeight}"
1053+
VerticalAlignment="Center"
1054+
IsChecked="{Binding Path=EnablePanelingIsChecked}"
1055+
Style="{StaticResource EllipseToggleButton1}"/>
1056+
<StackPanel VerticalAlignment="Center">
1057+
<Label Content="{x:Static p:Resources.PreferencesViewEnablePanelingNodes}"
1058+
Padding="5,5,5,0"
1059+
Margin="10,0,0,0"
1060+
Foreground="{StaticResource PreferencesWindowFontColor}"/>
1061+
<Label Content="{x:Static p:Resources.PreferencesViewRequiresRelaunchOfDynamo}"
1062+
FontSize="10"
1063+
Margin="10,0,0,0"
1064+
Padding="5,0,5,5"
1065+
Foreground="{StaticResource PreferencesWindowFontColor}"/>
1066+
</StackPanel>
1067+
</StackPanel>
10481068
</Grid>
10491069
</Expander>
10501070

‎src/DynamoManipulation/DynamoManipulation.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ProjectReference>
4141
</ItemGroup>
4242
<ItemGroup>
43-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
43+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
4444
</ItemGroup>
4545
<ItemGroup>
4646
<Compile Update="Properties\Resources.Designer.cs">

‎src/Libraries/Analysis/Analysis.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<None Remove="AnalysisImages.resources" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
21+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
2222
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
2323
<Project>{7858fa8c-475f-4b8e-b468-1f8200778cf8}</Project>
2424
<Name>DynamoCore</Name>

‎src/Libraries/CoreNodes/CoreNodes.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Compile Remove="GeometryColor.cs" />
2020
</ItemGroup>
2121
<ItemGroup Label="Common dependencies">
22-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
22+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">

‎src/Libraries/GeometryColor/GeometryColor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
17+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">

‎src/Libraries/GeometryUI/GeometryUI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ReferenceCopyLocalPaths>
1818
</ItemDefinitionGroup>
1919
<ItemGroup>
20-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
20+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
2121
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2222
</ItemGroup>
2323
<ItemGroup>

‎src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ReferenceCopyLocalPaths>
2222
</ItemDefinitionGroup>
2323
<ItemGroup>
24-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
24+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
2525
</ItemGroup>
2626
<ItemGroup>
2727
<Page Include="Controls\ExportWithUnitsControl.xaml">

‎src/Libraries/Tesellation/Tessellation.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
17+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
1818
<PackageReference Include="MIConvexHull" version="1.1.17.411" CopyPDB="true" />
1919
<PackageReference Include="StarMath" version="2.0.17.1019" CopyPDB="true" />
2020
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />

‎src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="CommandLineParser" Version="2.8.0" />
1515
<PackageReference Include="Greg" Version="3.0.0.3175" />
16-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
16+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
1717
<PackageReference Include="Magick.NET.Core" Version="7.0.1" />
1818
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="7.24.1" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

‎test/Libraries/AnalysisTests/AnalysisTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AssemblyName>AnalysisTests</AssemblyName>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
13+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1515
<PackageReference Include="NUnit" Version="3.13.3" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />

‎test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
1919
<PackageReference Include="NUnit" Version="3.13.3" />
2020
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
21-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
21+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
2222
<PackageReference Include="DynamicLanguageRuntime" Version="1.2.2" />
2323
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2424
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />

‎test/Libraries/GeometryColorTests/GeometryColorTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AssemblyName>DisplayTests</AssemblyName>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
13+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1515
<PackageReference Include="NUnit" Version="3.13.3" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />

‎test/Libraries/TestServices/TestServices.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AssemblyName>TestServices</AssemblyName>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
13+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1515
</ItemGroup>
1616
<ItemGroup>

‎test/Libraries/WorkflowTests/WorkflowTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17-
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
17+
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
1818
<PackageReference Include="NUnit" Version="3.13.3" />
1919
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
2020
</ItemGroup>

‎test/System/IntegrationTests/DynamoApplicationTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public class DynamoApplicationTests
1414
public void DynamoSandboxLoadsASMFromValidPath()
1515
{
1616
var versions = new List<Version>(){
17-
new Version(229,0,0),
18-
new Version(228, 6, 0)
17+
new Version(230, 0, 0),
18+
new Version(229,0,0)
1919
};
2020

2121

‎test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public void ProducesCorrectOutputFromCoreDirectory_preloadedbinaries()
164164
FromDirectoryCommand.HandleDocumentationFromDirectory(opts);
165165

166166
var generatedFileNames = tempDirectory.GetFiles().Select(x => x.Name);
167-
Assert.AreEqual(685, generatedFileNames.Count());
167+
Assert.AreEqual(700, generatedFileNames.Count());
168168
}
169169

170170
[Test]

0 commit comments

Comments
 (0)