major changes primarily to file creation/saving logic.

Bug fix in create entity.
Other..
this commit is way to big and unstructured.

src/ifcsverchok/nodes/ifc/add_spatial_element.py

@@ -4,10 +4,6 @@ import ifcopenshell
 import ifcsverchok.helper
 from ifcsverchok.ifcstore import SvIfcStore
 
-import bpy
-import json
-import ifcopenshell
-
 from bpy.props import StringProperty
 from sverchok.node_tree import SverchCustomTreeNode
 from sverchok.data_structure import updateNode, flatten_data, repeat_last_for_length, ensure_min_nesting
@@ -16,25 +12,55 @@ from sverchok.data_structure import updateNode, flatten_data, repeat_last_for_le
 class SvIfcAddSpatialElement(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper.SvIfcCore):
     bl_idname = "SvIfcAddSpatialElement"
     bl_label = "IFC Add Spatial Element"
-    node_dict = {}
+    node_dict2 = {}
  
-    n_id: StringProperty()
-    Name: StringProperty(name="Name(s)", update=updateNode)
+    Names: StringProperty(name="Name(s)", update=updateNode)
     IfcClass: StringProperty(name="IFC Class", update=updateNode, default="IfcSpace")
     Elements: StringProperty(name="Elements", update=updateNode)
-    len_elements = 0
 
     def sv_init(self, context):
-        self.inputs.new("SvStringsSocket", "Names").prop_name = "Name"
+        self.inputs.new("SvStringsSocket", "Names").prop_name = "Names"
         self.inputs.new("SvStringsSocket", "IfcClass").prop_name = "IfcClass"
         self.inputs.new("SvStringsSocket", "Elements").prop_name = "Elements"
         self.outputs.new("SvStringsSocket", "Entities")
+        self.node_dict2[hash(self)] = {}
+    
+    def draw_buttons(self, context, layout):
+        layout.operator("node.sv_ifc_tooltip", text="", icon="QUESTION", emboss=False).tooltip = "Ifc entity by type."
 
     def process(self):
         print("#"*20, "\n running add_spatial_element PROCESS()... \n", "#"*20,)
         print("#"*20, "\n hash(self):", hash(self), "\n", "#"*20,)
+        try:
+            print("SvIfcStore.id_map: ", SvIfcStore.id_map)
+            print("self-node_id: ",self.node_id)
+            print("#"*20, "\n node_dict2 before before... \n", self.node_dict2, "\n", "#"*20,)
+        except:
+            pass
+        self.sv_input_names = [i.name for i in self.inputs]
+        if hash(self) not in self.node_dict2:
+            self.node_dict2[hash(self)] = {} #happens if node is already on canvas when blender loads
+        if not self.node_dict2[hash(self)]:
+            self.node_dict2[hash(self)].update(dict.fromkeys(self.sv_input_names, 0))
+
+        print("#"*20, "\n node_dict2 before... \n", self.node_dict2, "\n", "#"*20,)
         if not any(socket.is_linked for socket in self.outputs):
             return
+        edit = False
+        edit_elements = False
+        for i in range(len(self.inputs)):
+            print(f"current node_dict2 iter:{i}: ", self.node_dict2[hash(self)])
+            input = self.inputs[self.sv_input_names[i]].sv_get(deepcopy=True, default =[])
+            print("current input: ", input)
+            print("previous input: ", self.node_dict2[hash(self)][self.inputs[i].name])
+            if isinstance(self.node_dict2[hash(self)][self.inputs[i].name], list) and input != self.node_dict2[hash(self)][self.inputs[i].name]:
+                edit = True
+                print("Edit = True")
+                if self.inputs[i].name == "Elements":
+                    edit_elements = True
+                    print("edit_elements = True")
+            self.node_dict2[hash(self)][self.inputs[i].name] = input.copy()
+        print("#"*20, "\n node_dict2 after... \n", self.node_dict2,"\n", "#"*20,)
 
         self.names = flatten_data(self.inputs["Names"].sv_get(), target_level=1)
         self.ifc_class = flatten_data(self.inputs["IfcClass"].sv_get(), target_level=1)[0]
