71 elif self.ParentWindow.Controler.PouIsUsedBy(name, values[0]): |
71 elif self.ParentWindow.Controler.PouIsUsedBy(name, values[0]): |
72 message = wx.MessageDialog(self.ParentWindow, "\"%s\" is already used by \"%s\"!"%(name, values[0]), "Error", wx.OK|wx.ICON_ERROR) |
72 message = wx.MessageDialog(self.ParentWindow, "\"%s\" is already used by \"%s\"!"%(name, values[0]), "Error", wx.OK|wx.ICON_ERROR) |
73 message.ShowModal() |
73 message.ShowModal() |
74 message.Destroy() |
74 message.Destroy() |
75 else: |
75 else: |
|
76 blockname = values[2] |
|
77 if values[1] != "function" and blockname == "": |
|
78 dialog = wx.TextEntryDialog(self.ParentWindow, "Block name", "Please enter a block name", "", wx.OK|wx.CANCEL|wx.CENTRE) |
|
79 if dialog.ShowModal(): |
|
80 blockname = dialog.GetValue() |
|
81 dialog.Destroy() |
76 id = self.ParentWindow.GetNewId() |
82 id = self.ParentWindow.GetNewId() |
77 block = FBD_Block(self.ParentWindow, values[0], values[2], id) |
83 block = FBD_Block(self.ParentWindow, values[0], blockname, id) |
78 block.SetPosition(x, y) |
84 block.SetPosition(x, y) |
79 width, height = block.GetMinSize() |
85 width, height = block.GetMinSize() |
80 block.SetSize(width, height) |
86 block.SetSize(width, height) |
81 self.ParentWindow.AddBlock(block) |
87 self.ParentWindow.AddBlock(block) |
82 self.ParentWindow.Controler.AddCurrentElementEditingBlock(id, values[0], values[2]) |
88 self.ParentWindow.Controler.AddCurrentElementEditingBlock(id, values[0], blockname) |
83 self.ParentWindow.RefreshBlockModel(block) |
89 self.ParentWindow.RefreshBlockModel(block) |
84 self.ParentWindow.RefreshBuffer() |
90 self.ParentWindow.RefreshBuffer() |
85 self.ParentWindow.RefreshScrollBars() |
91 self.ParentWindow.RefreshScrollBars() |
|
92 self.ParentWindow.ParentWindow.RefreshEditor() |
86 self.ParentWindow.Refresh() |
93 self.ParentWindow.Refresh() |
87 elif values[1] != "location": |
94 elif values[1] != "location": |
88 id = self.ParentWindow.GetNewId() |
95 id = self.ParentWindow.GetNewId() |
89 if values[1] == "Output": |
96 if values[1] == "Output": |
90 var_type = OUTPUT |
97 var_type = OUTPUT |
918 self.RefreshBuffer() |
925 self.RefreshBuffer() |
919 else: |
926 else: |
920 self.SelectedElement.Delete() |
927 self.SelectedElement.Delete() |
921 self.SelectedElement = None |
928 self.SelectedElement = None |
922 self.Refresh(False) |
929 self.Refresh(False) |
923 if not self.SavedMode: |
930 if self.Mode != MODE_SELECTION and not self.SavedMode: |
924 wx.CallAfter(self.ParentWindow.ResetCurrentMode) |
931 wx.CallAfter(self.ParentWindow.ResetCurrentMode) |
925 event.Skip() |
932 event.Skip() |
926 |
933 |
927 def OnViewerRightUp(self, event): |
934 def OnViewerRightUp(self, event): |
928 dc = self.GetLogicalDC() |
935 dc = self.GetLogicalDC() |