PyJHora 3.7.3__tar.gz → 3.7.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyJHora
-Version: 3.7.3
+Version: 3.7.4
 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.3
+JHora 3.7.4
 =================
 Python package containing almost all the features described in the book
 
@@ -771,12 +771,26 @@ Click Show PDF to save the screen as a PDF file
 
 
 #### List of Features
+* `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). Varnada Lagna and Sphuta to chart information.
+Added right-click-context menu for all the chart widgets. Right click to view Arudhas, Upagrahas, Special Lagnas, Arudha Lagnas, Varnada Lagnas and Sphutas.
+
 * `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.dhasa_bhkthi_options_dialog`: 
+
+This module provides an independent user interface widget provide options for each dhasa type.
+* `jhora.ui.mixed_chart_dialog`: 
+
+This module provides an independent user interface widget to options of mixed charts.
+* `jhora.ui.options_dialog`: 
+
+This module provides an independent generic user interface widget provide chart/varnada options.
 * `jhora.ui.match_ui`: 
 
 This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
@@ -786,10 +800,6 @@ This is just a fun plot widget to show how retrogression of a planet will appear
 * `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`: 
 
@@ -971,6 +981,7 @@ jhora
 ```
 Changes since V3.7.0-post1
 =====================
+Errors in 3.7.0 UI - fixed. Added Sphuta and Varnada Lagna for right click and chart information.
 Errors fixed due to additional arguments to support custom and mixed charts across the package.
 Unit Tests successfully executed.
 

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

@@ -1,4 +1,4 @@
-JHora 3.7.3
+JHora 3.7.4
 =================
 Python package containing almost all the features described in the book
 
@@ -92,12 +92,26 @@ Click Show PDF to save the screen as a PDF file
 
 
 #### List of Features
+* `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). Varnada Lagna and Sphuta to chart information.
+Added right-click-context menu for all the chart widgets. Right click to view Arudhas, Upagrahas, Special Lagnas, Arudha Lagnas, Varnada Lagnas and Sphutas.
+
 * `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.dhasa_bhkthi_options_dialog`: 
+
+This module provides an independent user interface widget provide options for each dhasa type.
+* `jhora.ui.mixed_chart_dialog`: 
+
+This module provides an independent user interface widget to options of mixed charts.
+* `jhora.ui.options_dialog`: 
+
+This module provides an independent generic user interface widget provide chart/varnada options.
 * `jhora.ui.match_ui`: 
 
 This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
@@ -107,10 +121,6 @@ This is just a fun plot widget to show how retrogression of a planet will appear
 * `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`: 
 
@@ -292,6 +302,7 @@ jhora
 ```
 Changes since V3.7.0-post1
 =====================
+Errors in 3.7.0 UI - fixed. Added Sphuta and Varnada Lagna for right click and chart information.
 Errors fixed due to additional arguments to support custom and mixed charts across the package.
 Unit Tests successfully executed.
 

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyJHora
-Version: 3.7.3
+Version: 3.7.4
 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.3
+JHora 3.7.4
 =================
 Python package containing almost all the features described in the book
 
@@ -771,12 +771,26 @@ Click Show PDF to save the screen as a PDF file
 
 
 #### List of Features
+* `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). Varnada Lagna and Sphuta to chart information.
+Added right-click-context menu for all the chart widgets. Right click to view Arudhas, Upagrahas, Special Lagnas, Arudha Lagnas, Varnada Lagnas and Sphutas.
+
 * `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.dhasa_bhkthi_options_dialog`: 
+
+This module provides an independent user interface widget provide options for each dhasa type.
+* `jhora.ui.mixed_chart_dialog`: 
+
+This module provides an independent user interface widget to options of mixed charts.
+* `jhora.ui.options_dialog`: 
+
+This module provides an independent generic user interface widget provide chart/varnada options.
 * `jhora.ui.match_ui`: 
 
 This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
@@ -786,10 +800,6 @@ This is just a fun plot widget to show how retrogression of a planet will appear
 * `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`: 
 
@@ -971,6 +981,7 @@ jhora
 ```
 Changes since V3.7.0-post1
 =====================
