Merge branch 'testing' of https://github.com/ENGworks-DEV/ENGyn into …

…testing
ENGworks-DEV · Dec 18, 2018 · 2a58447 · 2a58447
2 parents cf4e4fa + b62c151
commit 2a58447
Showing 1 changed file with 7 additions and 20 deletions.
diff --git a/src/ENGyn-Nodes/Selection/GetSelection.cs b/src/ENGyn-Nodes/Selection/GetSelection.cs
@@ -62,31 +62,18 @@ public GetSelectionByGUID(VplControl hostCanvas)
 
         public override void Calculate()
         {
-            if (InputPorts[0].Data != null && InputPorts[0].Data is Document)
-            {
-                Document doc = InputPorts[0].Data as Document;
-                var sel = doc.CurrentSelection.SelectedItems;
-                List<object> modelItems = new List<object>();
-                foreach (var s in sel)
-                {
-                    modelItems.Add(s);
-                }
-                OutputPorts[0].Data = modelItems;
-            }
+
+                OutputPorts[0].Data = MainTools.RunFunction(GetModelItemByGUID, InputPorts);
+
         }
         public object GetModelItemByGUID(object GUID)
         {
-            // create a search class
-            Application.ActiveDocument.CurrentSelection.SelectAll();
-
-
-            var modelItems = Application.ActiveDocument.CurrentSelection.SelectedItems ;
-
+            Search search = new Search();
+            search.Selection.SelectAll();
             SearchCondition searchCondition =  SearchCondition.HasPropertyByName("LcOaNode","LcOaNodeGuid").EqualValue(VariantData.FromDisplayString(GUID.ToString()));
+            search.SearchConditions.Add(searchCondition);
 
-            modelItems.Where(searchCondition);
-
-
+            ModelItemCollection modelItems = search.FindAll(Application.ActiveDocument, false);
             if(modelItems.Count > 0)
             {
                 return modelItems.First;