equal
deleted
inserted
replaced
54 from controls.LogViewer import LogViewer |
54 from controls.LogViewer import LogViewer |
55 from controls.CustomStyledTextCtrl import CustomStyledTextCtrl |
55 from controls.CustomStyledTextCtrl import CustomStyledTextCtrl |
56 from controls import EnhancedStatusBar as esb |
56 from controls import EnhancedStatusBar as esb |
57 from dialogs.AboutDialog import ShowAboutDialog |
57 from dialogs.AboutDialog import ShowAboutDialog |
58 |
58 |
59 from PLCControler import \ |
59 from plcopen.types_enums import \ |
|
60 ComputeConfigurationName, \ |
60 LOCATION_CONFNODE, \ |
61 LOCATION_CONFNODE, \ |
61 LOCATION_MODULE, \ |
62 LOCATION_MODULE, \ |
62 LOCATION_GROUP, \ |
63 LOCATION_GROUP, \ |
63 LOCATION_VAR_INPUT, \ |
64 LOCATION_VAR_INPUT, \ |
64 LOCATION_VAR_OUTPUT, \ |
65 LOCATION_VAR_OUTPUT, \ |
65 LOCATION_VAR_MEMORY, \ |
66 LOCATION_VAR_MEMORY, \ |
66 ITEM_PROJECT, \ |
67 ITEM_PROJECT, \ |
67 ITEM_RESOURCE |
68 ITEM_RESOURCE, \ |
68 |
69 ITEM_CONFNODE |
69 from ProjectController import ProjectController, GetAddMenuItems, MATIEC_ERROR_MODEL, ITEM_CONFNODE |
70 |
|
71 from ProjectController import ProjectController, GetAddMenuItems, MATIEC_ERROR_MODEL |
70 |
72 |
71 from IDEFrame import \ |
73 from IDEFrame import \ |
72 TITLE,\ |
74 TITLE,\ |
73 EDITORTOOLBAR,\ |
75 EDITORTOOLBAR,\ |
74 FILEMENU,\ |
76 FILEMENU,\ |
1091 # Highlights showing functions |
1093 # Highlights showing functions |
1092 # ------------------------------------------------------------------------------- |
1094 # ------------------------------------------------------------------------------- |
1093 |
1095 |
1094 def ShowHighlight(self, infos, start, end, highlight_type): |
1096 def ShowHighlight(self, infos, start, end, highlight_type): |
1095 config_name = self.Controler.GetProjectMainConfigurationName() |
1097 config_name = self.Controler.GetProjectMainConfigurationName() |
1096 if config_name is not None and infos[0] == self.Controler.ComputeConfigurationName(config_name): |
1098 if config_name is not None and infos[0] == ComputeConfigurationName(config_name): |
1097 self.CTR._OpenView() |
1099 self.CTR._OpenView() |
1098 selected = self.TabsOpened.GetSelection() |
1100 selected = self.TabsOpened.GetSelection() |
1099 if selected != -1: |
1101 if selected != -1: |
1100 viewer = self.TabsOpened.GetPage(selected) |
1102 viewer = self.TabsOpened.GetPage(selected) |
1101 viewer.AddHighlight(infos[1:], start, end, highlight_type) |
1103 viewer.AddHighlight(infos[1:], start, end, highlight_type) |