From 7522a3a2abeacb292a846c968adcf35eabda2b76 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Mon, 6 Feb 2023 16:24:44 +0500 Subject: [PATCH] renamed "data" parameter in model/data.py renamed "data" parameter in model/data.py to make it a bit more distinctive from neighbour "Data" parameter with json string --- src/blenderbim/blenderbim/bim/module/model/data.py | 10 +++++----- src/blenderbim/blenderbim/bim/module/model/ui.py | 10 +++++----- src/blenderbim/blenderbim/bim/module/model/window.py | 4 ---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/model/data.py b/src/blenderbim/blenderbim/bim/module/model/data.py index f41b3cd068..665936126c 100644 --- a/src/blenderbim/blenderbim/bim/module/model/data.py +++ b/src/blenderbim/blenderbim/bim/module/model/data.py @@ -354,7 +354,7 @@ class ArrayData: parent = tool.Ifc.get().by_guid(parameters["Parent"]) parameters["has_parent"] = True parameters["parent_name"] = parent.Name or "Unnamed" - parameters["data"] = json.loads(parameters.get("Data", "[]") or "[]") + parameters["data_dict"] = json.loads(parameters.get("Data", "[]") or "[]") except: parameters["has_parent"] = False return parameters @@ -376,7 +376,7 @@ class StairData: psets = ifcopenshell.util.element.get_psets(element) parameters = psets.get("BBIM_Stair", None) if parameters: - parameters["data"] = json.loads(parameters.get("Data", "[]") or "[]") + parameters["data_dict"] = json.loads(parameters.get("Data", "[]") or "[]") return parameters @@ -396,7 +396,7 @@ class SverchokData: psets = ifcopenshell.util.element.get_psets(element) parameters = psets.get("BBIM_Sverchok", None) if parameters: - parameters["data"] = json.loads(parameters.get("Data", "[]") or "[]") + parameters["data_dict"] = json.loads(parameters.get("Data", "[]") or "[]") return parameters @classmethod @@ -425,7 +425,7 @@ class WindowData: psets = ifcopenshell.util.element.get_psets(element) parameters = psets.get("BBIM_Window", None) if parameters: - parameters["data"] = json.loads(parameters.get("Data", "[]") or "[]") + parameters["data_dict"] = json.loads(parameters.get("Data", "[]") or "[]") return parameters @@ -445,5 +445,5 @@ class DoorData: psets = ifcopenshell.util.element.get_psets(element) parameters = psets.get("BBIM_Door", None) if parameters: - parameters["data"] = json.loads(parameters.get("Data", "[]") or "[]") + parameters["data_dict"] = json.loads(parameters.get("Data", "[]") or "[]") return parameters diff --git a/src/blenderbim/blenderbim/bim/module/model/ui.py b/src/blenderbim/blenderbim/bim/module/model/ui.py index 2dd5dbfe56..723c0f3b7c 100644 --- a/src/blenderbim/blenderbim/bim/module/model/ui.py +++ b/src/blenderbim/blenderbim/bim/module/model/ui.py @@ -282,10 +282,10 @@ class BIM_PT_array(bpy.types.Panel): row.label(text=ArrayData.data["parameters"]["parent_name"], icon="CON_CHILDOF") op = row.operator("bim.select_array_parent", icon="OBJECT_DATA", text="") op.parent = ArrayData.data["parameters"]["Parent"] - if ArrayData.data["parameters"]["data"]: + if ArrayData.data["parameters"]["data_dict"]: row.operator("bim.add_array", icon="ADD", text="") - for i, array in enumerate(ArrayData.data["parameters"]["data"]): + for i, array in enumerate(ArrayData.data["parameters"]["data_dict"]): box = self.layout.box() if props.is_editing == i: row = box.row(align=True) @@ -335,7 +335,7 @@ class BIM_PT_stair(bpy.types.Panel): row = self.layout.row(align=True) row.label(text="Stair parameters", icon="IPO_CONSTANT") - stair_data = StairData.data["parameters"]["data"] + stair_data = StairData.data["parameters"]["data_dict"] if props.is_editing != -1: row = self.layout.row(align=True) row.operator("bim.finish_editing_stair", icon="CHECKMARK", text="Finish editing") @@ -433,7 +433,7 @@ class BIM_PT_window(bpy.types.Panel): row = self.layout.row(align=True) row.label(text="Window parameters", icon="OUTLINER_OB_LATTICE") - window_data = WindowData.data["parameters"]["data"] + window_data = WindowData.data["parameters"]["data_dict"] number_of_panels, panels_data = props.window_types_panels[props.window_type] if props.is_editing != -1: @@ -549,7 +549,7 @@ class BIM_PT_door(bpy.types.Panel): row = self.layout.row(align=True) row.label(text="Door parameters", icon="OUTLINER_OB_LATTICE") - door_data = DoorData.data["parameters"]["data"] + door_data = DoorData.data["parameters"]["data_dict"] if props.is_editing != -1: row = self.layout.row(align=True) diff --git a/src/blenderbim/blenderbim/bim/module/model/window.py b/src/blenderbim/blenderbim/bim/module/model/window.py index 86dfc44803..f48ebf4e35 100644 --- a/src/blenderbim/blenderbim/bim/module/model/window.py +++ b/src/blenderbim/blenderbim/bim/module/model/window.py @@ -453,10 +453,6 @@ class FinishEditingWindow(bpy.types.Operator, tool.Ifc.Operator): pset = tool.Ifc.get().by_id(pset["id"]) window_data = json.dumps(window_data, default=list) - # TODO: debug two types of data in - # from blenderbim.bim.module.model.data import WindowData - # WindowData.data['parameters'].keys() - # same thing could go for both stairs and arrays ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties={"Data": window_data}) return {"FINISHED"}