editors/Viewer.py
changeset 1556 32e9d0ef30dc
parent 1544 2969c2123105
child 1567 a4bf874e4949
equal deleted inserted replaced
1555:dac6002ff58e 1556:32e9d0ef30dc
  3406     def Find(self, direction, search_params):
  3406     def Find(self, direction, search_params):
  3407         if self.SearchParams != search_params:
  3407         if self.SearchParams != search_params:
  3408             self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT)
  3408             self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT)
  3409 
  3409 
  3410             self.SearchParams = search_params
  3410             self.SearchParams = search_params
  3411             criteria = {
       
  3412                 "raw_pattern": search_params["find_pattern"],
       
  3413                 "pattern": re.compile(search_params["find_pattern"]),
       
  3414                 "case_sensitive": search_params["case_sensitive"],
       
  3415                 "regular_expression": search_params["regular_expression"],
       
  3416                 "filter": "all"}
       
  3417 
       
  3418             self.SearchResults = []
  3411             self.SearchResults = []
  3419             blocks = []
  3412             blocks = []
  3420             for infos, start, end, text in self.Controler.SearchInPou(self.TagName, criteria, self.Debug):
  3413             for infos, start, end, text in self.Controler.SearchInPou(self.TagName, search_params, self.Debug):
  3421                 if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]:
  3414                 if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]:
  3422                     self.SearchResults.append((infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT))
  3415                     self.SearchResults.append((infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT))
  3423                 else:
  3416                 else:
  3424                     block = self.Blocks.get(infos[2])
  3417                     block = self.Blocks.get(infos[2])
  3425                     if block is not None:
  3418                     if block is not None: