Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DYN-6626: Add paneling nodes as an experimental feature #14920

Merged
merged 10 commits into from
Feb 15, 2024
Merged

DYN-6626: Add paneling nodes as an experimental feature #14920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
06e9ca3
First pass
sm6srw Feb 1, 2024
d25d48a
Update naming
sm6srw Feb 2, 2024
b9cb0bb
Update LibG 230 to 3.0.0.4074
sm6srw Feb 12, 2024
a7c42e0
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
sm6srw Feb 12, 2024
c161bc4
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
sm6srw Feb 13, 2024
a7727d4
One more fix
sm6srw Feb 13, 2024
21406ce
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
sm6srw Feb 14, 2024
de4638c
One more.
sm6srw Feb 14, 2024
db95572
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
sm6srw Feb 15, 2024
16e02ad
One more fix
sm6srw Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/DynamoCore/Configuration/PreferenceSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,9 +1148,11 @@ internal void InitializeNamespacesToExcludeFromLibrary()
{
if (!NamespacesToExcludeFromLibrarySpecified)
{
NamespacesToExcludeFromLibrary.Add(
"ProtoGeometry.dll:Autodesk.DesignScript.Geometry.TSpline"
);
NamespacesToExcludeFromLibrary = new List<string>()
{
"ProtoGeometry.dll:Autodesk.DesignScript.Geometry.TSpline",
"ProtoGeometry.dll:Autodesk.DesignScript.Geometry.Panel"
};
NamespacesToExcludeFromLibrarySpecified = true;
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/DynamoCore/DynamoCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageReference Include="Autodesk.IDSDK" Version="1.1.8" />
<PackageReference Include="Greg" Version="3.0.0.3175" />
<PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.3331" GeneratePathProperty="true" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" GeneratePathProperty="true" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" GeneratePathProperty="true" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
<PackageReference Include="RestSharp" Version="108.0.1" CopyXML="true" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
Expand Down Expand Up @@ -113,15 +113,15 @@

<Target Name="BeforeBuildOps" BeforeTargets="Build">
<PropertyGroup>
<LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\libg_locale</LibGProtoGeometryLibGLocale>
<LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\libg_locale</LibGProtoGeometryLibGLocale>
</PropertyGroup>
<ItemGroup>
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
<LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG.Interface.dll" />
<LibGProtoGeometryDLL Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.dll" />
<LibGProtoGeometryXML Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\ProtoGeometry.XML" />
<LibG229Deps Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibG230Deps Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\asm_deps.csproj" />
<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
<LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\$(UICulture)\*" />
<LibG230 Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_230_0_0\*" />
<LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
<SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.24.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="FontAwesome5" Version="2.1.11" />
<PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
<PackageReference Include="Greg" Version="3.0.0.3175" />
Expand Down
9 changes: 9 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3915,4 +3915,8 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
<data name="PublishPackageRetainFolderStructureToggleButtonText" xml:space="preserve">
<value>Retain folder structure</value>
</data>
</root>
<data name="PreferencesViewEnablePanelingNodes" xml:space="preserve">
<value>Enable Paneling nodes</value>
<comment>Preferences | Features | Experimental | Enable Paneling nodes</comment>
</data>
</root>
6 changes: 5 additions & 1 deletion src/DynamoCoreWpf/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3902,4 +3902,8 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
<data name="PublishPackageRetainFolderStructureToggleButtonText" xml:space="preserve">
<value>Retain folder structure</value>
</data>
</root>
<data name="PreferencesViewEnablePanelingNodes" xml:space="preserve">
<value>Enable Paneling nodes</value>
<comment>Preferences | Features | Experimental | Enable Paneling nodes</comment>
</data>
</root>
20 changes: 20 additions & 0 deletions src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,23 @@ public bool EnableTSplineIsChecked
}
}

/// <summary>
/// Controls the IsChecked property in the "Enable Paneling nodes" toogle button
/// </summary>
public bool EnablePanelingIsChecked
{
get
{
return !preferenceSettings.NamespacesToExcludeFromLibrary.Contains(
"ProtoGeometry.dll:Autodesk.DesignScript.Geometry.Panel");
aparajit-pratap marked this conversation as resolved.
Show resolved Hide resolved
}
set
{
HideUnhideNamespace(!value, "ProtoGeometry.dll", "Autodesk.DesignScript.Geometry.Panel");
RaisePropertyChanged(nameof(EnablePanelingIsChecked));
}
}