+Errors in 3.7.0 UI - fixed. Added Sphuta and Varnada Lagna for right click and chart information.
 Errors fixed due to additional arguments to support custom and mixed charts across the package.
 Unit Tests successfully executed.
 

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

@@ -1,4 +1,4 @@
-JHora 3.7.3
+JHora 3.7.4
 =================
 Python package containing almost all the features described in the book
 
@@ -92,12 +92,26 @@ Click Show PDF to save the screen as a PDF file
 
 
 #### List of Features
+* `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). Varnada Lagna and Sphuta to chart information.
+Added right-click-context menu for all the chart widgets. Right click to view Arudhas, Upagrahas, Special Lagnas, Arudha Lagnas, Varnada Lagnas and Sphutas.
+
 * `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.dhasa_bhkthi_options_dialog`: 
+
+This module provides an independent user interface widget provide options for each dhasa type.
+* `jhora.ui.mixed_chart_dialog`: 
+
+This module provides an independent user interface widget to options of mixed charts.
+* `jhora.ui.options_dialog`: 
+
+This module provides an independent generic user interface widget provide chart/varnada options.
 * `jhora.ui.match_ui`: 
 
 This module provides an independent user interface widget to calculate marriage compatibility of boy/girl
@@ -107,10 +121,6 @@ This is just a fun plot widget to show how retrogression of a planet will appear
 * `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`: 
 
@@ -292,6 +302,7 @@ jhora
 ```
 Changes since V3.7.0-post1
 =====================
+Errors in 3.7.0 UI - fixed. Added Sphuta and Varnada Lagna for right click and chart information.
 Errors fixed due to additional arguments to support custom and mixed charts across the package.
 Unit Tests successfully executed.
 

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

@@ -1445,13 +1445,21 @@ def varnada_lagna_mixed_chart(dob,tob,place,ayanamsa_mode=const._DEFAULT_AYANAMS
         @return varna_lagna_rasi, varnada_lagna_longitude 
     """
     if varnada_method==1:
-        return _varnada_lagna_bv_raman_mixed_chart(dob, tob, place, house_index, varga_factor_1, chart_method_1, varga_factor_2, chart_method_2)
+        return _varnada_lagna_bv_raman_mixed_chart(dob, tob, place, house_index=house_index,
+                        varga_factor_1=varga_factor_1, chart_method_1=chart_method_2, varga_factor_2=varga_factor_2,
+                        chart_method_2=chart_method_2)
     elif varnada_method==2:
-        return _varnada_lagna_sharma_mixed_chart(dob, tob, place, house_index, varga_factor_1, chart_method_1, varga_factor_2, chart_method_2)
+        return _varnada_lagna_sharma_mixed_chart(dob, tob, place, house_index=house_index,
+                        varga_factor_1=varga_factor_1, chart_method_1=chart_method_2, varga_factor_2=varga_factor_2,
+                        chart_method_2=chart_method_2)
     elif varnada_method==3:
-        return _varnada_lagna_sanjay_rath_mixed_chart(dob, tob, place, house_index, varga_factor_1, chart_method_1, varga_factor_2, chart_method_2)
+        return _varnada_lagna_sanjay_rath_mixed_chart(dob, tob, place, house_index=house_index,
+                        varga_factor_1=varga_factor_1, chart_method_1=chart_method_2, varga_factor_2=varga_factor_2,
+                        chart_method_2=chart_method_2)
     elif varnada_method==4:
-        return _varnada_lagna_jha_pandey_mixed_chart(dob, tob, place, house_index, varga_factor_1, chart_method_1, varga_factor_2, chart_method_2)
+        return _varnada_lagna_jha_pandey_mixed_chart(dob, tob, place, house_index=house_index,
+                        varga_factor_1=varga_factor_1, chart_method_1=chart_method_2, varga_factor_2=varga_factor_2,
+                        chart_method_2=chart_method_2)
 def varnada_lagna(dob,tob,place,ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,divisional_chart_factor=1,
                   chart_method=1,house_index=1,varnada_method=1,base_rasi=None,count_from_end_of_sign=None):
     """

{pyjhora-3.7.3 → pyjhora-3.7.4}/src/jhora/horoscope/main.py

@@ -261,7 +261,7 @@ class Horoscope():
             h += 1
         return _bhava_chart,_bhava_chart_info
     def get_horoscope_information_for_chart(self,chart_index=0,chart_method=1,divisional_chart_factor=None,
-                                            base_rasi=None,count_from_end_of_sign=None):
+                                            base_rasi=None,count_from_end_of_sign=None,varnada_method=1):
         horoscope_info = {}
         self._vimsottari_balance = ();self._yoga_vimsottari_balance = ()
         self._arudha_lagna_data_kundali = {}
