Annotations are now auto collected correctly and simpler drawings UI. See #1153.

src/blenderbim/test/core/test_drawing.py

@@ -198,3 +198,31 @@ class TestUpdateDrawingName:
         drawing.get_drawing_collection("drawing").should_be_called().will_return("collection")
         drawing.set_drawing_collection_name("group", "collection").should_be_called()
         subject.update_drawing_name(ifc, drawing, drawing="drawing", name="name")
+
+
+class TestAddAnnotation:
+    def test_run(self, ifc, collector, drawing):
+        drawing.show_decorations().should_be_called()
+        drawing.get_drawing_target_view("drawing").should_be_called().will_return("target_view")
+        drawing.get_annotation_context("target_view").should_be_called().will_return("context")
+        drawing.create_annotation_object("object_type").should_be_called().will_return("obj")
+        ifc.get_entity("obj").should_be_called().will_return(None)
+        drawing.get_ifc_representation_class("object_type").should_be_called().will_return("ifc_representation_class")
+        drawing.run_root_assign_class(
+            obj="obj",
+            ifc_class="IfcAnnotation",
+            predefined_type="object_type",
+            should_add_representation=True,
+            context="context",
+            ifc_representation_class="ifc_representation_class",
+        ).should_be_called().will_return("element")
+        drawing.get_drawing_group("drawing").should_be_called().will_return("group")
+        ifc.run("group.assign_group", group="group", product="element").should_be_called()
+        collector.assign("obj").should_be_called()
+        drawing.enable_editing("obj").should_be_called()
+        subject.add_annotation(ifc, collector, drawing, drawing="drawing", object_type="object_type")
+
+    def test_do_not_add_without_an_annotation_context(self, ifc, collector, drawing):
+        drawing.get_drawing_target_view("drawing").should_be_called().will_return("target_view")
+        drawing.get_annotation_context("target_view").should_be_called().will_return(None)
+        subject.add_annotation(ifc, collector, drawing, drawing="drawing", object_type="object_type")

src/blenderbim/test/tool/test_collector.py

@@ -221,6 +221,20 @@ class TestAssign(NewFile):
         element = tool.Ifc.get().createIfcAnnotation(ObjectType="DRAWING")
         tool.Ifc.link(element, element_obj)
         group = ifcopenshell.api.run("group.add_group", tool.Ifc.get())
+        group.ObjectType = "DRAWING"
+        ifcopenshell.api.run("group.assign_group", tool.Ifc.get(), product=element, group=group)
+        subject.assign(element_obj)
+        assert element_obj.users_collection[0].name == "IfcGroup/Unnamed"
+        assert bpy.data.collections.get("Views").children.get("IfcGroup/Unnamed")
+        assert bpy.data.collections.get("IfcProject/My Project").children.get("Views")
+
+    def test_in_decomposition_mode_annotations_are_placed_in_a_group_in_a_views_collection(self):
+        bpy.ops.bim.create_project()
+        element_obj = bpy.data.objects.new("IfcAnnotation/Name", None)
+        element = tool.Ifc.get().createIfcAnnotation()
+        tool.Ifc.link(element, element_obj)
+        group = ifcopenshell.api.run("group.add_group", tool.Ifc.get())
+        group.ObjectType = "DRAWING"
         ifcopenshell.api.run("group.assign_group", tool.Ifc.get(), product=element, group=group)
         subject.assign(element_obj)
         assert element_obj.users_collection[0].name == "IfcGroup/Unnamed"

src/blenderbim/test/tool/test_drawing.py

@@ -32,6 +32,11 @@ class TestImplementsTool(NewFile):
         assert isinstance(subject(), blenderbim.core.tool.Drawing)
 
 
+class TestCreateAnnotationObject(NewFile):
+    def test_nothing(self):
+        pass
+
+
 class TestCreateCamera(NewFile):
     def test_run(self):
         obj = subject.create_camera("Name", mathutils.Matrix())
@@ -105,6 +110,14 @@ class TestDisableEditingTextProduct(NewFile):
         assert obj.BIMTextProperties.is_editing_product == False
 
 
+class TestEnableEditing(NewFile):
+    def test_run(self):
+        obj = bpy.data.objects.new("Object", None)
+        bpy.context.scene.collection.objects.link(obj)
+        subject.enable_editing(obj)
+        assert obj in bpy.context.selected_objects
+
+
 class TestEnableEditingDrawings(NewFile):
     def test_run(self):
         bpy.context.scene.DocProperties.is_editing_drawings = False
@@ -174,6 +187,16 @@ class TestExportTextLiteralAttributes(NewFile):
         }
 
 
+class TestGetAnnotationContext(NewFile):
+    def test_run(self):
+        ifc = ifcopenshell.file()
+        context = ifc.createIfcGeometricRepresentationSubContext(
+            ContextType="Plan", ContextIdentifier="Annotation", TargetView="PLAN_VIEW"
+        )
+        tool.Ifc.set(ifc)
+        assert subject.get_annotation_context("PLAN_VIEW") == context
+
+
 class TestGetBodyContext(NewFile):
     def test_run(self):
         ifc = ifcopenshell.file()
@@ -207,6 +230,16 @@ class TestGetDrawingGroup(NewFile):
         assert subject.get_drawing_group(element) == group
 
 
+class TestGetDrawingTargetView(NewFile):
+    def test_run(self):
+        ifc = ifcopenshell.file()
+        tool.Ifc.set(ifc)
+        element = ifc.createIfcAnnotation()
+        pset = ifcopenshell.api.run("pset.add_pset", ifc, product=element, name="EPset_Drawing")
+        ifcopenshell.api.run("pset.edit_pset", ifc, pset=pset, properties={"TargetView": "PLAN_VIEW"})
+        assert subject.get_drawing_target_view(element) == "PLAN_VIEW"
+
+
 class TestGetGroupElements(NewFile):
     def test_run(self):
         ifc = ifcopenshell.file()
@@ -217,6 +250,13 @@ class TestGetGroupElements(NewFile):
         assert subject.get_group_elements(group) == (element,)
 
 
+class TestGetIfcRepresentationClass(NewFile):
+    def test_run(self):
+        assert subject.get_ifc_representation_class("TEXT") == "IfcTextLiteral"
+        assert subject.get_ifc_representation_class("TEXT_LEADER") == "IfcGeometricCurveSet/IfcTextLiteral"
+        assert subject.get_ifc_representation_class("FOOBAR") == ""
+
+
 class TestGetName(NewFile):
     def test_run(self):
         ifc = ifcopenshell.file()
@@ -451,6 +491,13 @@ class TestSetDrawingCollectionName(NewFile):
         assert collection.name == "IfcGroup/Foobaz"
 
 
+class TestShowDecorations(NewFile):
+    def test_run(self):
+        bpy.context.scene.DocProperties.should_draw_decorations = False
+        subject.show_decorations()
+        assert bpy.context.scene.DocProperties.should_draw_decorations is True
+
+
 class TestUpdateTextValue(NewFile):
     def test_updating_arbitrary_strings(self):
         TestGetTextLiteral().test_run()