/// <summary>
/// This method updates the node search library to either hide or unhide nodes that belong
/// to a specified assembly name and namespace. These nodes will be hidden from the node
Expand Down Expand Up @@ -1770,6 +1787,9 @@ private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
case nameof(EnableTSplineIsChecked):
description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewEnableTSplineNodes), System.Globalization.CultureInfo.InvariantCulture);
goto default;
case nameof(EnablePanelingIsChecked):
description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewEnablePanelingNodes), System.Globalization.CultureInfo.InvariantCulture);
goto default;
case nameof(ShowPreviewBubbles):
description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewShowPreviewBubbles), System.Globalization.CultureInfo.InvariantCulture);
goto default;
Expand Down
20 changes: 20 additions & 0 deletions src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,7 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>

<StackPanel Orientation="Horizontal"
Expand All @@ -1045,6 +1046,25 @@
Foreground="{StaticResource PreferencesWindowFontColor}"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,12,0,0" Grid.Row="1">
<ToggleButton Name="EnablePanelToggle"
Width="{StaticResource ToggleButtonWidth}"
Height="{StaticResource ToggleButtonHeight}"
VerticalAlignment="Center"
IsChecked="{Binding Path=EnablePanelingIsChecked}"
Style="{StaticResource EllipseToggleButton1}"/>
<StackPanel VerticalAlignment="Center">
<Label Content="{x:Static p:Resources.PreferencesViewEnablePanelingNodes}"
Padding="5,5,5,0"
Margin="10,0,0,0"
Foreground="{StaticResource PreferencesWindowFontColor}"/>
<Label Content="{x:Static p:Resources.PreferencesViewRequiresRelaunchOfDynamo}"
FontSize="10"
Margin="10,0,0,0"
Padding="5,0,5,5"
Foreground="{StaticResource PreferencesWindowFontColor}"/>
</StackPanel>
</StackPanel>
</Grid>
</Expander>

Expand Down
2 changes: 1 addition & 1 deletion src/DynamoManipulation/DynamoManipulation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Analysis/Analysis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<None Remove="AnalysisImages.resources" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
<Project>{7858fa8c-475f-4b8e-b468-1f8200778cf8}</Project>
<Name>DynamoCore</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/CoreNodes/CoreNodes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Compile Remove="GeometryColor.cs" />
</ItemGroup>
<ItemGroup Label="Common dependencies">
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryColor/GeometryColor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryUI/GeometryUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ReferenceCopyLocalPaths>
</ItemDefinitionGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ReferenceCopyLocalPaths>
</ItemDefinitionGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
</ItemGroup>
<ItemGroup>
<Page Include="Controls\ExportWithUnitsControl.xaml">
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Tesellation/Tessellation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="MIConvexHull" version="1.1.17.411" CopyPDB="true" />
<PackageReference Include="StarMath" version="2.0.17.1019" CopyPDB="true" />
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Greg" Version="3.0.0.3175" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="Magick.NET.Core" Version="7.0.1" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="7.24.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/AnalysisTests/AnalysisTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AssemblyName>AnalysisTests</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="DynamicLanguageRuntime" Version="1.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/GeometryColorTests/GeometryColorTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AssemblyName>DisplayTests</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/TestServices/TestServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AssemblyName>TestServices</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Libraries/WorkflowTests/WorkflowTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.3421" />
<PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.4074" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions test/System/IntegrationTests/DynamoApplicationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public class DynamoApplicationTests
public void DynamoSandboxLoadsASMFromValidPath()
{
var versions = new List<Version>(){
new Version(229,0,0),
new Version(228, 6, 0)
new Version(230, 0, 0),
new Version(229,0,0)
};


Expand Down
2 changes: 1 addition & 1 deletion test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void ProducesCorrectOutputFromCoreDirectory_preloadedbinaries()
FromDirectoryCommand.HandleDocumentationFromDirectory(opts);

var generatedFileNames = tempDirectory.GetFiles().Select(x => x.Name);
Assert.AreEqual(685, generatedFileNames.Count());
Assert.AreEqual(700, generatedFileNames.Count());
}

[Test]
Expand Down
Loading