@@ -435,6 +435,19 @@ class Horoscope():
             k = key_dhasa_factor+'-'+cal_key_list[sp+'_str']+' ('+cal_key_list[sp+'_short_str']+')'
             v = eval('charts.'+'solar_upagraha_longitudes(planet_positions,sp,divisional_chart_factor=dhasavarga_factor)') # Fixed in V3.6.9
             horoscope_info[k] = utils.RAASI_LIST[v[0]] +' '+utils.to_dms(v[1],is_lat_long='plong')
+        for h in range(12):
+            vl = charts.varnada_lagna(dob, tob, place, divisional_chart_factor=dhasavarga_factor,
+                                      chart_method=chart_method, house_index=h+1, varnada_method=varnada_method,
+                                      base_rasi=base_rasi, count_from_end_of_sign=count_from_end_of_sign)
+            k = key_dhasa_factor+'-'+cal_key_list['varnada_lagna_str']+' (V'+str(h+1)+')'
+            horoscope_info[k] = utils.RAASI_LIST[vl[0]] +' '+utils.to_dms(vl[1],is_lat_long='plong') 
+        spl_list = ['tri','chatur','pancha','prana','deha','mrityu','sookshma_tri','beeja','kshetra','tithi','yoga',
+                    'yogi','avayogi','rahu_tithi']
+        for spl in spl_list:
+            from jhora.horoscope.chart import sphuta
+            vl = eval('sphuta.'+spl+'_sphuta(dob,tob,place,divisional_chart_factor=dhasavarga_factor,chart_method=chart_method,base_rasi=base_rasi,count_from_end_of_sign=count_from_end_of_sign)')
+            k = key_dhasa_factor+'-'+cal_key_list[spl+'_sphuta_str']
+            horoscope_info[k] = utils.RAASI_LIST[vl[0]] +' '+utils.to_dms(vl[1],is_lat_long='plong') 
         return horoscope_info, horoscope_charts,horoscope_ascendant_house
     def get_special_planets_for_chart(self,jd,place,divisional_chart_factor=1,chart_method=1,
                                             base_rasi=None,count_from_end_of_sign=None):
@@ -463,7 +476,8 @@ class Horoscope():
         for sp,(h,_) in spl:
             _special_planet_chart[h] += cal_key_list[sub_planet_list[sp].replace('_str','_short_str')]+'\n'
         return {cal_key_list['upagraha_str']:_special_planet_chart}
-    def get_horoscope_information_for_mixed_chart(self,chart_index_1=0,chart_method_1=1,chart_index_2=0,chart_method_2=1):
+    def get_horoscope_information_for_mixed_chart(self,chart_index_1=0,chart_method_1=1,chart_index_2=0,
+                                                  chart_method_2=1,varnada_method=1):
         horoscope_info = {}
         self._arudha_lagna_data_kundali = {}
         self._sphuta_data_kundali = {}
@@ -599,10 +613,22 @@ class Horoscope():
                                         chart_method_2=chart_method_2)
         self._special_planet_chart = ['' for _ in range(12)]
         for sp,(h,long) in spl:
