Port chart to multi-search api

symbol_search
Tyler Goodlet 2021-05-16 20:54:56 -04:00
parent cb102f692c
commit 63363d750c
1 changed files with 22 additions and 15 deletions

View File

@ -56,13 +56,12 @@ from ._style import (
_bars_to_left_in_follow_mode, _bars_to_left_in_follow_mode,
) )
from . import _search from . import _search
from ._search import SearchBar, SearchWidget
from ._event import open_key_stream from ._event import open_key_stream
from ..data._source import Symbol from ..data._source import Symbol
from ..data._sharedmem import ShmArray from ..data._sharedmem import ShmArray
from ..data import maybe_open_shm_array
from .. import brokers from .. import brokers
from .. import data from .. import data
from ..data import maybe_open_shm_array
from ..log import get_logger from ..log import get_logger
from ._exec import run_qtractor, current_screen from ._exec import run_qtractor, current_screen
from ._interaction import ChartView from ._interaction import ChartView
@ -94,7 +93,6 @@ class ChartSpace(QtGui.QWidget):
self.toolbar_layout = QtGui.QHBoxLayout() self.toolbar_layout = QtGui.QHBoxLayout()
self.toolbar_layout.setContentsMargins(0, 0, 0, 0) self.toolbar_layout.setContentsMargins(0, 0, 0, 0)
# self.init_timeframes_ui() # self.init_timeframes_ui()
# self.init_strategy_ui() # self.init_strategy_ui()
self.vbox.addLayout(self.toolbar_layout) self.vbox.addLayout(self.toolbar_layout)
@ -182,6 +180,7 @@ class ChartSpace(QtGui.QWidget):
self.linkedcharts = linkedcharts self.linkedcharts = linkedcharts
symbol = linkedcharts.symbol symbol = linkedcharts.symbol
if symbol is not None: if symbol is not None:
self.window.setWindowTitle( self.window.setWindowTitle(
f'{symbol.key}@{symbol.brokers} ' f'{symbol.key}@{symbol.brokers} '
@ -1600,8 +1599,6 @@ async def _async_main(
# setup search widget # setup search widget
# search.installEventFilter(self) # search.installEventFilter(self)
# search = _search.SearchBar(chart_app)
search = _search.SearchWidget( search = _search.SearchWidget(
chart_space=chart_app, chart_space=chart_app,
) )
@ -1622,18 +1619,28 @@ async def _async_main(
# this internally starts a ``chart_symbol()`` task above # this internally starts a ``chart_symbol()`` task above
chart_app.load_symbol(brokername, sym, loglevel) chart_app.load_symbol(brokername, sym, loglevel)
async with open_key_stream( async with _search.register_symbol_search(
search.bar,
) as key_stream:
# start kb handling task for searcher provider_name='cache',
root_n.start_soon( search_routine=partial(
_search.handle_keyboard_input, _search.search_simple_dict,
search, source=chart_app._chart_cache,
key_stream, ),
)
await trio.sleep_forever() ):
async with open_key_stream(
search.bar,
) as key_stream:
# start kb handling task for searcher
root_n.start_soon(
_search.handle_keyboard_input,
# chart_app,
search,
key_stream,
)
await trio.sleep_forever()
def _main( def _main(