3463 |
3463 |
3464 self.SearchParams = search_params |
3464 self.SearchParams = search_params |
3465 self.SearchResults = [] |
3465 self.SearchResults = [] |
3466 blocks = [] |
3466 blocks = [] |
3467 for infos, start, end, text in self.Controler.SearchInPou(self.TagName, search_params, self.Debug): |
3467 for infos, start, end, text in self.Controler.SearchInPou(self.TagName, search_params, self.Debug): |
3468 if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]: |
3468 if (infos[0] == self.TagName or self.TagName.split("::")[0] in ['A', 'T']) and infos[1] is not 'name': |
3469 self.SearchResults.append((infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT)) |
3469 if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]: |
3470 else: |
3470 self.SearchResults.append((infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT)) |
3471 block = self.Blocks.get(infos[2]) |
3471 else: |
3472 if block is not None: |
3472 block = self.Blocks.get(infos[2]) |
3473 blocks.append((block, (infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT))) |
3473 if block is not None: |
|
3474 blocks.append((block, (infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT))) |
3474 blocks.sort(sort_blocks) |
3475 blocks.sort(sort_blocks) |
3475 self.SearchResults.extend([infos for block, infos in blocks]) |
3476 self.SearchResults.extend([infos for block, infos in blocks]) |
3476 self.CurrentFindHighlight = None |
3477 self.CurrentFindHighlight = None |
3477 |
3478 |
3478 if len(self.SearchResults) > 0: |
3479 if len(self.SearchResults) > 0: |