-            k = key_dhasa_factor+'-'+cal_key_list[sub_planet_list[sp]]+' ('+cal_key_list[sp.replace('_str','_short_str')]+')'
+            k = key_dhasa_factor+'-'+cal_key_list[sub_planet_list[sp]]+' ('+cal_key_list[sub_planet_list[sp].replace('_str','_short_str')]+')'
             horoscope_info[k] = utils.RAASI_LIST[h] +' '+utils.to_dms(long,is_lat_long='plong')
             self._special_planet_chart[h] += cal_key_list[sub_planet_list[sp].replace('_str','_short_str')]+'\n'
-        #print(dhasavarga_factor_1,dhasavarga_factor_2,self._special_planet_chart)
+        for h in range(12):
+            vl = charts.varnada_lagna_mixed_chart(dob, tob, place, ayanamsa_mode=self.ayanamsa_mode, house_index=h+1,
+                        varga_factor_1=dhasavarga_factor_1,chart_method_1=chart_method_1,
+                        varga_factor_2=dhasavarga_factor_2,chart_method_2=chart_method_2,varnada_method=varnada_method)
+            k = key_dhasa_factor+'-'+cal_key_list['varnada_lagna_str']+' (V'+str(h+1)+')'
+            horoscope_info[k] = utils.RAASI_LIST[vl[0]] +' '+utils.to_dms(vl[1],is_lat_long='plong') 
+        spl_list = ['tri','chatur','pancha','prana','deha','mrityu','sookshma_tri','beeja','kshetra','tithi','yoga',
+                    'yogi','avayogi','rahu_tithi']
+        for spl in spl_list:
+            from jhora.horoscope.chart import sphuta
+            vl = vl = eval('sphuta.'+spl+'_sphuta_mixed_chart(dob,tob,place, varga_factor_1=dhasavarga_factor_1, chart_method_1=chart_method_1, varga_factor_2=dhasavarga_factor_2, chart_method_2=chart_method_2)')
+            k = key_dhasa_factor+'-'+cal_key_list[spl+'_sphuta_str']
+            horoscope_info[k] = utils.RAASI_LIST[vl[0]] +' '+utils.to_dms(vl[1],is_lat_long='plong') 
         return horoscope_info, horoscope_charts,horoscope_ascendant_house
     def get_horoscope_information(self):#,language='en'):
         horoscope_info = {}
@@ -947,7 +973,7 @@ class Horoscope():
         from jhora.horoscope.chart import sphuta
         _sphuta_dict = {}
         for s in const.sphuta_list:
-            key = self.cal_key_list[s+'_sphuta_str']+' '+self.cal_key_list['sphuta_str']
+            key = self.cal_key_list[s+'_sphuta_str']+' '+self.cal_key_list['sphuta_str']+' ('+self.cal_key_list[s+'_sphuta_short_str']+')'
             fn = 'sphuta.'+s+'_sphuta_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)'
             value = eval(fn)
             _sphuta_dict[key] = utils.RAASI_LIST[value[0]]+' '+utils.to_dms(value[1], is_lat_long='plong')
@@ -958,7 +984,7 @@ class Horoscope():
         from jhora.horoscope.chart import sphuta
         _sphuta_dict = {}
         for s in const.sphuta_list:
-            key = self.cal_key_list[s+'_sphuta_str']+' '+self.cal_key_list['sphuta_str']
+            key = self.cal_key_list[s+'_sphuta_str']+' '+self.cal_key_list['sphuta_str']+' ('+self.cal_key_list[s+'_sphuta_short_str']+')'
             fn = 'sphuta.'+s+'_sphuta(dob,tob,place,divisional_chart_factor=divisional_chart_factor,chart_method=chart_method,base_rasi=base_rasi,count_from_end_of_sign=count_from_end_of_sign)'
             value = eval(fn)
             _sphuta_dict[key] = utils.RAASI_LIST[value[0]]+' '+utils.to_dms(value[1], is_lat_long='plong')
