mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Some search fixes

Browse source
This commit is contained in:
René Stadler 2007-12-10 14:22:51 +02:00 committed by Stefan Sauer
parent ec713b827c
commit c0bb774c43
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debug-viewer/GstDebugViewer/GUI.py
View file

@ -819,6 +819,8 @@ class MessageColumn (TextColumn):
def message_data_func (props, row): def message_data_func (props, row):
props.text = row[id_] props.text = row[id_]
if not highlighters:
props.attributes = None
for highlighter in highlighters.values (): for highlighter in highlighters.values ():
ranges = highlighter (row) ranges = highlighter (row)
if not ranges: if not ranges:

27
debug-viewer/GstDebugViewer/Plugins/FindBar.py
View file

@ -56,15 +56,18 @@ class SearchSentinel (object):
def __init__ (self): def __init__ (self):
self.dispatcher = Common.Data.GSourceDispatcher () self.dispatcher = Common.Data.GSourceDispatcher ()
self.cancelled = False
def run_for (self, operation): def run_for (self, operation):
self.dispatcher.cancel () self.dispatcher.cancel ()
self.dispatcher (self.__process (operation)) self.dispatcher (self.__process (operation))
self.cancelled = False
def abort (self): def abort (self):
self.dispatcher.cancel () self.dispatcher.cancel ()
self.cancelled = True
def __process (self, operation): def __process (self, operation):
@ -85,7 +88,7 @@ class SearchSentinel (object):
YIELD_LIMIT = 1000 YIELD_LIMIT = 1000
i = YIELD_LIMIT i = YIELD_LIMIT
tree_iter = start_iter tree_iter = start_iter
while tree_iter: while tree_iter and not self.cancelled:
i -= 1 i -= 1
if i == 0: if i == 0:
yield True yield True
@ -95,7 +98,8 @@ class SearchSentinel (object):
self.handle_match_found (model, tree_iter) self.handle_match_found (model, tree_iter)
tree_iter = iter_next (tree_iter) tree_iter = iter_next (tree_iter)
self.handle_search_complete () if not self.cancelled:
self.handle_search_complete ()
yield False yield False
def handle_match_found (self, model, tree_iter): def handle_match_found (self, model, tree_iter):
@ -315,18 +319,23 @@ class FindBarFeature (FeatureBase):
model = self.log_view.props.model model = self.log_view.props.model
search_string = entry.props.text search_string = entry.props.text
column = self.window.column_manager.find_item (name = "message")
if search_string == "": if search_string == "":
self.logger.debug ("search string set to '', aborting search") self.logger.debug ("search string set to '', aborting search")
self.sentinel.abort () self.sentinel.abort ()
self.clear_results () self.clear_results ()
self.logger.debug ("starting search for %r", search_string) try:
start_path = self.log_view.get_visible_range ()[0] del column.highlighters[self]
self.operation = SearchOperation (model, search_string, start_position = start_path[0]) except KeyError:
self.sentinel.run_for (self.operation) pass
self.bar.status_searching () else:
self.logger.debug ("starting search for %r", search_string)
start_path = self.log_view.get_visible_range ()[0]
self.operation = SearchOperation (model, search_string, start_position = start_path[0])
self.sentinel.run_for (self.operation)
self.bar.status_searching ()
column.highlighters[self] = self.operation.match_func
column = self.window.column_manager.find_item (name = "message")
column.highlighters[self] = self.operation.match_func
self.window.update_view () self.window.update_view ()
def handle_match_found (self, model, tree_iter): def handle_match_found (self, model, tree_iter):