Added Loading of External DLLs for custom nodes

AlexDavies8 · Feb 9, 2022 · c44bf09 · c44bf09
1 parent a8605c2
commit c44bf09
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 30 deletions.
diff --git a/.vs/Dynamo/DesignTimeBuild/.dtbcache.v2 b/.vs/Dynamo/DesignTimeBuild/.dtbcache.v2
diff --git a/Dynamo/App.config b/Dynamo/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<runtime>
+		<loadFromRemoteSources enabled="true"/>
+	</runtime>
+</configuration>
diff --git a/Dynamo/Controls/PropertyEditors/SavePathPropertyEditor.cs b/Dynamo/Controls/PropertyEditors/SavePathPropertyEditor.cs
@@ -19,7 +19,7 @@ public string Value
             DependencyProperty.Register(
                 "Value",
                 typeof(string),
-                typeof(OpenPathPropertyEditor),
+                typeof(SavePathPropertyEditor),
                 new PropertyMetadata(
                     ""),
                 new ValidateValueCallback(IsValid));

diff --git a/Dynamo/MainWindow.xaml.cs b/Dynamo/MainWindow.xaml.cs
@@ -55,6 +55,7 @@ public static bool AutoExecute
         }
 
         private string _projectPath;
+        private List<Assembly> _loadedAssemblies = new List<Assembly>();
 
         public MainWindow()
         {
@@ -112,6 +113,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             };
 
             startupWindow.Show();
+
+            _loadedAssemblies.Add(Assembly.GetExecutingAssembly());
         }
 
         private void BuidFileContextMenu()
@@ -159,6 +162,12 @@ private void BuildEditContextMenu()
             saveItem.Click += (sender, e) => NodeGraphManager.DeselectAllNodes(FlowchartViewModel.Model);
             root.Items.Add(saveItem);
 
+            root.Items.Add(new Separator());
+
+            MenuItem loadAssemblyItem = new MenuItem() { Header = "Load External Nodes" };
+            loadAssemblyItem.Click += (sender, e) => OpenAssembly();
+            root.Items.Add(loadAssemblyItem);
+
             EditMenu.Items.Add(root);
         }
 
@@ -176,42 +185,45 @@ private MenuItem GetAddNodeMenuItem(BuildContextMenuArgs args)
             Flowchart flowchart = args.Model as Flowchart;
 
             MenuItem addNodeItem = new MenuItem() { Header = "Add Node" };
-            Assembly assembly = Assembly.GetExecutingAssembly();
             PathTreeItem root = new PathTreeItem("Add Node", null);
-            foreach (Type type in assembly.GetTypes())
+            foreach (Assembly assembly in _loadedAssemblies)
             {
-                var nodeAttribute = type.GetCustomAttribute<NodeAttribute>();
-                if (nodeAttribute != null)
+                foreach (Type type in assembly.GetTypes())
                 {
-                    PathTreeItem curr = root;
-                    string[] pathArgs = nodeAttribute.Path.Split('/', StringSplitOptions.RemoveEmptyEntries);
-                    for (int i = 0; i < pathArgs.Length - 1; i++)
+                    var nodeAttribute = type.GetCustomAttribute<NodeAttribute>();
+                    if (nodeAttribute != null)
                     {
-                        PathTreeItem branch = new PathTreeItem(pathArgs[i], null);
-                        if (!curr.Children.ContainsKey(pathArgs[i]))
+                        PathTreeItem curr = root;
+                        string[] pathArgs = nodeAttribute.Path.Split('/', StringSplitOptions.RemoveEmptyEntries);
+                        for (int i = 0; i < pathArgs.Length - 1; i++)
                         {
-                            curr.Children.Add(pathArgs[i], branch);
-                            curr = branch;
+                            PathTreeItem branch = new PathTreeItem(pathArgs[i], null);
+                            if (!curr.Children.ContainsKey(pathArgs[i]))
+                            {
+                                curr.Children.Add(pathArgs[i], branch);
+                                curr = branch;
+                            }
+                            else
+                                curr = curr.Children[pathArgs[i]];
                         }
-                        else
-                            curr = curr.Children[pathArgs[i]];
-                    }
-                    curr.Children.Add(
-                        pathArgs[^1],
-                        new PathTreeItem(pathArgs[^1],
-                        () => {
-                            Node node = NodeGraphManager.CreateNode(
-                                pathArgs[^1],
-                                Guid.NewGuid(),
-                                flowchart,
-                                type,
-                                args.ModelSpaceMousePosition.X,
-                                args.ModelSpaceMousePosition.Y
-                                );
-                            if (node is ExecutableNode executableNode)
-                                ExecutionManager.MarkDirty(executableNode);
+                        curr.Children.Add(
+                            pathArgs[^1],
+                            new PathTreeItem(pathArgs[^1],
+                            () =>
+                            {
+                                Node node = NodeGraphManager.CreateNode(
+                                    pathArgs[^1],
+                                    Guid.NewGuid(),
+                                    flowchart,
+                                    type,
+                                    args.ModelSpaceMousePosition.X,
+                                    args.ModelSpaceMousePosition.Y
+                                    );
+                                if (node is ExecutableNode executableNode)
+                                    ExecutionManager.MarkDirty(executableNode);
                             }, nodeAttribute.Order)
-                        );
+                            );
+                    }
                 }
             }
 
@@ -322,6 +334,28 @@ private void OpenFile()
             }
         }
 
+        private void OpenAssembly()
+        {
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Filter = "Class Assembly (*.dll)|*.dll|All files (*.*)|*.*";
+            openFileDialog.RestoreDirectory = true;
+            if (openFileDialog.ShowDialog() == true)
+            {
+                var path = openFileDialog.FileName;
+                if (System.IO.File.Exists(path))
+                {
+                    try
+                    {
+                        _loadedAssemblies.Add(Assembly.LoadFrom(path));
+                    }
+                    catch (Exception ex)
+                    {
+                        // TODO: Error handling
+                    }
+                }
+            }
+        }
+
         private void NewFile()
         {
             bool temp = ExecutionManager.AutoExecute;

diff --git a/Examples/ExternalNodeExample.dll b/Examples/ExternalNodeExample.dll