From 25e964788c9cdd7863843680d03bf785906e1b39 Mon Sep 17 00:00:00 2001 From: Ziad-I <68874104+Ziad-I@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:06:04 +0300 Subject: [PATCH] add key name parameter in send_webui_data --- src/blenderbim/blenderbim/bim/data/webui/static/js/index.js | 2 +- src/blenderbim/blenderbim/bim/module/csv/operator.py | 4 +++- src/blenderbim/blenderbim/tool/web.py | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/data/webui/static/js/index.js b/src/blenderbim/blenderbim/bim/data/webui/static/js/index.js index 7b830870ad..39e2bee442 100644 --- a/src/blenderbim/blenderbim/bim/data/webui/static/js/index.js +++ b/src/blenderbim/blenderbim/bim/data/webui/static/js/index.js @@ -40,7 +40,7 @@ function handleBlenderDisconnect(blenderId) { // Function to handle 'csv_data' event function handleCsvData(data) { const blenderId = data["blenderId"]; - const csvData = data["data"]["data"]; + const csvData = data["data"]["csv_data"]; const filename = data["data"]["IFC_File"]; console.log(data); diff --git a/src/blenderbim/blenderbim/bim/module/csv/operator.py b/src/blenderbim/blenderbim/bim/module/csv/operator.py index 859e5f6e2a..08ae965395 100644 --- a/src/blenderbim/blenderbim/bim/module/csv/operator.py +++ b/src/blenderbim/blenderbim/bim/module/csv/operator.py @@ -254,7 +254,9 @@ class ExportIfcCsv(bpy.types.Operator): schedule_creator = scheduler.Scheduler() schedule_creator.schedule(self.filepath, tool.Drawing.get_path_with_ext(self.filepath, "svg")) if props.format == "web": - tool.Web.send_webui_data(extra_data=ifc_csv.dataframe.to_csv(index=False), event="csv_data") + tool.Web.send_webui_data( + extra_data=ifc_csv.dataframe.to_csv(index=False), extra_data_key="csv_data", event="csv_data" + ) self.report({"INFO"}, f"Data is exported to {props.format.upper()}.") return {"FINISHED"} diff --git a/src/blenderbim/blenderbim/tool/web.py b/src/blenderbim/blenderbim/tool/web.py index b7b9bb3aec..18a2bf979d 100644 --- a/src/blenderbim/blenderbim/tool/web.py +++ b/src/blenderbim/blenderbim/tool/web.py @@ -118,7 +118,9 @@ class Web(blenderbim.core.tool.Web): print("Websocket server terminated successfully") @classmethod - def send_webui_data(cls, extra_data=None, event="data", namespace="/blender", use_web_data=True): + def send_webui_data( + cls, extra_data=None, extra_data_key="data", event="data", namespace="/blender", use_web_data=True + ): global ws_thread data = {} @@ -128,7 +130,7 @@ class Web(blenderbim.core.tool.Web): data = WebData.data if extra_data is not None: - data["data"] = extra_data + data[extra_data_key] = extra_data if ws_thread is not None and bpy.context.scene.WebProperties.is_connected: ws_thread.run_coro(cls.sio_send(data, event, namespace))