From 5d2b5c75faba74d443ead62e30ef1ef71ba770a5 Mon Sep 17 00:00:00 2001 From: Marius Andra Date: Tue, 25 Jun 2024 00:09:26 +0200 Subject: [PATCH] fix qr code --- backend/app/codegen/scene_nim.py | 4 ++-- frontend/src/scenes/frame/panels/Control/controlLogic.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/app/codegen/scene_nim.py b/backend/app/codegen/scene_nim.py index 42feb104..fb41ed6f 100644 --- a/backend/app/codegen/scene_nim.py +++ b/backend/app/codegen/scene_nim.py @@ -143,12 +143,12 @@ def apply_control_code(self): if app_import not in self.imports: self.imports += [app_import] self.init_apps += [ - 'scene.controlCodeRender = render_imageApp.init(-1.NodeId, scene.FrameScene, render_imageApp.AppConfig(', + 'scene.controlCodeRender = render_imageApp.App(nodeName: "render/image", nodeId: -1.NodeId, scene: scene.FrameScene, frameConfig: scene.frameConfig, appConfig: render_imageApp.AppConfig(', f' offsetX: {int(control_code.get("offsetX", "0"))},', f' offsetY: {int(control_code.get("offsetY", "0"))},', f' placement: "{sanitize_nim_string(control_code.get("placement", "top-left"))}",', '))', - 'scene.controlCodeData = data_qrApp.init(-1.NodeId, scene.FrameScene, data_qrApp.AppConfig(', + 'scene.controlCodeData = data_qrApp.App(nodeName: "data/qr", nodeId: -1.NodeId, scene: scene.FrameScene, frameConfig: scene.frameConfig, appConfig: data_qrApp.AppConfig(', f' backgroundColor: parseHtmlColor("{sanitize_nim_string(control_code.get("backgroundColor", "#000000"))}"),', f' qrCodeColor: parseHtmlColor("{sanitize_nim_string(control_code.get("qrCodeColor", "#ffffff"))}"),', f' padding: {int(control_code.get("padding", "1"))},', diff --git a/frontend/src/scenes/frame/panels/Control/controlLogic.tsx b/frontend/src/scenes/frame/panels/Control/controlLogic.tsx index a6771050..ec1851ac 100644 --- a/frontend/src/scenes/frame/panels/Control/controlLogic.tsx +++ b/frontend/src/scenes/frame/panels/Control/controlLogic.tsx @@ -131,7 +131,7 @@ export const controlLogic = kea([ [socketLogic.actionTypes.newLog]: ({ log }) => { try { const { event, sceneId } = JSON.parse(log.line) - if (event === 'sceneChange') { + if (event === 'render:sceneChange') { if (sceneId !== values.sceneId) { actions.currentSceneChanged(sceneId) actions.sync()