dwker/lightweight-charts-python
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
David Brazda
2024-10-13 15:39:54 +02:00
parent 7b0acec3e6
commit 3f2a484cd7
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lightweight_charts/helpers.py
View File

@ -8,7 +8,7 @@ import pandas as pd
#default settings for each pricescale #default settings for each pricescale
ohlcv_cols = ['close', 'volume', 'open', 'high', 'low'] ohlcv_cols = ['close', 'volume', 'open', 'high', 'low']
right_cols = ['vwap'] right_cols = ['vwap']
left_cols = ['rsi', 'cci', 'macd', 'macdsignal'] left_cols = ['rsi', 'cci', 'macd', 'macdsignal', "chopiness"]
middle1_cols = ["mom"] middle1_cols = ["mom"]
middle2_cols = ["updated", "integer"] middle2_cols = ["updated", "integer"]
histogram_cols = ['buyvolume', 'sellvolume', 'trades', 'macdhist'] histogram_cols = ['buyvolume', 'sellvolume', 'trades', 'macdhist']
@ -486,15 +486,16 @@ def chart(panes: list[Panel], sync=False, title='', size="s", xloc=None, session
name=output_name + " " + str(col_tuple) name=output_name + " " + str(col_tuple)
series_copy = output_series.loc[:, col_tuple].copy(deep=True) series_copy = output_series.loc[:, col_tuple].copy(deep=True)
add_to_scale(series_copy, pane.right, pane.histogram, pane.left, pane.middle1, pane.middle2, output, name) add_to_scale(series_copy, pane.right, pane.histogram, pane.left, pane.middle1, pane.middle2, output, name)
elif isinstance(output_series, pd.DataFrame) and len(output_series.columns) > 1: #in case of multicolumns elif isinstance(output_series, pd.DataFrame): #in case of multicolumns
for col in output_series.columns: for col in output_series.columns:
name=output_name + " " + col name=output_name + " " + col
series_copy = output_series.loc[:, col].copy(deep=True) series_copy = output_series.loc[:, col].copy(deep=True)
add_to_scale(series_copy, pane.right, pane.histogram, pane.left, pane.middle1, pane.middle2, output, name) add_to_scale(series_copy, pane.right, pane.histogram, pane.left, pane.middle1, pane.middle2, output, name)
elif isinstance(output_series, pd.DataFrame) and len(output_series.columns) == 1: # elif isinstance(output_series, pd.DataFrame): #it df with multiple columns (probably symbols)
name=output_name + " " + output_series.columns[0] # for col in output_series.columns:
series_copy = output_series.squeeze() # name=output_name + " " + col
add_to_scale(series_copy, pane.right, pane.histogram, pane.left, pane.middle1, pane.middle2, output, name) # series_copy = output_series[col].squeeze()
# add_to_scale(series_copy, pane.right, pane.histogram, pane.left, pane.middle1, pane.middle2, output, name)
else: #add output to respective scale else: #add output to respective scale
series_copy = output_series.copy(deep=True) series_copy = output_series.copy(deep=True)
add_to_scale(series_copy, pane.right, pane.histogram, pane.left, pane.middle1, pane.middle2, output, output_name) add_to_scale(series_copy, pane.right, pane.histogram, pane.left, pane.middle1, pane.middle2, output, output_name)
@ -529,6 +530,11 @@ def chart(panes: list[Panel], sync=False, title='', size="s", xloc=None, session
kwargs = {'name': name + str(col_tuple)} kwargs = {'name': name + str(col_tuple)}
tmp = active_chart.create_histogram(**kwargs) #green transparent "rgba(53, 94, 59, 0.6)" tmp = active_chart.create_histogram(**kwargs) #green transparent "rgba(53, 94, 59, 0.6)"
tmp.set(xloc_me(series.loc[:, col_tuple], xloc)) tmp.set(xloc_me(series.loc[:, col_tuple], xloc))
elif isinstance(series, pd.DataFrame): #it df with multiple columns (probably symbols)
for col in series.columns:
kwargs = {'name': name + str(col)}
tmp = active_chart.create_histogram(**kwargs) #green transparent "rgba(53, 94, 59, 0.6)"
tmp.set(xloc_me(series[col], xloc))
else: else:
tmp = active_chart.create_histogram(**kwargs) #green transparent "rgba(53, 94, 59, 0.6)" tmp = active_chart.create_histogram(**kwargs) #green transparent "rgba(53, 94, 59, 0.6)"
tmp.set(xloc_me(series, xloc)) tmp.set(xloc_me(series, xloc))
@ -555,8 +561,13 @@ def chart(panes: list[Panel], sync=False, title='', size="s", xloc=None, session
#if output_series is multiindex - create aline for each combination #if output_series is multiindex - create aline for each combination
if isinstance(output_series, pd.DataFrame) and isinstance(output_series.columns, pd.MultiIndex): if isinstance(output_series, pd.DataFrame) and isinstance(output_series.columns, pd.MultiIndex):
for col_tuple in output_series.columns: for col_tuple in output_series.columns:
tmp = active_chart.create_line(name=output + " " + str(col_tuple), priceScaleId=att_name)#, color="blue") tmp = active_chart.create_line(name=output + " " + str(col_tuple), priceScaleId=att_name)#, color="blue")
tmp.set(output_series.loc[:, col_tuple]) tmp.set(output_series.loc[:, col_tuple])
elif isinstance(output_series, pd.DataFrame): #it df with multiple columns (probably symbols)
for col in output_series.columns:
tmp = active_chart.create_line(name=output + " " + str(col), priceScaleId=att_name)#, color="blue")
tmp.set(output_series[col])
else: else:
tmp = active_chart.create_line(name=output, priceScaleId=att_name)#, color="blue") tmp = active_chart.create_line(name=output, priceScaleId=att_name)#, color="blue")
tmp.set(output_series) tmp.set(output_series)
@ -565,6 +576,12 @@ def chart(panes: list[Panel], sync=False, title='', size="s", xloc=None, session
for col_tuple in series.columns: for col_tuple in series.columns:
tmp = active_chart.create_line(name=str(col_tuple) if name is None else name+" "+str(col_tuple), priceScaleId=att_name)#, color="blue") tmp = active_chart.create_line(name=str(col_tuple) if name is None else name+" "+str(col_tuple), priceScaleId=att_name)#, color="blue")
tmp.set(xloc_me(series.loc[:, col_tuple], xloc)) tmp.set(xloc_me(series.loc[:, col_tuple], xloc))
elif isinstance(series, pd.DataFrame): #it df with multiple columns (probably symbols)
for col in series.columns:
name=name + " " + col
series_copy = output_series[col].squeeze()
tmp = active_chart.create_line(name=name, priceScaleId=att_name)#, color="blue")
tmp.set(xloc_me(series_copy, xloc))
else: else:
if name is None: if name is None:
name = "no_name" if not hasattr(series, 'name') or series.name is None else str(series.name) name = "no_name" if not hasattr(series, 'name') or series.name is None else str(series.name)

2
setup.py
View File

@ -5,7 +5,7 @@ with open('README.md', 'r', encoding='utf-8') as f:
setup( setup(
name='lightweight_charts', name='lightweight_charts',
version='2.2.5', version='2.2.6',
packages=find_packages(), packages=find_packages(),
python_requires='>=3.8', python_requires='>=3.8',
install_requires=[ install_requires=[