@@ -969,7 +995,7 @@ class Horoscope():
         jd_at_dob = utils.julian_day_number(dob, tob)
         mixed_dvf = varga_factor_1*varga_factor_2
         planet_positions = charts.mixed_chart(jd_at_dob, place, varga_factor_1, chart_method_1, varga_factor_2, chart_method_2)
-        self._arudha_menu_dict = {self.cal_key_list['arudhas_str']: self._get_arudha_padhas_menu_dict(planet_positions)}
+        self._arudha_menu_dict = self._get_arudha_padhas_menu_dict(planet_positions)
         asc_house = planet_positions[0][1][0]
         ba = arudhas.bhava_arudhas_from_planet_positions(planet_positions)
         self._arudha_lagna_data[mixed_dvf] = ['' for _ in range(12)]
@@ -1000,7 +1026,7 @@ class Horoscope():
             for b in range(len(ba_chart)):
                 if ba_chart[b] != '' and ba_chart[b][-1]=='\n': ba_chart[b] = ba_chart[b][:-1]
             arudha_menu_dict[key] = ba_chart
-        arudha_menu_dict = {self.cal_key_list['arudhas_str']:arudha_menu_dict}
+        #arudha_menu_dict = {self.cal_key_list['arudhas_str']:arudha_menu_dict}
         return arudha_menu_dict
     def _get_arudha_padhas(self,dob,tob,place,divisional_chart_factor=1,chart_method=1,
                            years=1,months=1,sixty_hours=1,pravesha_type=0,
@@ -1573,16 +1599,40 @@ class Horoscope():
                                           varga_factor_2=None, chart_method_2=None):
         y,m,d,fh = utils.jd_to_gregorian(jd_at_dob);dob = drik.Date(y,m,d); tob = (fh,0,0)
         spl_list = ['hora_lagna','bhava_lagna','ghati_lagna','vighati_lagna','sree_lagna',
-                   'pranapada_lagna','indu_lagna','bhrigu_bindhu_lagna','kunda_lagna''varnada_lagna',]
+                   'pranapada_lagna','indu_lagna','bhrigu_bindhu_lagna','kunda_lagna','varnada_lagna',]
         _vl_chart = ['' for _ in range(12)]
         for spl in spl_list:
             if spl == 'varnada_lagna':
                 vl = eval('charts.'+spl+'_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)')
             else:
-                vl = eval('drik.'+spl+'_mixed_chart(jd, 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)')
+                vl = eval('drik.'+spl+'_mixed_chart(jd_at_dob, 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)')
             _vl_chart[vl[0]] += self.cal_key_list[spl+'_short_str'] +'\n'
         _special_lagna_dict = {self.cal_key_list['special_lagnas_str']:_vl_chart}
         return _special_lagna_dict
