PyJHora 3.7.0__tar.gz → 3.7.3__tar.gz

{pyjhora-3.7.0/src/PyJHora.egg-info → pyjhora-3.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyJHora
-Version: 3.7.0
+Version: 3.7.3
 Summary: Complete Vedic Astrology Python package.
 Author-email: Sundar Sundaresan <Sundaram.Sundaresan@gmail.com>
 License:  GNU AFFERO GENERAL PUBLIC LICENSE
@@ -677,7 +677,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-JHora 3.7.0
+JHora 3.7.3
 =================
 Python package containing almost all the features described in the book
 
@@ -771,6 +771,30 @@ Click Show PDF to save the screen as a PDF file
 
 
 #### List of Features
+* `jhora.ui.chart_styles`: 
+
+This module provides basic PyQt user interface Widgets for South, North, East Indian, Sudharshana Chakra and Western charts.
+* `jhora.ui.conjunction_dialog`: 
+
+This module provides an independent user interface widget to calculate planet conjunctions.
+* `jhora.ui.match_ui`: 
+
+This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
+* `jhora.ui.vakra_gathi`: 
+
+This is just a fun plot widget to show how retrogression of a planet will appear as seen from the earth.
+* `jhora.ui.vratha_finder`: 
+
+This module provides an independent interface widget to find the vratha dates based on combination of inputs such as tithi, nakshathra, yogam, karana, tamil month.
+* `jhora.ui.horo_chart_tabs`: 
+
+This is the complex user interface PyQt tabbed Widget that can be used to get most of the features offered by this library. Language of UI can be dynamically changed. Various chart/panchanga/divisional chart/dhasa choices can be changed. Results can be saved as a PDF (about 100+ pages).
+Added right-click-context menu for all the chart widgets. Right click to view Arudhas, Upagrahas, Special Lagnas, Arudha Lagnas, Varnada Lagnas.
+
+* `jhora.ui.horo_chart`: 
+
+REMOVED FROM V3.7.3 onwards
+
 * `jhora.panchanga.drik`: 
 
 This is the basic module that offers functions for: setting one of 20 ayanamsa modes (Lahiri, KP, True Chitra etc), sunrise/set, moonrise/set, midday/night, day/night length, tithi,karana, yogam, raasi, nakshatra padha, vaara, lunar month, tamil month/date, elapsed year, new moon, samvasatra, ritu, gauri chogadiya, trikalam, durmuhurtham, abhijit muhurta, sidereal longitude of planets, dhasavarga longitude of planets, bhaava madhya, ascendant, declination of planets, longitudes of upagrahas (such as dhuma, vyatipaata, parivesha, indrachapa and upakethu, kaala, mrithyu, artha praharaka, yama ghantaka, gulika and maandi), special lagnas (such as bhava, hora, ghati, vighati, pranapada, indu, bhrigu bindhu, kunda, sree lagna), previous/next sankranti dates, previous/next solar entry dates, previous/next solar/lunar eclipse, birth rectification (BV Raman - experimental work - accuracy not guaranteed though), previous/next occurrence of planet pairs, previous/next planet entry into specified rasi, previous/next retrogression of planets and nisheka (does not match JHora values).
@@ -842,28 +866,6 @@ Modules `khanda khaadyaka`, `surya_sidhantha` are attempts to implement ancient
 * `jhora.panchanga.vratha`: 
 
 Module to find various vratha dates such as pradosham, sankranti, amavasya, pournami, ekadhashi, sashti, sankatahara_chathurthi, vinayaka_chathurthi, shivarathri, chandra_dharshan, moondraam_pirai, srartha, ashtaka, manvaadhi, yugadhi, mahalaya_paksha. There is also a `search` function to find dates matching any combination of tithi, nakshathra, yogam, karana, tamil month.
-* `jhora.ui.chart_styles`: 
-
-This module provides basic PyQt user interface Widgets for South, North, East Indian, Sudharshana Chakra and Western charts.
-* `jhora.ui.conjunction_dialog`: 
-
-This module provides an independent user interface widget to calculate planet conjunctions.
-* `jhora.ui.match_ui`: 
-
-This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
-* `jhora.ui.vakra_gathi`: 
-
-This is just a fun plot widget to show how retrogression of a planet will appear as seen from the earth.
-* `jhora.ui.vratha_finder`: 
-
-This module provides an independent interface widget to find the vratha dates based on combination of inputs such as tithi, nakshathra, yogam, karana, tamil month.
-* `jhora.ui.horo_chart`: 
-
-This is a simple kundali chart PyQt Widget
-* `jhora.ui.horo_chart_tabs`: 
-
-This is the complex user interface PyQt tabbed Widget that can be used to get most of the features offered by this library. Language of UI can be dynamically changed. Various chart/panchanga/divisional chart/dhasa choices can be changed. Results can be saved as a PDF (about 100+ pages).
-
 
 
 Package Structure:
@@ -967,6 +969,21 @@ jhora
       !- unit_tests.py           - unit tests for the features based on examples from the book
       !- pvr_tests.py            - Exercise problems from book.
 ```
+Changes since V3.7.0-post1
+=====================
+Errors fixed due to additional arguments to support custom and mixed charts across the package.
+Unit Tests successfully executed.
+
+`jhora.horoscope.chart.arudhas`: Bhava arudhas can be obtained from any base planet. `bhava_arudhas_from_planet_positions` takes an argument `arudha_base` 0=> Lagna, 1=>Sun...9=>Ketu
+
+`jhora.horoscope.chart.charts`: Updated special lagnas, planets to be obtained for standard, custom and mixed charts. 
+
+`jhora.horoscope.main`:  Changes to support right click menu and other UI elements.
+
+`jhora.panchanga.drik`: Updated special lagnas, planets to be obtained for standard, custom and mixed charts.
+
+`jhora.ui.horo_chart_tabs`: Added right-click context menus on Kundali Charts.
+
 Changes since V3.6.6
 =====================
 Custom Kundali Chart (Dn) and Sub-divisional (mixed) (DmxDn) charts added to `jhora.horoscope.chart.charts`

{pyjhora-3.7.0/src/jhora → pyjhora-3.7.3}/README.md

@@ -1,4 +1,4 @@
-JHora 3.7.0
+JHora 3.7.3
 =================
 Python package containing almost all the features described in the book
 
@@ -92,6 +92,30 @@ Click Show PDF to save the screen as a PDF file
 
 
 #### List of Features
+* `jhora.ui.chart_styles`: 
+
+This module provides basic PyQt user interface Widgets for South, North, East Indian, Sudharshana Chakra and Western charts.
+* `jhora.ui.conjunction_dialog`: 
+
+This module provides an independent user interface widget to calculate planet conjunctions.
+* `jhora.ui.match_ui`: 
+
+This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
+* `jhora.ui.vakra_gathi`: 
+
+This is just a fun plot widget to show how retrogression of a planet will appear as seen from the earth.
+* `jhora.ui.vratha_finder`: 
+
+This module provides an independent interface widget to find the vratha dates based on combination of inputs such as tithi, nakshathra, yogam, karana, tamil month.
+* `jhora.ui.horo_chart_tabs`: 
+
+This is the complex user interface PyQt tabbed Widget that can be used to get most of the features offered by this library. Language of UI can be dynamically changed. Various chart/panchanga/divisional chart/dhasa choices can be changed. Results can be saved as a PDF (about 100+ pages).
+Added right-click-context menu for all the chart widgets. Right click to view Arudhas, Upagrahas, Special Lagnas, Arudha Lagnas, Varnada Lagnas.
+
+* `jhora.ui.horo_chart`: 
+
+REMOVED FROM V3.7.3 onwards
+
 * `jhora.panchanga.drik`: 
 
 This is the basic module that offers functions for: setting one of 20 ayanamsa modes (Lahiri, KP, True Chitra etc), sunrise/set, moonrise/set, midday/night, day/night length, tithi,karana, yogam, raasi, nakshatra padha, vaara, lunar month, tamil month/date, elapsed year, new moon, samvasatra, ritu, gauri chogadiya, trikalam, durmuhurtham, abhijit muhurta, sidereal longitude of planets, dhasavarga longitude of planets, bhaava madhya, ascendant, declination of planets, longitudes of upagrahas (such as dhuma, vyatipaata, parivesha, indrachapa and upakethu, kaala, mrithyu, artha praharaka, yama ghantaka, gulika and maandi), special lagnas (such as bhava, hora, ghati, vighati, pranapada, indu, bhrigu bindhu, kunda, sree lagna), previous/next sankranti dates, previous/next solar entry dates, previous/next solar/lunar eclipse, birth rectification (BV Raman - experimental work - accuracy not guaranteed though), previous/next occurrence of planet pairs, previous/next planet entry into specified rasi, previous/next retrogression of planets and nisheka (does not match JHora values).
@@ -163,28 +187,6 @@ Modules `khanda khaadyaka`, `surya_sidhantha` are attempts to implement ancient
 * `jhora.panchanga.vratha`: 
 
 Module to find various vratha dates such as pradosham, sankranti, amavasya, pournami, ekadhashi, sashti, sankatahara_chathurthi, vinayaka_chathurthi, shivarathri, chandra_dharshan, moondraam_pirai, srartha, ashtaka, manvaadhi, yugadhi, mahalaya_paksha. There is also a `search` function to find dates matching any combination of tithi, nakshathra, yogam, karana, tamil month.
-* `jhora.ui.chart_styles`: 
-
-This module provides basic PyQt user interface Widgets for South, North, East Indian, Sudharshana Chakra and Western charts.
-* `jhora.ui.conjunction_dialog`: 
-
-This module provides an independent user interface widget to calculate planet conjunctions.
-* `jhora.ui.match_ui`: 
-
-This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
-* `jhora.ui.vakra_gathi`: 
-
-This is just a fun plot widget to show how retrogression of a planet will appear as seen from the earth.
-* `jhora.ui.vratha_finder`: 
-
-This module provides an independent interface widget to find the vratha dates based on combination of inputs such as tithi, nakshathra, yogam, karana, tamil month.
-* `jhora.ui.horo_chart`: 
-
-This is a simple kundali chart PyQt Widget
-* `jhora.ui.horo_chart_tabs`: 
-
-This is the complex user interface PyQt tabbed Widget that can be used to get most of the features offered by this library. Language of UI can be dynamically changed. Various chart/panchanga/divisional chart/dhasa choices can be changed. Results can be saved as a PDF (about 100+ pages).
-
 
 
 Package Structure:
@@ -288,6 +290,21 @@ jhora
       !- unit_tests.py           - unit tests for the features based on examples from the book
       !- pvr_tests.py            - Exercise problems from book.
 ```
+Changes since V3.7.0-post1
+=====================
+Errors fixed due to additional arguments to support custom and mixed charts across the package.
+Unit Tests successfully executed.
+
+`jhora.horoscope.chart.arudhas`: Bhava arudhas can be obtained from any base planet. `bhava_arudhas_from_planet_positions` takes an argument `arudha_base` 0=> Lagna, 1=>Sun...9=>Ketu
+
+`jhora.horoscope.chart.charts`: Updated special lagnas, planets to be obtained for standard, custom and mixed charts. 
+
+`jhora.horoscope.main`:  Changes to support right click menu and other UI elements.
+
+`jhora.panchanga.drik`: Updated special lagnas, planets to be obtained for standard, custom and mixed charts.
+
+`jhora.ui.horo_chart_tabs`: Added right-click context menus on Kundali Charts.
+
 Changes since V3.6.6
 =====================
 Custom Kundali Chart (Dn) and Sub-divisional (mixed) (DmxDn) charts added to `jhora.horoscope.chart.charts`

{pyjhora-3.7.0 → pyjhora-3.7.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "PyJHora"
 description = "Complete Vedic Astrology Python package."
-version = "3.7.0"
+version = "3.7.3"
 authors = [
 	{name="Sundar Sundaresan",email = "Sundaram.Sundaresan@gmail.com"},
 ]

{pyjhora-3.7.0 → pyjhora-3.7.3/src/PyJHora.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyJHora
-Version: 3.7.0
+Version: 3.7.3
 Summary: Complete Vedic Astrology Python package.
 Author-email: Sundar Sundaresan <Sundaram.Sundaresan@gmail.com>
 License:  GNU AFFERO GENERAL PUBLIC LICENSE
@@ -677,7 +677,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-JHora 3.7.0
+JHora 3.7.3
 =================
 Python package containing almost all the features described in the book
 
@@ -771,6 +771,30 @@ Click Show PDF to save the screen as a PDF file
 
 
 #### List of Features
+* `jhora.ui.chart_styles`: 
+
+This module provides basic PyQt user interface Widgets for South, North, East Indian, Sudharshana Chakra and Western charts.
+* `jhora.ui.conjunction_dialog`: 
+
+This module provides an independent user interface widget to calculate planet conjunctions.
+* `jhora.ui.match_ui`: 
+
+This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
+* `jhora.ui.vakra_gathi`: 
+
+This is just a fun plot widget to show how retrogression of a planet will appear as seen from the earth.
+* `jhora.ui.vratha_finder`: 
+
+This module provides an independent interface widget to find the vratha dates based on combination of inputs such as tithi, nakshathra, yogam, karana, tamil month.
+* `jhora.ui.horo_chart_tabs`: 
+
+This is the complex user interface PyQt tabbed Widget that can be used to get most of the features offered by this library. Language of UI can be dynamically changed. Various chart/panchanga/divisional chart/dhasa choices can be changed. Results can be saved as a PDF (about 100+ pages).
+Added right-click-context menu for all the chart widgets. Right click to view Arudhas, Upagrahas, Special Lagnas, Arudha Lagnas, Varnada Lagnas.
+
+* `jhora.ui.horo_chart`: 
+
+REMOVED FROM V3.7.3 onwards
+
 * `jhora.panchanga.drik`: 
 
 This is the basic module that offers functions for: setting one of 20 ayanamsa modes (Lahiri, KP, True Chitra etc), sunrise/set, moonrise/set, midday/night, day/night length, tithi,karana, yogam, raasi, nakshatra padha, vaara, lunar month, tamil month/date, elapsed year, new moon, samvasatra, ritu, gauri chogadiya, trikalam, durmuhurtham, abhijit muhurta, sidereal longitude of planets, dhasavarga longitude of planets, bhaava madhya, ascendant, declination of planets, longitudes of upagrahas (such as dhuma, vyatipaata, parivesha, indrachapa and upakethu, kaala, mrithyu, artha praharaka, yama ghantaka, gulika and maandi), special lagnas (such as bhava, hora, ghati, vighati, pranapada, indu, bhrigu bindhu, kunda, sree lagna), previous/next sankranti dates, previous/next solar entry dates, previous/next solar/lunar eclipse, birth rectification (BV Raman - experimental work - accuracy not guaranteed though), previous/next occurrence of planet pairs, previous/next planet entry into specified rasi, previous/next retrogression of planets and nisheka (does not match JHora values).
@@ -842,28 +866,6 @@ Modules `khanda khaadyaka`, `surya_sidhantha` are attempts to implement ancient
 * `jhora.panchanga.vratha`: 
 
 Module to find various vratha dates such as pradosham, sankranti, amavasya, pournami, ekadhashi, sashti, sankatahara_chathurthi, vinayaka_chathurthi, shivarathri, chandra_dharshan, moondraam_pirai, srartha, ashtaka, manvaadhi, yugadhi, mahalaya_paksha. There is also a `search` function to find dates matching any combination of tithi, nakshathra, yogam, karana, tamil month.
-* `jhora.ui.chart_styles`: 
-
-This module provides basic PyQt user interface Widgets for South, North, East Indian, Sudharshana Chakra and Western charts.
-* `jhora.ui.conjunction_dialog`: 
-
-This module provides an independent user interface widget to calculate planet conjunctions.
-* `jhora.ui.match_ui`: 
-
-This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
-* `jhora.ui.vakra_gathi`: 
-
-This is just a fun plot widget to show how retrogression of a planet will appear as seen from the earth.
-* `jhora.ui.vratha_finder`: 
-
-This module provides an independent interface widget to find the vratha dates based on combination of inputs such as tithi, nakshathra, yogam, karana, tamil month.
-* `jhora.ui.horo_chart`: 
-
-This is a simple kundali chart PyQt Widget
-* `jhora.ui.horo_chart_tabs`: 
-
-This is the complex user interface PyQt tabbed Widget that can be used to get most of the features offered by this library. Language of UI can be dynamically changed. Various chart/panchanga/divisional chart/dhasa choices can be changed. Results can be saved as a PDF (about 100+ pages).
-
 
 
 Package Structure:
@@ -967,6 +969,21 @@ jhora
       !- unit_tests.py           - unit tests for the features based on examples from the book
       !- pvr_tests.py            - Exercise problems from book.
 ```
+Changes since V3.7.0-post1
+=====================
+Errors fixed due to additional arguments to support custom and mixed charts across the package.
+Unit Tests successfully executed.
+
+`jhora.horoscope.chart.arudhas`: Bhava arudhas can be obtained from any base planet. `bhava_arudhas_from_planet_positions` takes an argument `arudha_base` 0=> Lagna, 1=>Sun...9=>Ketu
+
+`jhora.horoscope.chart.charts`: Updated special lagnas, planets to be obtained for standard, custom and mixed charts. 
+
+`jhora.horoscope.main`:  Changes to support right click menu and other UI elements.
+
+`jhora.panchanga.drik`: Updated special lagnas, planets to be obtained for standard, custom and mixed charts.
+
+`jhora.ui.horo_chart_tabs`: Added right-click context menus on Kundali Charts.
+
 Changes since V3.6.6
 =====================
 Custom Kundali Chart (Dn) and Sub-divisional (mixed) (DmxDn) charts added to `jhora.horoscope.chart.charts`

{pyjhora-3.7.0 → pyjhora-3.7.3}/src/PyJHora.egg-info/SOURCES.txt

@@ -189,7 +189,6 @@ src/jhora/ui/__init__.py
 src/jhora/ui/chart_styles.py
 src/jhora/ui/conjunction_dialog.py
 src/jhora/ui/dhasa_bhukthi_options_dialog.py
-src/jhora/ui/horo_chart.py
 src/jhora/ui/horo_chart_tabs.py
 src/jhora/ui/label_grid.py
 src/jhora/ui/match_ui.py

{pyjhora-3.7.0 → pyjhora-3.7.3/src/jhora}/README.md

@@ -1,4 +1,4 @@
-JHora 3.7.0
+JHora 3.7.3
 =================
 Python package containing almost all the features described in the book
 
@@ -92,6 +92,30 @@ Click Show PDF to save the screen as a PDF file
 
 
 #### List of Features
+* `jhora.ui.chart_styles`: 
+
+This module provides basic PyQt user interface Widgets for South, North, East Indian, Sudharshana Chakra and Western charts.
+* `jhora.ui.conjunction_dialog`: 
+
+This module provides an independent user interface widget to calculate planet conjunctions.
+* `jhora.ui.match_ui`: 
+
+This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
+* `jhora.ui.vakra_gathi`: 
+
+This is just a fun plot widget to show how retrogression of a planet will appear as seen from the earth.
+* `jhora.ui.vratha_finder`: 
+
+This module provides an independent interface widget to find the vratha dates based on combination of inputs such as tithi, nakshathra, yogam, karana, tamil month.
+* `jhora.ui.horo_chart_tabs`: 
+
+This is the complex user interface PyQt tabbed Widget that can be used to get most of the features offered by this library. Language of UI can be dynamically changed. Various chart/panchanga/divisional chart/dhasa choices can be changed. Results can be saved as a PDF (about 100+ pages).
+Added right-click-context menu for all the chart widgets. Right click to view Arudhas, Upagrahas, Special Lagnas, Arudha Lagnas, Varnada Lagnas.
+
+* `jhora.ui.horo_chart`: 
+
+REMOVED FROM V3.7.3 onwards
+
 * `jhora.panchanga.drik`: 
 
 This is the basic module that offers functions for: setting one of 20 ayanamsa modes (Lahiri, KP, True Chitra etc), sunrise/set, moonrise/set, midday/night, day/night length, tithi,karana, yogam, raasi, nakshatra padha, vaara, lunar month, tamil month/date, elapsed year, new moon, samvasatra, ritu, gauri chogadiya, trikalam, durmuhurtham, abhijit muhurta, sidereal longitude of planets, dhasavarga longitude of planets, bhaava madhya, ascendant, declination of planets, longitudes of upagrahas (such as dhuma, vyatipaata, parivesha, indrachapa and upakethu, kaala, mrithyu, artha praharaka, yama ghantaka, gulika and maandi), special lagnas (such as bhava, hora, ghati, vighati, pranapada, indu, bhrigu bindhu, kunda, sree lagna), previous/next sankranti dates, previous/next solar entry dates, previous/next solar/lunar eclipse, birth rectification (BV Raman - experimental work - accuracy not guaranteed though), previous/next occurrence of planet pairs, previous/next planet entry into specified rasi, previous/next retrogression of planets and nisheka (does not match JHora values).
@@ -163,28 +187,6 @@ Modules `khanda khaadyaka`, `surya_sidhantha` are attempts to implement ancient
 * `jhora.panchanga.vratha`: 
 
 Module to find various vratha dates such as pradosham, sankranti, amavasya, pournami, ekadhashi, sashti, sankatahara_chathurthi, vinayaka_chathurthi, shivarathri, chandra_dharshan, moondraam_pirai, srartha, ashtaka, manvaadhi, yugadhi, mahalaya_paksha. There is also a `search` function to find dates matching any combination of tithi, nakshathra, yogam, karana, tamil month.
-* `jhora.ui.chart_styles`: 
-
-This module provides basic PyQt user interface Widgets for South, North, East Indian, Sudharshana Chakra and Western charts.
-* `jhora.ui.conjunction_dialog`: 
-
-This module provides an independent user interface widget to calculate planet conjunctions.
-* `jhora.ui.match_ui`: 
-
-This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
-* `jhora.ui.vakra_gathi`: 
-
-This is just a fun plot widget to show how retrogression of a planet will appear as seen from the earth.
-* `jhora.ui.vratha_finder`: 
-
-This module provides an independent interface widget to find the vratha dates based on combination of inputs such as tithi, nakshathra, yogam, karana, tamil month.
-* `jhora.ui.horo_chart`: 
-
-This is a simple kundali chart PyQt Widget
-* `jhora.ui.horo_chart_tabs`: 
-
-This is the complex user interface PyQt tabbed Widget that can be used to get most of the features offered by this library. Language of UI can be dynamically changed. Various chart/panchanga/divisional chart/dhasa choices can be changed. Results can be saved as a PDF (about 100+ pages).
-
 
 
 Package Structure:
@@ -288,6 +290,21 @@ jhora
       !- unit_tests.py           - unit tests for the features based on examples from the book
       !- pvr_tests.py            - Exercise problems from book.
 ```
+Changes since V3.7.0-post1
+=====================
+Errors fixed due to additional arguments to support custom and mixed charts across the package.
+Unit Tests successfully executed.
+
+`jhora.horoscope.chart.arudhas`: Bhava arudhas can be obtained from any base planet. `bhava_arudhas_from_planet_positions` takes an argument `arudha_base` 0=> Lagna, 1=>Sun...9=>Ketu
+
+`jhora.horoscope.chart.charts`: Updated special lagnas, planets to be obtained for standard, custom and mixed charts. 
+
+`jhora.horoscope.main`:  Changes to support right click menu and other UI elements.
+
+`jhora.panchanga.drik`: Updated special lagnas, planets to be obtained for standard, custom and mixed charts.
+
+`jhora.ui.horo_chart_tabs`: Added right-click context menus on Kundali Charts.
+
 Changes since V3.6.6
 =====================
 Custom Kundali Chart (Dn) and Sub-divisional (mixed) (DmxDn) charts added to `jhora.horoscope.chart.charts`

{pyjhora-3.7.0 → pyjhora-3.7.3}/src/jhora/_package_info.py

@@ -18,7 +18,7 @@
 
 name = "PyJHora"
 
-version = "3.6.9"
+version = "3.7.4"
 
 author = "Sundar Sundaresan"
 

{pyjhora-3.7.0 → pyjhora-3.7.3}/src/jhora/const.py

@@ -653,5 +653,8 @@ DEFAULT_CUSTOM_VARGA_FACTOR=57
 # If True standard vargas such as D2,D3 etc will follow custom calculations and not standard calculations
 """ DO NOT CHANGE THIS TO TRUE. NOT IMPLEMENTED YET """
 TREAT_STANDARD_CHART_AS_CUSTOM = False
+_bhava_arudha_list = ['bhava_arudha_str','sun_arudha','moon_arudha','mars_arudha','mercury_arudha','jupiter_arudha',
+                      'venus_arudha','saturn_arudha','rahu_arudha','ketu_arudha']
+
 if __name__ == "__main__":
     pass

{pyjhora-3.7.0 → pyjhora-3.7.3}/src/jhora/horoscope/chart/arudhas.py

@@ -20,20 +20,24 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from jhora import const, utils
 from jhora.horoscope.chart import house
-def bhava_arudhas_from_planet_positions(planet_positions):
+def bhava_arudhas_from_planet_positions(planet_positions,arudha_base=0):
     """
         gives Bhava Arudhas for each house from the chart (A1=Arudha Lagna,A2.. A12=Upa Lagna)
         @param planet_positions: Planet Positions in the format: \
         [ [planet,[rasi,longitude]], [[,]].., [[,]]]
-        @return bhava arudhas of houses. first element is for the first house from lagna and so on
+        @param arudha_base: (0=Lagna, 1=Sun, 2=Moon, 3=Mars, 4=Mercury, 5=Jupiter, 6=Venus, 7=Saturn, 8=Rahu, 9=Ketu)
+            0 = Lagna - will return A1, A2, ... A12
+            1 = Sun - will return Surya Arudhas S1, S2,... S12
+            2 = Moon - will return Chandra Arudhas M1, M2, .. M12
+        @return bhava arudhas of houses. first element is rasi for the first house from arudha base and so on
     """
     """ V3.6.4 Below line is crucial. If Uranus/Netp/Pluto included wrong A1..A12 results
         So planet_positions restricted [:const._pp_count_upto_ketu] """
     planet_positions = planet_positions[:const._pp_count_upto_ketu]
     h_to_p = utils.get_house_planet_list_from_planet_positions(planet_positions)
     p_to_h = utils.get_planet_to_house_dict_from_chart(h_to_p)
-    asc_house = p_to_h[const._ascendant_symbol]
-    houses = [(h+asc_house)%12 for h in range(12)]
+    base_house = planet_positions[arudha_base][1][0]
+    houses = [(h+base_house)%12 for h in range(12)]
     bhava_arudhas_of_houses =[]
     for h in houses:
         lord_of_the_house = house.house_owner_from_planet_positions(planet_positions, h, check_during_dhasa=False)
@@ -45,6 +49,10 @@ def bhava_arudhas_from_planet_positions(planet_positions):
             bhava_arudha_of_house = (bhava_arudha_of_house+10-1)%12
         bhava_arudhas_of_houses.append(bhava_arudha_of_house)
     return bhava_arudhas_of_houses
+def surya_arudhas_from_planet_positions(planet_positions):
+    return bhava_arudhas_from_planet_positions(planet_positions, arudha_base=1)
+def chandra_arudhas_from_planet_positions(planet_positions):
+    return bhava_arudhas_from_planet_positions(planet_positions, arudha_base=2)
 def bhava_arudhas(chart):
     """
         gives Bhava Arudhas for each house from the chart (A1=Arudha Lagna,A2.. A12=Upa Lagna)
@@ -73,11 +81,11 @@ def graha_arudhas_from_planet_positions(planet_positions):
         gives Graha Arudhas for each planet from the planet positions
         @param planet_positions: Planet Positions in the format: \
         [ [planet,[rasi,longitude]], [[,]].., [[,]]]
-        @return graha arudhas of planet. first element is for Sun, last element is for Ketu
+        @return graha arudhas of planet. first element is for Lagnam, then Sun,Moon.. last element is for Ketu
     """
     h_to_p = utils.get_house_planet_list_from_planet_positions(planet_positions)
     p_to_h = utils.get_planet_to_house_dict_from_chart(h_to_p)
-    graha_arudhas_of_planets = []
+    graha_arudhas_of_planets = [p_to_h[const._ascendant_symbol]]
     for p in range(const._planets_upto_ketu):
         house_of_the_planet = p_to_h[p]
         sign_owned_by_planet = const.house_lords_dict[p]
@@ -102,7 +110,7 @@ def graha_arudhas(chart):
     """
     h_to_p = chart[:]
     p_to_h = utils.get_planet_to_house_dict_from_chart(h_to_p)
-    graha_arudhas_of_planets = []
+    graha_arudhas_of_planets = [p_to_h[const._ascendant_symbol]]
     for p in range(const._planets_upto_ketu):
         house_of_the_planet = p_to_h[p]
         sign_owned_by_planet = const.house_lords_dict[p]
@@ -120,15 +128,32 @@ def graha_arudhas(chart):
     return graha_arudhas_of_planets
     
 if __name__ == "__main__":
-    """
+    #"""
     from jhora.panchanga import drik
     dob = (1996,12,7); tob = (10,34,0); place = drik.Place('Chennai',13.0878,80.2785,5.5) 
-    jd = utils.julian_day_number(dob, tob); dcf = 1
+    jd = utils.julian_day_number(dob, tob); dcf = 1; arudha_base = 1;
+    arudha_base_list = ['A','Su','Mo','Ma','Me','Ju','Ve','Sa','Ra','Ke']
     from jhora.horoscope.chart import charts
     planet_positions = charts.divisional_chart(jd, place, divisional_chart_factor=dcf)
-    ba = bhava_arudhas_from_planet_positions(planet_positions)
-    print(ba); exit()
-    """
+    ba = bhava_arudhas_from_planet_positions(planet_positions,arudha_base=arudha_base)
+    ba_chart = ['' for _ in range(12)]
+    astr = arudha_base_list[arudha_base]
+    for p,r in enumerate(ba):
+        ba_chart[r] += astr+str(p+1)+'/'
+    for b in range(len(ba_chart)):
+        if ba_chart[b] != '' and ba_chart[b][-1]=='/': ba_chart[b] = ba_chart[b][:-1]
+    print(ba)
+    print(ba_chart)
+    ga = graha_arudhas_from_planet_positions(planet_positions)
+    print(ga)
+    ga_chart = ['' for _ in range(12)]
+    for p,r in enumerate(ga):
+        ga_chart[r] += 'L/' if p==0 else str(p-1)+'/'
+    for b in range(len(ga_chart)):
+        if ga_chart[b] != '' and ga_chart[b][-1]=='/': ga_chart[b] = ga_chart[b][:-1]
+    print(ga_chart)
+    exit()
+    #"""
     from jhora.tests import pvr_tests
     utils.set_language('en')
     pvr_tests._STOP_IF_ANY_TEST_FAILED = False

{pyjhora-3.7.0 → pyjhora-3.7.3}/src/jhora/horoscope/chart/charts.py

@@ -1337,11 +1337,13 @@ def _varnada_lagna_sanjay_rath_mixed_chart(dob,tob, place,house_index=1,varga_fa
     if _debug_: print('return drik dasavarg',dl)
     return dl    
 def _varnada_lagna_sanjay_rath(dob,tob, place,house_index=1, ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,
-                               divisional_chart_factor=1,chart_method=1):
+                               divisional_chart_factor=1,chart_method=1,
+                                       base_rasi=None,count_from_end_of_sign=None):
     """ TO DO : Still experimenting """
     jd_at_dob = utils.julian_day_number(dob, tob)
     planet_positions = divisional_chart(jd_at_dob, place,ayanamsa_mode=ayanamsa_mode,divisional_chart_factor=divisional_chart_factor,
-                                        chart_method=chart_method)
+                                        chart_method=chart_method,base_rasi=base_rasi,
+                                        count_from_end_of_sign=count_from_end_of_sign)
     asc_sign = planet_positions[0][1][0];asc_long = planet_positions[0][1][1]
     asc_sign = (asc_sign+house_index-1)%12
     asc_long = asc_sign*30+asc_long
@@ -1393,11 +1395,14 @@ def _varnada_lagna_jha_pandey_mixed_chart(dob,tob, place,house_index=1,varga_fac
     #print(asc_long,hora_long,count_is_odd,vl)
     dl = drik.dasavarga_from_long(vl, divisional_chart_factor=1)
     return dl
-def _varnada_lagna_jha_pandey(dob,tob, place,house_index=1,ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,divisional_chart_factor=1,chart_method=1):
+def _varnada_lagna_jha_pandey(dob,tob, place,house_index=1,ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,
+                              divisional_chart_factor=1,chart_method=1,base_rasi=None,
+                              count_from_end_of_sign=None):
     """ TO DO : Still experimenting """
     jd_at_dob = utils.julian_day_number(dob, tob)
     planet_positions = divisional_chart(jd_at_dob, place,ayanamsa_mode=ayanamsa_mode,divisional_chart_factor=divisional_chart_factor,
-                                        chart_method=chart_method)
+                                        chart_method=chart_method,base_rasi=base_rasi,
+                                        count_from_end_of_sign=count_from_end_of_sign)
     asc_sign = planet_positions[0][1][0];asc_long = planet_positions[0][1][1]
     lagna = (asc_sign+house_index-1)%12
     asc_long = lagna*30+asc_long
@@ -1687,7 +1692,8 @@ def special_planet_longitudes_mixed_chart(dob,tob,place,varga_factor_1=1,chart_m
             eval(divisional_chart_functions[varga_factor_1]+'(spl_planet_positions_in_rasi,chart_method=chart_method_1)')
     pp2 = pp1 if varga_factor_2==2 else eval(divisional_chart_functions[varga_factor_2]+'(pp1,chart_method=chart_method_2)')
     return pp2
-def special_planet_longitudes(dob,tob,place,divisional_chart_factor=1,chart_method=1):
+def special_planet_longitudes(dob,tob,place,divisional_chart_factor=1,chart_method=None,
+                              base_rasi=None,count_from_end_of_sign=None):
     jd_at_dob = utils.julian_day_number(dob, tob)
     sub_planet_list_1 = {'Kl':'kaala_longitude','Mr':'mrityu_longitude','Ap':'artha_praharaka_longitude','Yg':'yama_ghantaka_longitude',
                        'Gk':'gulika_longitude','Md':'maandi_longitude'}
@@ -1695,17 +1701,28 @@ def special_planet_longitudes(dob,tob,place,divisional_chart_factor=1,chart_meth
     for sp,sp_func in sub_planet_list_1.items():
         v = eval('drik.'+sp_func+'(dob,tob,place)')
         spl_rasi_positions.append([sp,[v[0],v[1]]]) 
+    #"""
     sub_planet_list_2 = {'Dm':'dhuma','Vp':'vyatipaata','Pv':'parivesha','Ic':'indrachaapa','Uk':'upaketu'}
     sun_long = rasi_chart(jd_at_dob, place)[1][1]; sun_long = sun_long[0]*30+sun_long[1]
     for sp,sp_func in sub_planet_list_2.items():
         eval_str = "drik.solar_upagraha_longitudes(sun_long,upagraha='"+str(sp_func)+"')"
         v = eval(eval_str)
         spl_rasi_positions.append([sp,[v[0],v[1]]]) 
+    #"""
     if divisional_chart_factor==1: return spl_rasi_positions
-    return eval(divisional_chart_functions[divisional_chart_factor]+'(spl_rasi_positions,chart_method=chart_method)')
-def special_lagna_longitudes(dob,tob,place,divisional_chart_factor=1,chart_method=1):
+    if (not const.TREAT_STANDARD_CHART_AS_CUSTOM) and (divisional_chart_factor in divisional_chart_functions.keys()\
+            and (base_rasi==None and (chart_method !=None and chart_method >0) )):
+        return eval(divisional_chart_functions[divisional_chart_factor]+'(spl_rasi_positions,chart_method)')
+    elif divisional_chart_factor in range(1,const.MAX_DHASAVARGA_FACTOR+1):
+        return custom_divisional_chart(spl_rasi_positions, divisional_chart_factor=divisional_chart_factor,
+                    chart_method=chart_method,base_rasi=base_rasi,count_from_end_of_sign=count_from_end_of_sign)
+    else:
+        print('Chart division factor',divisional_chart_factor,'not supported')
+        return None
+def special_lagna_longitudes(dob,tob,place,divisional_chart_factor=1,chart_method=1,
+                             base_rasi=None,count_from_end_of_sign=None):
     jd_at_dob = utils.julian_day_number(dob, tob)
-    """ For now let us comment this here as there is longitude for arudha lagna
+    """ For now let us comment this here as there is no longitude for arudha lagna
     _sp_lagna_list = ['AL']+['A'+str(l) for l in range(2,12)]+['UL']
     spl_rasi_positions = []
     from jhora.horoscope.chart import arudhas
@@ -1751,10 +1768,14 @@ def _amsa(jd,place,ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,divisional_chart_f
                              chart_method=chart_method,base_rasi=base_rasi,
                              count_from_end_of_sign=count_from_end_of_sign)
         __amsa_special['indu_lagna_str'] = _get_amsa_index_from_longitude(il[1])
-        bl = drik.bhrigu_bindhu(jd, place,ayanamsa_mode=ayanamsa_mode, divisional_chart_factor=divisional_chart_factor,
+        bl = drik.bhrigu_bindhu_lagna(jd, place,ayanamsa_mode=ayanamsa_mode, divisional_chart_factor=divisional_chart_factor,
                                 chart_method=chart_method,base_rasi=base_rasi,
                                 count_from_end_of_sign=count_from_end_of_sign)
         __amsa_special['bhrigu_bindhu_lagna_str'] = _get_amsa_index_from_longitude(bl[1])
+        kl = drik.kunda_lagna(jd, place,ayanamsa_mode=ayanamsa_mode, divisional_chart_factor=divisional_chart_factor,
+                                chart_method=chart_method,base_rasi=base_rasi,
+                                count_from_end_of_sign=count_from_end_of_sign)
+        __amsa_special['kunda_lagna_str'] = _get_amsa_index_from_longitude(kl[1])
         sl = drik.sree_lagna(jd, place,ayanamsa_mode=ayanamsa_mode, divisional_chart_factor=divisional_chart_factor,
                              base_rasi=base_rasi,count_from_end_of_sign=count_from_end_of_sign)
         __amsa_special['sree_lagna_str'] = _get_amsa_index_from_longitude(sl[1])
@@ -1790,10 +1811,15 @@ if __name__ == "__main__":
     jd = utils.julian_day_number(dob, tob)
     #"""
     varga_factor_1=9; chart_method_1=1;varga_factor_2 = 12; chart_method_2=1
-    planet_positions_in_rasi = rasi_chart(jd,place)
-    mpp = special_planet_longitudes_mixed_chart(dob, tob, place, varga_factor_1, chart_method_1, varga_factor_2, chart_method_2)
+    #dcf = 9; chart_method = 1; base_rasi=None; count_from_end_of_sign=None
+    #planet_positions_in_rasi = rasi_chart(jd,place)
+    mpp = special_planet_longitudes_mixed_chart(dob, tob, place, varga_factor_1=varga_factor_1, chart_method_1=chart_method_1,
+                                                varga_factor_2=varga_factor_2, chart_method_2=chart_method_2)
+    #mpp = special_planet_longitudes(dob, tob, place, divisional_chart_factor=dcf, chart_method=chart_method,
+    #                                base_rasi=base_rasi, count_from_end_of_sign=count_from_end_of_sign)
     print(mpp)
     print('D-'+str(varga_factor_1)+'XD-'+str(varga_factor_2),utils.get_house_planet_list_from_planet_positions(mpp))
+    #print('D-'+str(dcf),utils.get_house_planet_list_from_planet_positions(mpp))
     exit()
     #"""
     #dvf =300; planet_positions_in_rasi = rasi_chart(jd, place); f1 = 30.0/dvf

{pyjhora-3.7.0 → pyjhora-3.7.3}/src/jhora/horoscope/chart/house.py

@@ -1110,15 +1110,14 @@ def order_of_planets_by_strength(planet_positions):
         return -1 if sp==planet1 else 1 #Left stronger = -1 ; right stronger = +1
     return sorted(planets, key=cmp_to_key(compare))
 if __name__ == "__main__":
-    print(kendras()); exit()
     from jhora.horoscope.chart import charts
     utils.set_language('en')
     dob = (1996,12,7); tob = (10,34,0);place_as_tuple = drik.Place('Chennai, India',13.0878,80.2785,5.5)
     #dob = (1836,2,18); tob = (6,44,0); place_as_tuple = drik.Place('kamarpukur, India',22+53/60,87+44/60,6.0)
     #dob = (1879,12,30); tob = (1,0,0); place_as_tuple = drik.Place('Pondy?, India',9+50/60,78+15/60,6.0)
-    dcf = 20
+    dcf = 1
     jd_at_dob = utils.julian_day_number(dob, tob)
-    planet_positions = charts.divisional_chart(jd_at_dob, place_as_tuple, divisional_chart_factor=dcf)
+    planet_positions = charts.divisional_chart(jd_at_dob, place_as_tuple, divisional_chart_factor=dcf,chart_method=1)
     ck = chara_karakas(planet_positions); print(ck)
     print('strength ordered planets',order_of_planets_by_strength(planet_positions))
     exit()