kerykeion 4.6.1__py3-none-any.whl → 4.6.2__py3-none-any.whl

kerykeion/charts/kerykeion_chart_svg.py

@@ -1200,48 +1200,41 @@ class KerykeionChartSVG:
         out += end_of_line
         return out
 
-    def _makeHousesGrid(self):
-        """
-        Generate SVG code for a grid of astrological houses.
-
-        Returns:
-            str: The SVG code for the grid of houses.
-        """
-        # Initialize the SVG group for the grid
-        grid_svg = '<g transform="translate(600,-20)">'
-
-        # Vertical position of the current house in the grid
-        vertical_position = 10
+    def _draw_house_grid(self):
+        out = '<g transform="translate(600,-20)">'
 
-        # Generate SVG code for each house
+        li = 10
         for i in range(12):
-            # Add leading spaces to single-digit house numbers for alignment
-            house_number = str(i + 1).rjust(2, ' ')
-
-            # Start a new SVG group for the current house
-            grid_svg += f'<g transform="translate(0,{vertical_position})">'
-
-            # Add the house label
-            grid_svg += f'<text text-anchor="end" x="40" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["cusp"]} {house_number}:</text>'
-
-            # Add the zodiac sign symbol for the house
-            zodiac_sign = self.zodiac[self.houses_sign_graph[i]]["name"]
-            grid_svg += f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{zodiac_sign}" /></g>'
-
-            # Add the position of the house
-            house_position = self._dec2deg(self.user.houses_list[i]["position"])
-            grid_svg += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {house_position}</text>'
-
-            # End the SVG group for the current house
-            grid_svg += "</g>"
+            if i < 9:
+                cusp = "&#160;&#160;" + str(i + 1)
+            else:
+                cusp = str(i + 1)
+            out += f'<g transform="translate(0,{li})">'
+            out += f'<text text-anchor="end" x="40" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["cusp"]} {cusp}:</text>'
+            out += f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.houses_sign_graph[i]]["name"]}" /></g>'
+            out += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {self._dec2deg(self.user.houses_list[i]["position"])}</text>'
+            out += "</g>"
+            li = li + 14
 
-            # Move down for the next house
-            vertical_position += 14
+        out += "</g>"
 
-        # End the SVG group for the grid
-        grid_svg += "</g>"
+        if self.chart_type == "Synastry":
+            out += '<g transform="translate(840, -20)">'
+            li = 10
+            for i in range(12):
+                if i < 9:
+                    cusp = "&#160;&#160;" + str(i + 1)
+                else:
+                    cusp = str(i + 1)
+                out += '<g transform="translate(0,' + str(li) + ')">'
+                out += f'<text text-anchor="end" x="40" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;">{self.language_settings["cusp"]} {cusp}:</text>'
+                out += f'<g transform="translate(40,-8)"><use transform="scale(0.3)" xlink:href="#{self.zodiac[self.t_houses_sign_graph[i]]["name"]}" /></g>'
+                out += f'<text x="53" style="fill:{self.chart_colors_settings["paper_0"]}; font-size: 10px;"> {self._dec2deg(self.t_user.houses_list[i]["position"])}</text>'
+                out += "</g>"
+                li = li + 14
+            out += "</g>"
 
-        return grid_svg
+        return out
 
     def _createTemplateDictionary(self) -> ChartTemplateDictionary:
         # self.chart_type = "Transit"
@@ -1448,14 +1441,13 @@ class KerykeionChartSVG:
         # Drawing Functions
         #--- 
 
-        # Drawing the Zodiac slices
         td["makeZodiac"] = self._draw_zodiac_circle_slices(r)
+        td["makeHousesGrid"] = self._draw_house_grid()
         # TODO: Add the rest of the functions
         td["makeHouses"] = self._makeHouses(r)
         td["makePlanets"] = self._make_planets(r)
         td["makeElements"] = self._makeElements(r)
         td["makePlanetGrid"] = self._makePlanetGrid()
-        td["makeHousesGrid"] = self._makeHousesGrid()
 
         return td
 

{kerykeion-4.6.1.dist-info → kerykeion-4.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.6.1
+Version: 4.6.2
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0

{kerykeion-4.6.1.dist-info → kerykeion-4.6.2.dist-info}/RECORD

@@ -7,7 +7,7 @@ kerykeion/aspects/synastry_aspects.py,sha256=uwg7Lc7wKnpxW9ydOdBHqx9cvO_t0ydGfIG
 kerykeion/astrological_subject.py,sha256=9vLsYZYfAfkR5EJO_EkbkhXa4i788Yv1lCESaQrt5kU,22965
 kerykeion/charts/__init__.py,sha256=Juxkduy2TaagWblh_7CE8Acrg3dHL27-WEddJhau_eQ,127
 kerykeion/charts/charts_utils.py,sha256=jJLgoBcs9e6-ArNFsj_N7Wel0zCzMKEsGrlz_A7MECE,5167
-kerykeion/charts/kerykeion_chart_svg.py,sha256=mx6VOcSCbPJlxNI0rFk-PQAwMvNEM5wbHMpClWV9EcA,64662
+kerykeion/charts/kerykeion_chart_svg.py,sha256=6y0VHsfBEjefSrJErcKB3UH1xFOuWoEps4Y_1-IynVo,64764
 kerykeion/charts/templates/chart.xml,sha256=ZrkqJV3Du8vG1w8kVkM1wI-IiZNVDLDuS6dRtPz7wVo,69874
 kerykeion/enums.py,sha256=Ben9GLYkPucpYY2ZDpURzUbNCc9jzK2MuaffkgiXFdQ,965
 kerykeion/fetch_geonames.py,sha256=fWuhgP_hZTPzDuodu7hvSznzGCWj3IC3vHAX32zPRw8,4444
@@ -25,8 +25,8 @@ kerykeion/settings/kr.config.json,sha256=1Yhv9RGHom5U9e-JZZRWVfT2Ubllz2WrckdwadD
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
 kerykeion/utilities.py,sha256=ncoXHvzXhNjhdm-uU6hMirVo287laq2GAJElNE6cBZM,10822
-kerykeion-4.6.1.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.6.1.dist-info/METADATA,sha256=ex70YSaS2hxS_HFpcfQx0rkIfd0Xpp_PoskW6BNXC90,10311
-kerykeion-4.6.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-kerykeion-4.6.1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.6.1.dist-info/RECORD,,
+kerykeion-4.6.2.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.6.2.dist-info/METADATA,sha256=hnPIiPxPtZE9OlhC3Us33D38-4g7-RA71eFeZpEATCU,10311
+kerykeion-4.6.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kerykeion-4.6.2.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.6.2.dist-info/RECORD,,