+    def get_sphutas_for_chart(self,jd_at_dob, place, divisional_chart_factor=1, chart_method=None,base_rasi=None,
+                                    count_from_end_of_sign=None):
+        y,m,d,fh = utils.jd_to_gregorian(jd_at_dob);dob = drik.Date(y,m,d); tob = (fh,0,0)
+        spl_list = ['tri','chatur','pancha','prana','deha','mrityu','sookshma_tri','beeja','kshetra','tithi','yoga',
+                    'yogi','avayogi','rahu_tithi']
+        _vl_chart = ['' for _ in range(12)]
+        for spl in spl_list:
+            from jhora.horoscope.chart import sphuta
+            vl = eval('sphuta.'+spl+'_sphuta(dob,tob,place,divisional_chart_factor=divisional_chart_factor,chart_method=chart_method,base_rasi=base_rasi,count_from_end_of_sign=count_from_end_of_sign)')
+            _vl_chart[vl[0]] += self.cal_key_list[spl+'_sphuta_short_str'] +'\n'
+        _sphuta_menu_dict = {self.cal_key_list['sphuta_str']:_vl_chart}
+        return _sphuta_menu_dict
+    def get_sphutas_for_mixed_chart(self,jd_at_dob, place,varga_factor_1=None, chart_method_1=None,
+                                          varga_factor_2=None, chart_method_2=None):
+        y,m,d,fh = utils.jd_to_gregorian(jd_at_dob);dob = drik.Date(y,m,d); tob = (fh,0,0)
+        spl_list = ['tri','chatur','pancha','prana','deha','mrityu','sookshma_tri','beeja','kshetra','tithi','yoga',
+                    'yogi','avayogi','rahu_tithi']
+        _vl_chart = ['' for _ in range(12)]
+        for spl in spl_list:
+            from jhora.horoscope.chart import sphuta
+            vl = vl = eval('sphuta.'+spl+'_sphuta_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)')
+            _vl_chart[vl[0]] += self.cal_key_list[spl+'_sphuta_short_str'] +'\n'
+        _sphuta_menu_dict = {self.cal_key_list['sphuta_str']:_vl_chart}
+        return _sphuta_menu_dict
 def get_chara_karakas(jd, place, ayanamsa_mode=const._DEFAULT_AYANAMSA_MODE,years=1,months=1,sixty_hours=1,
                                             calculation_type='drik',pravesha_type=0):
     rasi_planet_positions = charts.rasi_chart(jd, place, ayanamsa_mode, years, months, sixty_hours, calculation_type, pravesha_type)
@@ -1596,11 +1646,9 @@ if __name__ == "__main__":
     a = Horoscope(place_with_country_code=place.Place,latitude=place.latitude,longitude=place.longitude,
                   timezone_offset=place.timezone,date_in=drik.Date(dob[0],dob[1],dob[2]),birth_time="10:34:00")
 
