From 34a1e137a4b5e72877b73b8982ac90cc5aa9ef7e Mon Sep 17 00:00:00 2001
From: QilongTang <173288704@qq.com>
Date: Wed, 31 Aug 2016 12:04:25 -0400
Subject: [PATCH 1/2] Exclude template views during view3d wrapping
---
.../InternalUtilities/ElementWrapper.cs | 12 +-
.../RevitIntegrationTests/SelectionTests.cs | 11 +-
.../Selection/DynamoAllSelectionNodeTests.dyn | 157 ++++++++++++------
3 files changed, 117 insertions(+), 63 deletions(-)
diff --git a/src/Libraries/RevitNodes/Elements/InternalUtilities/ElementWrapper.cs b/src/Libraries/RevitNodes/Elements/InternalUtilities/ElementWrapper.cs
index b6ed64e1f..b3aa16318 100644
--- a/src/Libraries/RevitNodes/Elements/InternalUtilities/ElementWrapper.cs
+++ b/src/Libraries/RevitNodes/Elements/InternalUtilities/ElementWrapper.cs
@@ -152,14 +152,14 @@ public static WallType Wrap(Autodesk.Revit.DB.WallType ele, bool isRevitOwned)
public static View3D Wrap(Autodesk.Revit.DB.View3D view, bool isRevitOwned)
{
- if (view.IsPerspective)
+ if (!view.IsTemplate)
{
- return PerspectiveView.FromExisting(view, isRevitOwned);
- }
- else
- {
- return AxonometricView.FromExisting(view, isRevitOwned);
+ if (view.IsPerspective)
+ return PerspectiveView.FromExisting(view, isRevitOwned);
+ else
+ return AxonometricView.FromExisting(view, isRevitOwned);
}
+ return null;
}
public static Element Wrap(Autodesk.Revit.DB.ViewPlan view, bool isRevitOwned)
diff --git a/test/Libraries/RevitIntegrationTests/SelectionTests.cs b/test/Libraries/RevitIntegrationTests/SelectionTests.cs
index 92d92f0ff..212a39ccc 100644
--- a/test/Libraries/RevitIntegrationTests/SelectionTests.cs
+++ b/test/Libraries/RevitIntegrationTests/SelectionTests.cs
@@ -424,8 +424,8 @@ public void DynamoAllSelectionNodeTests_WithPreSelectedEntities()
ViewModel.OpenCommand.Execute(testPath);
// check all the nodes and connectors are loaded
- Assert.AreEqual(35, model.CurrentWorkspace.Nodes.Count());
- Assert.AreEqual(18, model.CurrentWorkspace.Connectors.Count());
+ Assert.AreEqual(38, model.CurrentWorkspace.Nodes.Count());
+ Assert.AreEqual(20, model.CurrentWorkspace.Connectors.Count());
AssertNoDummyNodes();
@@ -442,7 +442,7 @@ public void DynamoAllSelectionNodeTests_WithPreSelectedEntities()
var floor = GetPreviewValueAtIndex(allElementAtLevelNodeID, 2) as Revit.Elements.Floor;
Assert.IsNotNull(floor);
- // ElementsOfCategory & Categories, as output of Categories
+ // ElementsOfCategories & Adaptive Points, as output of Categories
// passed to ElementsOFCategory
var elementsOfCategoryNodeID = "24f225e1-8883-48c3-a8ba-773b2734336c";
AssertPreviewCount(elementsOfCategoryNodeID, 22);
@@ -452,6 +452,11 @@ public void DynamoAllSelectionNodeTests_WithPreSelectedEntities()
Assert.IsNotNull(refPt);
}
+ // ElementsOfCategories & Views, as output of Categories
+ // passed to ElementsOFCategory
+ var elementsOfViewNodeID = "2569434a-b34f-4512-a4fe-f065c7a10175";
+ AssertPreviewCount(elementsOfViewNodeID, 33);
+
// ElementsOfFamilyType & Family Type, as FamilyType output passed to
// ElementsOfFamilyTypes node.
var elementsOfFamilyTypeNodeID = "657017f1-4775-4daa-b00e-8d85392be6b5";
diff --git a/test/System/Selection/DynamoAllSelectionNodeTests.dyn b/test/System/Selection/DynamoAllSelectionNodeTests.dyn
index e1bb0e85f..a02a5575e 100644
--- a/test/System/Selection/DynamoAllSelectionNodeTests.dyn
+++ b/test/System/Selection/DynamoAllSelectionNodeTests.dyn
@@ -1,33 +1,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
@@ -37,50 +44,92 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 23499a76caffb4b39309a11277ef8d845c14ac5b Mon Sep 17 00:00:00 2001
From: QilongTang <173288704@qq.com>
Date: Wed, 31 Aug 2016 12:04:39 -0400
Subject: [PATCH 2/2] Test file header
---
test/System/Selection/DynamoAllSelectionNodeTests.dyn | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/System/Selection/DynamoAllSelectionNodeTests.dyn b/test/System/Selection/DynamoAllSelectionNodeTests.dyn
index a02a5575e..1d4e69c50 100644
--- a/test/System/Selection/DynamoAllSelectionNodeTests.dyn
+++ b/test/System/Selection/DynamoAllSelectionNodeTests.dyn
@@ -1,3 +1,4 @@
+