1851 new_window.SetIcon(GetBitmap("DATATYPE")) |
1851 new_window.SetIcon(GetBitmap("DATATYPE")) |
1852 self.AddPage(new_window, "") |
1852 self.AddPage(new_window, "") |
1853 if new_window is not None: |
1853 if new_window is not None: |
1854 project_infos = self.GetProjectConfiguration() |
1854 project_infos = self.GetProjectConfiguration() |
1855 if project_infos.has_key("editors_state"): |
1855 if project_infos.has_key("editors_state"): |
1856 state = project_infos["editors_state"].get(tagname) |
1856 if new_window.IsDebugging(): |
|
1857 state = project_infos["editors_state"].get(new_window.GetInstancePath()) |
|
1858 else: |
|
1859 state = project_infos["editors_state"].get(tagname) |
1857 if state is not None: |
1860 if state is not None: |
1858 wx.CallAfter(new_window.SetState, state) |
1861 wx.CallAfter(new_window.SetState, state) |
1859 |
1862 |
1860 openedidx = self.IsOpened(tagname) |
1863 openedidx = self.IsOpened(tagname) |
1861 old_selected = self.TabsOpened.GetSelection() |
1864 old_selected = self.TabsOpened.GetSelection() |
2081 if self.EnableDebug: |
2084 if self.EnableDebug: |
2082 idxs = range(self.TabsOpened.GetPageCount()) |
2085 idxs = range(self.TabsOpened.GetPageCount()) |
2083 idxs.reverse() |
2086 idxs.reverse() |
2084 for idx in idxs: |
2087 for idx in idxs: |
2085 editor = self.TabsOpened.GetPage(idx) |
2088 editor = self.TabsOpened.GetPage(idx) |
2086 if editor.IsDebugging(): |
2089 if isinstance(editor, (Viewer, GraphicViewer)) and editor.IsDebugging(): |
2087 instance_infos = self.Controler.GetInstanceInfos(editor.GetInstancePath(), self.EnableDebug) |
2090 instance_infos = self.Controler.GetInstanceInfos(editor.GetInstancePath(), self.EnableDebug) |
2088 if instance_infos is None: |
2091 if instance_infos is None: |
2089 self.TabsOpened.DeletePage(idx) |
2092 self.TabsOpened.DeletePage(idx) |
2090 elif isinstance(editor, GraphicViewer): |
2093 elif isinstance(editor, GraphicViewer): |
2091 editor.ResetView(True) |
2094 editor.ResetView(True) |
2092 else: |
2095 else: |
2093 editor.RefreshView() |
2096 editor.RefreshView() |
|
2097 elif editor.IsDebugging(): |
|
2098 editor.RegisterVariables() |
2094 self.DebugVariablePanel.UnregisterObsoleteData() |
2099 self.DebugVariablePanel.UnregisterObsoleteData() |
2095 |
2100 |
2096 def AddDebugVariable(self, iec_path, force=False): |
2101 def AddDebugVariable(self, iec_path, force=False): |
2097 if self.EnableDebug: |
2102 if self.EnableDebug: |
2098 self.DebugVariablePanel.InsertValue(iec_path, force=force) |
2103 self.DebugVariablePanel.InsertValue(iec_path, force=force) |