From 4e0a813eb49db7f4fe095e349dacb581178ddb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?= Date: Wed, 11 Dec 2024 16:39:12 -0300 Subject: [PATCH] Fix Solar Analysis UI after changes in Sun Position Add-on. Changes in this file: https://projects.blender.org/pioverfour/sun_position/src/branch/main/sun_calc.py --- src/bonsai/bonsai/bim/module/light/decorator.py | 13 +++---------- src/bonsai/bonsai/bim/module/light/ui.py | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/light/decorator.py b/src/bonsai/bonsai/bim/module/light/decorator.py index 35dc05f198..958aca6e0f 100644 --- a/src/bonsai/bonsai/bim/module/light/decorator.py +++ b/src/bonsai/bonsai/bim/module/light/decorator.py @@ -144,16 +144,9 @@ class SolarDecorator: self.draw_batch("LINES", [location, origin @ Vector((0, 0, 0))], decorator_color_background, [[0, 1]]) coords = [] - indices = [] - coord_offset = 0 - for h in range(24): - analemma_verts = SolarData.data["sun_position"].sun_calc.calc_analemma(context, h) - coords.extend([origin @ v for v in analemma_verts]) - for i in range(len(analemma_verts) - 1): - indices.append((coord_offset + i, coord_offset + i + 1)) - coord_offset += len(analemma_verts) - - self.draw_batch("LINES", coords, decorator_color_special, indices) + analemma_verts, analemma_edges = SolarData.data["sun_position"].sun_calc.calc_analemma(context.scene) + coords.extend([origin @ v for v in analemma_verts]) + self.draw_batch("LINES", coords, decorator_color_special, analemma_edges) # True north self.tn_angle = props.true_north diff --git a/src/bonsai/bonsai/bim/module/light/ui.py b/src/bonsai/bonsai/bim/module/light/ui.py index 3a456badce..97d29c041f 100644 --- a/src/bonsai/bonsai/bim/module/light/ui.py +++ b/src/bonsai/bonsai/bim/module/light/ui.py @@ -216,8 +216,8 @@ class BIM_PT_solar(bpy.types.Panel): box = row.box() - sunrise = sun_position.sun_calc.format_hms(sun_position.sun_calc.sun.sunrise) - sunset = sun_position.sun_calc.format_hms(sun_position.sun_calc.sun.sunset) + sunrise = sun_position.sun_calc.format_hms(sun_props.sunrise_time) + sunset = sun_position.sun_calc.format_hms(sun_props.sunset_time) row2 = box.row() row2.label(text=f"Sunrise: {sunrise}")