-    ap = a._get_arudha_padhas(dob, tob, place, divisional_chart_factor=dcf)
-    print(a._arudha_menu_dict); exit()
-    print('special planets',a.get_special_planets_for_chart(jd_at_dob, place, divisional_chart_factor=dcf,
+    print('sphutas',a.get_sphutas_for_chart(jd_at_dob, place, divisional_chart_factor=dcf,
                             chart_method=chart_method, base_rasi=base_rasi, count_from_end_of_sign=count_from_end_of_sign))
-    print('special planets',a.get_special_planets_for_mixed_chart(jd_at_dob, place, varga_factor_1=varga_factor_1,
+    print('sphutas',a.get_sphutas_for_mixed_chart(jd_at_dob, 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))
     exit()
     chart_index_1 = 8; chart_method_1=1; chart_index_2=12; chart_method_2=1

{pyjhora-3.7.3 → pyjhora-3.7.4}/src/jhora/lang/msg_strings_en.txt

@@ -316,19 +316,33 @@ ghata_dosha_str=Ghata Dosha
 shrapit_dosha_str=Shrapit Dosha
 sphuta_str=Sphuta
 tri_sphuta_str=Tri
+tri_sphuta_short_str=Tri
 chatur_sphuta_str=Chatur
+chatur_sphuta_short_str=Cha
 pancha_sphuta_str=Pancha
+pancha_sphuta_short_str=Pan
 prana_sphuta_str=Prana
+prana_sphuta_short_str=Pra
 deha_sphuta_str=Deha
+deha_sphuta_short_str=Deh
 mrityu_sphuta_str=Mrityu
+mrityu_sphuta_short_str=Mri
 sookshma_tri_sphuta_str=Sookshma Tri
+sookshma_tri_sphuta_short_str=Skt
 beeja_sphuta_str=Beeja
+beeja_sphuta_short_str=Bej
 kshetra_sphuta_str=Kshetra
+kshetra_sphuta_short_str=Ksh
 tithi_sphuta_str=Tithi
+tithi_sphuta_short_str=Tit
 yoga_sphuta_str=Yoga
+yoga_sphuta_short_str=Yga
 yogi_sphuta_str=Yogi
+yogi_sphuta_short_str=Ygi
 avayogi_sphuta_str=Avayogi
+avayogi_sphuta_short_str=Ava
 rahu_tithi_sphuta_str=Rahu Tithi
+rahu_tithi_sphuta_short_str=Rah
 remaining_str=Left
 tithi_pravesha_str=Tithi Pravesha
 birth_str=Janma

{pyjhora-3.7.3 → pyjhora-3.7.4}/src/jhora/lang/msg_strings_hi.txt

@@ -314,19 +314,33 @@ ghata_dosha_str=घट दोष
 shrapit_dosha_str=श्रपित दोष
 sphuta_str=स्फुट
 tri_sphuta_str=त्रि
+tri_sphuta_short_str=त्रि
 chatur_sphuta_str=चतुर
+chatur_sphuta_short_str=चतु
 pancha_sphuta_str=पंच
+pancha_sphuta_short_str=पंच
 prana_sphuta_str=प्राण
+prana_sphuta_short_str=प्राण
 deha_sphuta_str=देह
+deha_sphuta_short_str=देह
 mrityu_sphuta_str=मृत्यु
+mrityu_sphuta_short_str=मृत्
 sookshma_tri_sphuta_str=सूक्ष्म त्रि
+sookshma_tri_sphuta_str=सूत्रि
 beeja_sphuta_str=बीज
+beeja_sphuta_short_str=बीज
 kshetra_sphuta_str=क्षेत्र
+kshetra_sphuta_short_str=क्षेत्र
 tithi_sphuta_str=तिथि
+tithi_sphuta_short_str=तिथि
 yoga_sphuta_str=योग
+yoga_sphuta_short_str=योग
 yogi_sphuta_str=योगी
+yogi_sphuta_short_str=योगी
 avayogi_sphuta_str=अवयोगी
+avayogi_sphuta_short_str=अ.यो
 rahu_tithi_sphuta_str=राहु तिथि
+rahu_tithi_sphuta_short_str=रा.ति
 remaining_str=बचा है
 tithi_pravesha_str=तिथि प्रवेश
 birth_str=जन्म

{pyjhora-3.7.3 → pyjhora-3.7.4}/src/jhora/lang/msg_strings_ka.txt

@@ -316,19 +316,33 @@ ghata_dosha_str=ಘಟ ದೋಷ
 shrapit_dosha_str=ಶ್ರಪಿತ್ ದೋಷ
 sphuta_str=ಸ್ಫುಟ
 tri_sphuta_str=ತ್ರಿ
+tri_sphuta_short_str=ತ್ರಿ
 chatur_sphuta_str=ಚತುರ್
+chatur_sphuta_short_str=ಚತು
 pancha_sphuta_str=ಪಂಚ
+pancha_sphuta_short_str=ಪಂ
 prana_sphuta_str=ಪ್ರಾಣ
+prana_sphuta_short_str=ಪ್ರಾಣ
 deha_sphuta_str=ದೇಹ
+deha_sphuta_short_str=ದೇಹ
 mrityu_sphuta_str=ಮೃತ್ಯು
+mrityu_sphuta_short_str=ಮೃ
 sookshma_tri_sphuta_str=ಸೂಕ್ಷ್ಮ ತ್ರಿ
+sookshma_tri_sphuta_short_str=ಸೂ.ತ್ರಿ
 beeja_sphuta_str=ಬೀಜ
+beeja_sphuta_short_str=ಬೀಜ
 kshetra_sphuta_str=ಕ್ಷೇತ್ರ
+kshetra_sphuta_short_str=ಕ್ಷೇತ್ರ
 tithi_sphuta_str=ತಿಥಿ
+tithi_sphuta_short_str=ತಿಥಿ
 yoga_sphuta_str=ಯೋಗ
+yoga_sphuta_short_str=ಯೋಗ
 yogi_sphuta_str=ಯೋಗಿ
+yogi_sphuta_short_str=ಯೋಗಿ
 avayogi_sphuta_str=ಅವಯೋಗಿ
+avayogi_sphuta_short_str=ಅ.ಯೋ
 rahu_tithi_sphuta_str=ರಾಹು ತಿಥಿ
+rahu_tithi_sphuta_short_str=ರಾ.ತಿ
 remaining_str=ಉಳಿದಿದೆ
 tithi_pravesha_str=ತಿಥಿ ಪ್ರವೇಶ
 birth_str=ಜನನ

{pyjhora-3.7.3 → pyjhora-3.7.4}/src/jhora/lang/msg_strings_ta.txt

@@ -316,19 +316,33 @@ ghata_dosha_str=கட தோஷம்
 shrapit_dosha_str=ஷ்ரபித் தோஷம்
 sphuta_str=ஸ்புடம்
 tri_sphuta_str=திரி
+tri_sphuta_short_str=திரி
 chatur_sphuta_str=சதுர்
+chatur_sphuta_short_str=சது
 pancha_sphuta_str=பஞ்ச
+pancha_sphuta_short_str=பஞ்
 prana_sphuta_str=பிராண
+prana_sphuta_short_str=பிரா
 deha_sphuta_str=தேஹ
+deha_sphuta_short_str=தேஹ
 mrityu_sphuta_str=மிருத்யு
+mrityu_sphuta_short_str=மிரு
 sookshma_tri_sphuta_str=சூக்ஷ்ம திரி
+sookshma_tri_sphuta_short_str=சூ.தி
 beeja_sphuta_str=பீஜ
+beeja_sphuta_short_str=பீஜ
 kshetra_sphuta_str=க்ஷேத்ர
+kshetra_sphuta_short_str=க்ஷேத்
 tithi_sphuta_str=திதி
+tithi_sphuta_short_str=திதி
 yoga_sphuta_str=யோக
+yoga_sphuta_short_str=யோக
 yogi_sphuta_str=யோகி
+yogi_sphuta_short_str=யோகி
 avayogi_sphuta_str=அவயோகி
+avayogi_sphuta_short_str=அ.யோ
 rahu_tithi_sphuta_str=ராகு திதி
+rahu_tithi_sphuta_short_str=ரா.தி
 remaining_str=மீதமுள்ளது
 tithi_pravesha_str=திதி நுழைவு
 birth_str=பிறப்பு

{pyjhora-3.7.3 → pyjhora-3.7.4}/src/jhora/lang/msg_strings_te.txt

@@ -316,19 +316,33 @@ ghata_dosha_str=ఘట దోషం
 shrapit_dosha_str=శ్రాపిత్ దోషం
 sphuta_str=స్పుట
 tri_sphuta_str=త్రి
+tri_sphuta_short_str=త్రి
 chatur_sphuta_str=చతుర్
+chatur_sphuta_short_str=చతు
 pancha_sphuta_str=పంచ
+pancha_sphuta_short_str=పం
 prana_sphuta_str=ప్రాణ
+prana_sphuta_short_str=ప్రాణ
 deha_sphuta_str=దేహ
+deha_sphuta_short_str=దేహ
 mrityu_sphuta_str=మృత్యు
+mrityu_sphuta_short_str=మృత్యు
 sookshma_tri_sphuta_str=సూక్ష్మ త్రి
+sookshma_tri_sphuta_short_str=సూ.త్రి
 beeja_sphuta_str=బీజా
+beeja_sphuta_short_str=బీజా
 kshetra_sphuta_str=క్షేత్ర
+kshetra_sphuta_short_str=క్షేత్ర
 tithi_sphuta_str=తిథి
+tithi_sphuta_short_str=తిథి
 yoga_sphuta_str=యోగ
+yoga_sphuta_short_str=యోగ
 yogi_sphuta_str=యోగి
+yogi_sphuta_short_str=యోగి
 avayogi_sphuta_str=అవయోగి
+avayogi_sphuta_short_str=అ.యో
 rahu_tithi_sphuta_str=రాహు తిథి
+rahu_tithi_sphuta_short_str=రా.తి
 remaining_str=మిగిలి ఉంది
 tithi_pravesha_str=తిథి ప్రవేశం
 birth_str=జన్మ