@@ -47,86 +73,119 @@ class SvIfcAddSpatialElement(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.h
         self.file = SvIfcStore.get_file()
         self.elements = [[self.file.by_id(step_id) for step_id in element] for element in self.elements]
     
-        print("len elements: ", len(self.elements))
+
+        if "len" not in self.node_dict2[hash(self)]:
+            self.node_dict2[hash(self)]["len"] = 0
+        print("len elements: ", len(self.elements), "stored len_elements: ", self.node_dict2[hash(self)]["len"])
         print("elements: ", self.elements)
         self.names = self.repeat_input_unique(self.names, len(self.elements))
         print("Names: ",self.names)
         print("IfcClass: ",self.ifc_class)
-
-        self.sv_input_names = [i.name for i in self.inputs]
-        if hash(self) not in self.node_dict:
-            self.node_dict[hash(self)] = {} #happens if node is already on canvas when blender loads
-        if not self.node_dict[hash(self)]:
-            self.node_dict[hash(self)].update(dict.fromkeys(self.sv_input_names, 0))
-
-        print("node_dict: ", self.node_dict)
-        edit = False
-        for i in range(len(self.inputs)):
-            input = self.inputs[i].sv_get(deepcopy=False)
-            if isinstance(self.node_dict[hash(self)][self.inputs[i].name], list) and input != self.node_dict[hash(self)][self.inputs[i].name]:
-                edit = True
-                print("Edit = True")
-            self.node_dict[hash(self)][self.inputs[i].name] = input
+        print("node_dict2: ", self.node_dict2)
 
 
-        if (self.node_id not in SvIfcStore.id_map) or (len(self.elements) != self.len_elements):
+        if (self.node_id not in SvIfcStore.id_map) or (len(self.elements) != self.node_dict2[hash(self)]["len"]):
             print("\nRunning create")
+            self.remove()
             elements = self.create()
-            self.len_elements = len(self.elements)
+            self.node_dict2[hash(self)]["len"] = len(self.elements)
+            print("stored len_elements: ", self.node_dict2[hash(self)]["len"])
         else:
             if edit is True:
-                elements = self.edit()
+                elements = self.edit(edit_elements)
             else:
+                print("No changes")
                 elements = SvIfcStore.id_map[self.node_id]
-        print("\n ##### results: ", elements)
+        print("\n ##### spatial element results: ", elements)
         self.outputs["Entities"].sv_set(elements)
 
-    def create(self):
-        results = []
-        for i, element in enumerate(self.elements):
-            print("element: ", element)
+    def create(self, index=None):
+        print("#"*20, "\n running add_spatial_element create()... \n", "#"*20,)
+        spatial_ids = []
+        iterator = range(len(self.elements))
+        if index is not None:
+            iterator = [index]
+        for i in iterator:
+            print("element: ", self.elements[i])
             result = ifcopenshell.api.run("root.create_entity", self.file, name=self.names[i], ifc_class=self.ifc_class)
-            for items in element:
+            for items in self.elements[i]:
                 print("items: ", items)
                 if items.is_a("IfcSpatialElement") or items.is_a("IfcSpatialStructureElement"):
                     ifcopenshell.api.run("aggregate.assign_object", self.file, product=items, relating_object=result)
                 else:
                     ifcopenshell.api.run("spatial.assign_container", self.file, product=items, relating_structure=result)
-                SvIfcStore.id_map[result.id()] = self.node_id
-                SvIfcStore.id_map.setdefault(self.node_id, []).append(result.id())
-            results.append(result.id())
-        return results
+                # SvIfcStore.id_map[result.id()] = self.node_id
+            SvIfcStore.id_map.setdefault(self.node_id, []).append(result.id())
+            spatial_ids.append(result.id())
+        return spatial_ids
 
-    def edit(self):
-        results = []
-        results_ids = SvIfcStore.id_map[self.node_id]
+    def edit(self, edit_elements):
+        spatial_ids = []
+        id_map = SvIfcStore.id_map[self.node_id]
+        id_map_copy = SvIfcStore.id_map[self.node_id].copy()
         print("#"*20, "\n running add_spatial_element edit()... \n", "#"*20,)
-        print("#"*20, "\n results_ids:", results_ids, "\n", "#"*20,)
-        for result_id in results_ids:
+        print("#"*20, "\n id_map:", id_map, "\n", "#"*20,)
+        for i, element in enumerate(self.elements):
+            try:
+                result_id = id_map_copy[i]
+            except IndexError:
+                id = self.create(index=i)
+                spatial_ids.append(id[0])
+                continue
             result = self.file.by_id(result_id)
             print("#"*20, "\n result", result, "\n", "#"*20,)
-            subelements = set(ifcopenshell.util.element.get_decomposition(result))
-            for element in self.elements:
-                print("\n\n\n","#"*50)
-                print("\nElement: ", element)
-                element_set = set(element)
-                print("\nRESULT: ", result)
+            result.Name = self.names[i]
+            if edit_elements:
+                subelements = ifcopenshell.util.element.get_decomposition(result)
                 print("subelements: ", subelements)
-                print("elements_set: ", element_set)
-                for removed_element in subelements - element_set:
-                    # Just realised I don't have a spatial.unassign_container, but if so we'd do it here
-                    if removed_element.is_a("IfcSpatialElement") or removed_element.is_a("IfcSpatialStructureElement"):
-                        ifcopenshell.api.run("aggregate.unassign_object", self.file, product=removed_element, relating_object=result)
-                    else:
-                        pass
-                for added_element in element_set - subelements:
-                    if added_element.is_a("IfcSpatialElement") or added_element.is_a("IfcSpatialStructureElement"):
-                        ifcopenshell.api.run("aggregate.assign_object", self.file, product=added_element, relating_object=result)
-                    else:
-                        ifcopenshell.api.run("spatial.assign_container", self.file, product=added_element, relating_structure=result)
-                    print("assigned container")
-            results.append(result.id())
-        return results
+                subelements = set(subelements)
+                print("subelements after: ", subelements)
+                for element in self.elements[i]:
+                    print("\n\n\n","#"*50)
+                    print("\nElement: ", element)
+                    element_set = set([element])
+                    print("\nRESULT: ", result)
+                    print("subelements: ", subelements)
+                    print("elements_set: ", element_set)
+                    for removed_element in subelements - element_set:
+                        # Just realised I don't have a spatial.unassign_container, but if so we'd do it here
+                        print("removed_element: ", removed_element)
+                        if removed_element.is_a("IfcSpatialElement") or removed_element.is_a("IfcSpatialStructureElement"):
+                            ifcopenshell.api.run("aggregate.unassign_object", self.file, product=removed_element, relating_object=result)
+                        else:
+                            # ifcopenshell.api.run("spatial.unassign_container", self.file, product=removed_element, relating_object=result)
+                            self.unassign_container(removed_element)
+                    for added_element in element_set - subelements:
+                        print("added_element: ", added_element)
+                        if added_element.is_a("IfcSpatialElement") or added_element.is_a("IfcSpatialStructureElement"):
+                            ifcopenshell.api.run("aggregate.assign_object", self.file, product=added_element, relating_object=result)
+                        else:
+                            ifcopenshell.api.run("spatial.assign_container", self.file, product=added_element, relating_structure=result)
+                        print("assigned container")
+            spatial_ids.append(result.id())
+        SvIfcStore.id_map[self.node_id] = spatial_ids
+        return spatial_ids
+
+    def unassign_container(self, product):
+        for rel in product.ContainedInStructure or []:
+            related_elements = list(rel.RelatedElements)
+            related_elements.remove(product)
+            if related_elements:
+                rel.RelatedElements = related_elements
+                ifcopenshell.api.run("owner.update_owner_history", self.file, element=rel)
+            else:
+                self.file.remove(rel)
+
+    def remove(self):
+        print("#"*20, "\n running add_spatial_element remove()... \n", "#"*20,)
+        if self.node_id in SvIfcStore.id_map:
+            print(SvIfcStore.id_map[self.node_id])
+            for element_id in SvIfcStore.id_map[self.node_id]:
+                element = self.file.by_id(element_id)
+                print("\nremoving element: ", element)
+                self.file.write("/Users/martina/Documents/GSoC/CodeTests/IfcFileTest_6_11_before_remove.ifc")
+                ifcopenshell.api.run("root.remove_product", self.file, product=element)
+            del SvIfcStore.id_map[self.node_id]
 
     def repeat_input_unique(self, input, count):
         input = repeat_last_for_length(input, count, deepcopy=False)
@@ -134,10 +193,13 @@ class SvIfcAddSpatialElement(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.h
             input = [a if not (s:=sum(j == a for j in input[:i])) else f'{a}-{s+1}' for i, a in enumerate(input)]  # add number to duplicates
         return input
 
-    def get_existing_element(self):
-        entity_id = list(SvIfcStore.id_map.keys())[list(SvIfcStore.id_map.values()).index(self.node_id)]
-        return self.file.by_id(entity_id)
-
+    def sv_free(self):
+        try:
+            del SvIfcStore.id_map[self.node_id]
+            del self.node_dict2[hash(self)]
+            print('Node was deleted')
+        except KeyError or AttributeError:
+            pass
 
 def register():
     bpy.utils.register_class(SvIfcAddSpatialElement)

src/ifcsverchok/nodes/ifc/bmesh_to_ifc.py

@@ -48,7 +48,7 @@ class SvIfcBMeshToIfcRepr(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.help
 
     def refresh_node(self, context):
         if self.refresh_local:
-            self.process()
+            updateNode(self, context)
             self.refresh_local = False
 
     refresh_local: BoolProperty(name="Update Node", description="Update Node", update=refresh_node)
@@ -114,10 +114,10 @@ class SvIfcBMeshToIfcRepr(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.help
             return
         edit = False
         for i in range(len(self.inputs)):
-            input = self.inputs[i].sv_get(deepcopy=False)
+            input = self.inputs[i].sv_get(deepcopy=True)
             if isinstance(self.node_dict[hash(self)][self.inputs[i].name], list) and input != self.node_dict[hash(self)][self.inputs[i].name]:
                 edit = True
-            self.node_dict[hash(self)][self.inputs[i].name] = input
+            self.node_dict[hash(self)][self.inputs[i].name] = input.copy()
         
         blender_objects = self.inputs["blender_objects"].sv_get()
         self.file = SvIfcStore.get_file()

src/ifcsverchok/nodes/ifc/by_type.py

@@ -24,9 +24,10 @@ from bpy.props import StringProperty, EnumProperty
 from ifcsverchok.ifcstore import SvIfcStore
 from sverchok.node_tree import SverchCustomTreeNode
 from sverchok.data_structure import updateNode, flatten_data
-
+from sverchok.utils.handle_blender_data import keep_enum_reference
 
 def get_ifc_products(self, context):
+    print("#"*20, "\n running get_ifc_products PROCESS()... \n", "#"*20,)
     ifc_products = getattr(self, "ifc_products", [])
     file = SvIfcStore.get_file()
     if not file:
@@ -54,11 +55,12 @@ def get_ifc_products(self, context):
 
 
 def update_ifc_products(self, context):
+    print("#"*20, "\n by_type update_ifc_products()... \n", "#"*20,)
     if hasattr(self, "ifc_classes"):
         self.ifc_classes.clear()
 
-
 def get_ifc_classes(self, context):
+    print("#"*20, "\n by_type get_ifc_classes()... \n", "#"*20,)
     ifc_classes = getattr(self, "ifc_classes", [])
     if ifc_classes:
         return self.ifc_classes
@@ -103,27 +105,17 @@ class SvIfcByType(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper.SvIfc
         if self.file:
             self.ifc_products = get_ifc_products(self, bpy.context)
             self.ifc_classes = get_ifc_classes(self, bpy.context)
-        # self.sv_input_names = ["ifc_product", "ifc_class", "custom_ifc_class"]
-        self.ifc_product = flatten_data(self.inputs["ifc_product"].sv_get(), target_level=1)[0]
-        self.ifc_class = flatten_data(self.inputs["ifc_class"].sv_get(), target_level=1)[0]
-        self.custom_ifc_class = flatten_data(self.inputs["custom_ifc_class"].sv_get(), target_level=1)[0]
+        self.sv_input_names = ["ifc_product", "ifc_class", "custom_ifc_class"]
+        super().process()
 
-        # super().process()
-        if self.custom_ifc_class:
-            self.outputs["Entity"].sv_set([self.file.by_type(self.custom_ifc_class)])
-        elif self.ifc_class:
-            self.outputs["Entity"].sv_set([self.file.by_type(self.ifc_class)])
+    def process_ifc(self, ifc_product, ifc_class, custom_ifc_class):
+        if custom_ifc_class:
+            self.outputs["Entity"].sv_set([self.file.by_type(custom_ifc_class)])
+        elif ifc_class:
+            self.outputs["Entity"].sv_set([self.file.by_type(ifc_class)])
         else:
             self.outputs["Entity"].sv_set([])
 
-    # def process_ifc(self, ifc_product, ifc_class, custom_ifc_class):
-    #     if custom_ifc_class:
-    #         self.outputs["Entity"].sv_set([self.file.by_type(custom_ifc_class)])
-    #     elif ifc_class:
-    #         self.outputs["Entity"].sv_set([self.file.by_type(ifc_class)])
-    #     else:
-    #         self.outputs["Entity"].sv_set([])
-
 
 def register():
     bpy.utils.register_class(SvIfcByType)

src/ifcsverchok/nodes/ifc/create_entity.py

@@ -16,8 +16,6 @@ from bpy.props import StringProperty, EnumProperty, IntProperty, BoolProperty
 from sverchok.node_tree import SverchCustomTreeNode
 from sverchok.data_structure import updateNode, flatten_data, repeat_last_for_length
 
-input_map = {}
-
 
 class SvIfcCreateEntity(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper.SvIfcCore):
     bl_idname = "SvIfcCreateEntity"
@@ -48,7 +46,6 @@ class SvIfcCreateEntity(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper
         self.inputs.new("SvMatrixSocket", "Locations").is_mandatory=False
         self.inputs.new("SvStringsSocket", "Properties").prop_name = "Properties"
         self.outputs.new("SvStringsSocket", "Entities")
-        self.outputs.new("SvStringsSocket", "file")  # only for testing
         self.node_dict[hash(self)] = {}
 
     def draw_buttons(self, context, layout):
@@ -85,12 +82,12 @@ class SvIfcCreateEntity(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper
         for i in range(len(self.inputs)):
             # if self.sv_input_names[i] == "Locations":
             #     input = self.inputs[self.sv_input_names[i]].sv_get(deepcopy=False, default = [])
-            input = self.inputs[self.sv_input_names[i]].sv_get(deepcopy=False, default =[])
+            input = self.inputs[self.sv_input_names[i]].sv_get(deepcopy=True, default =[])
             # print("input: ", input)
             # print("self.node_dict[hash(self)][self.inputs[i].name]: ", self.node_dict[hash(self)][self.inputs[i].name])
             if isinstance(self.node_dict[hash(self)][self.inputs[i].name], list) and input != self.node_dict[hash(self)][self.inputs[i].name]:
                 edit = True
-            self.node_dict[hash(self)][self.inputs[i].name] = input
+            self.node_dict[hash(self)][self.inputs[i].name] = input.copy()
 
         if self.refresh_local:
             edit = True
@@ -127,7 +124,6 @@ class SvIfcCreateEntity(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper
         print("SvIfcStore.id_map: ", SvIfcStore.id_map)
 
         self.outputs["Entities"].sv_set(entities)
-        self.outputs["file"].sv_set([[self.file]])
 
     def create(self, index=None):
         entities_ids = []
@@ -171,10 +167,10 @@ class SvIfcCreateEntity(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper
             entity.Description = self.descriptions[i]
 
             try:
-                if self.representations[i] and not self.file.by_type("IFCPRODUCTDEFINITIONSHAPE"):
-                    ifcopenshell.api.run("geometry.assign_representation", self.file, product=entity, representation=self.representations[i])
-                elif self.representations[i]:
+                if self.representations[i] and self.representations[i].is_a('IfcProductDefinitionShape'):
                     entity.Representation = self.representations[i]
+                elif self.representations[i]:
+                    ifcopenshell.api.run("geometry.assign_representation", self.file, product=entity, representation=self.representations[i])
             except IndexError:
                 pass
             try:

src/ifcsverchok/nodes/ifc/pick_ifc_class.py

@@ -24,8 +24,9 @@ from bpy.props import StringProperty, EnumProperty
 from ifcsverchok.ifcstore import SvIfcStore
 from sverchok.node_tree import SverchCustomTreeNode
 from sverchok.data_structure import updateNode
+from sverchok.utils.handle_blender_data import keep_enum_reference
 
-
+@keep_enum_reference
 def get_ifc_products(self, context):
     ifc_products = getattr(self, "ifc_products", [])
     file = SvIfcStore.get_file()
@@ -52,12 +53,12 @@ def get_ifc_products(self, context):
         ifc_products[2] = ("IfcSpatialStructureElement", "IfcSpatialStructureElement", "")
     return ifc_products
 
-
+@keep_enum_reference
 def update_ifc_products(self, context):
     if hasattr(self, "ifc_classes"):
         self.ifc_classes.clear()
 
-
+@keep_enum_reference
 def get_ifc_classes(self, context):
     ifc_classes = getattr(self, "ifc_classes", [])
     if ifc_classes: