From 8987bd1df31f2e2011e7a25fef7ea34e5bcc452a Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Fri, 10 May 2019 23:05:41 -0300 Subject: [PATCH] Arch: Re-added support for older pysolar --- src/Mod/Arch/ArchSite.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Mod/Arch/ArchSite.py b/src/Mod/Arch/ArchSite.py index 24809eeb72..2777fcfc08 100644 --- a/src/Mod/Arch/ArchSite.py +++ b/src/Mod/Arch/ArchSite.py @@ -82,6 +82,7 @@ def makeSolarDiagram(longitude,latitude,scale=1,complete=False): returns a solar diagram as a pivy node. If complete is True, the 12 months are drawn""" + oldversion = False try: import pysolar except: @@ -90,6 +91,8 @@ def makeSolarDiagram(longitude,latitude,scale=1,complete=False): except: FreeCAD.Console.PrintError("The pysolar module was not found. Unable to generate solar diagrams\n") return None + else: + oldversion = True from pivy import coin @@ -143,7 +146,10 @@ def makeSolarDiagram(longitude,latitude,scale=1,complete=False): for i,d in enumerate(m): pts = [] for h in range(24): - dt = datetime.datetime(year, d[0], d[1], h, tzinfo=datetime.timezone.utc) + if oldversion: + dt = datetime.datetime(year, d[0], d[1], h) + else: + dt = datetime.datetime(year, d[0], d[1], h, tzinfo=datetime.timezone.utc) alt = math.radians(pysolar.solar.get_altitude_fast(latitude, longitude, dt)) az = pysolar.solar.get_azimuth(latitude, longitude, dt) az = -90 + az # pysolar's zero is south