- Moved ChartAsync’s methods into the Chart object.
- Removed ChartAsync.
- Added the `show_async` method to `Chart`.
- Refactored how the TopBar is used. The docs explain this in detail, but a basic rundown is:
- `corner_text` and `create_switcher` are no longer methods. The `topbar` attribute of `chart` should be used instead.
- switchers and textboxes, now created with `chart.topbar.textbox` and `chart.topbar.switcher` require a name to be passed to them, which is used to access its instance (e.g `chart.topbar[‘timeframe’]`)
- If you have any questions about these changes, or potential enhancements, feel free to raise an issue and I will get back to you ASAP :)
- PtQt and Wx can now use either synchronous or asynchronous callback functions
- BETA: Support for Jupyter Notebooks
- Fixed a bug causing the ‘date’ column of DataFrames passed to `set`, `update`, and `update_from_tick` to be modified.
This commit is contained in:
@ -1,7 +1,8 @@
|
||||
import asyncio
|
||||
import webview
|
||||
import multiprocessing as mp
|
||||
|
||||
from lightweight_charts.js import LWC
|
||||
from lightweight_charts.js import LWC, CALLBACK_SCRIPT, TopBar
|
||||
|
||||
|
||||
class CallbackAPI:
|
||||
@ -15,12 +16,12 @@ class CallbackAPI:
|
||||
|
||||
|
||||
class PyWV:
|
||||
def __init__(self, q, exit, loaded, html, width, height, x, y, on_top, debug, emit=None):
|
||||
def __init__(self, q, exit, loaded, html, width, height, x, y, on_top, debug, emit):
|
||||
self.queue = q
|
||||
self.exit = exit
|
||||
self.loaded = loaded
|
||||
self.debug = debug
|
||||
js_api = CallbackAPI(emit) if emit else None
|
||||
js_api = CallbackAPI(emit)
|
||||
self.webview = webview.create_window('', html=html, on_top=on_top, js_api=js_api, width=width, height=height,
|
||||
x=x, y=y, background_color='#000000')
|
||||
self.webview.events.loaded += self.on_js_load
|
||||
@ -44,18 +45,27 @@ class PyWV:
|
||||
|
||||
class Chart(LWC):
|
||||
def __init__(self, volume_enabled: bool = True, width: int = 800, height: int = 600, x: int = None, y: int = None,
|
||||
on_top: bool = False, debug: bool = False,
|
||||
on_top: bool = False, debug: bool = False, api: object = None, topbar: bool = False, searchbox: bool = False,
|
||||
inner_width: float = 1.0, inner_height: float = 1.0, dynamic_loading: bool = False):
|
||||
super().__init__(volume_enabled, inner_width, inner_height, dynamic_loading)
|
||||
self._emit = mp.Queue()
|
||||
self._q = mp.Queue()
|
||||
self._script_func = self._q.put
|
||||
self._exit = mp.Event()
|
||||
self._loaded = mp.Event()
|
||||
self._process = mp.Process(target=PyWV, args=(self._q, self._exit, self._loaded, self._html,
|
||||
width, height, x, y, on_top, debug,), daemon=True)
|
||||
width, height, x, y, on_top, debug, self._emit), daemon=True)
|
||||
self._process.start()
|
||||
self._create_chart()
|
||||
|
||||
self.api = api
|
||||
self._js_api_code = 'pywebview.api.callback'
|
||||
if not topbar and not searchbox:
|
||||
return
|
||||
self.run_script(CALLBACK_SCRIPT)
|
||||
self.topbar = TopBar(self) if topbar else None
|
||||
self._make_search_box() if searchbox else None
|
||||
|
||||
def show(self, block: bool = False):
|
||||
"""
|
||||
Shows the chart window.\n
|
||||
@ -74,6 +84,31 @@ class Chart(LWC):
|
||||
return
|
||||
self._exit.clear()
|
||||
|
||||
async def show_async(self, block=False):
|
||||
if not self.loaded:
|
||||
self._q.put('start')
|
||||
self._loaded.wait()
|
||||
self._on_js_load()
|
||||
else:
|
||||
self._q.put('show')
|
||||
if block:
|
||||
try:
|
||||
while 1:
|
||||
while self._emit.empty() and not self._exit.is_set():
|
||||
await asyncio.sleep(0.1)
|
||||
if self._exit.is_set():
|
||||
return
|
||||
key, chart_id, arg = self._emit.get()
|
||||
self.api.chart = self._charts[chart_id]
|
||||
if widget := self.api.chart.topbar._widget_with_method(key):
|
||||
widget.value = arg
|
||||
await getattr(self.api, key)()
|
||||
else:
|
||||
await getattr(self.api, key)(arg)
|
||||
except KeyboardInterrupt:
|
||||
return
|
||||
asyncio.create_task(self.show_async(block=True))
|
||||
|
||||
def hide(self):
|
||||
"""
|
||||
Hides the chart window.\n
|
||||
|
||||
Reference in New Issue
Block a user