equal
deleted
inserted
replaced
55 ] = [wx.NewId() for _init_ctrls in range(2)] |
55 ] = [wx.NewId() for _init_ctrls in range(2)] |
56 |
56 |
57 re_texts = {} |
57 re_texts = {} |
58 re_texts["letter"] = "[A-Za-z]" |
58 re_texts["letter"] = "[A-Za-z]" |
59 re_texts["digit"] = "[0-9]" |
59 re_texts["digit"] = "[0-9]" |
60 re_texts["identifier"] = "((?:%(letter)s|(?:_(?:%(letter)s|%(digit)s)))(?:_?(?:%(letter)s|%(digit)s))*)"%re_texts |
60 re_texts["identifier"] = "((?:%(letter)s|(?:_(?:%(letter)s|%(digit)s)))(?:_?(?:%(letter)s|%(digit)s))*)" % re_texts |
61 IDENTIFIER_MODEL = re.compile(re_texts["identifier"]) |
61 IDENTIFIER_MODEL = re.compile(re_texts["identifier"]) |
62 LABEL_MODEL = re.compile("[ \t\n]%(identifier)s:[ \t\n]"%re_texts) |
62 LABEL_MODEL = re.compile("[ \t\n]%(identifier)s:[ \t\n]" % re_texts) |
63 EXTENSIBLE_PARAMETER = re.compile("IN[1-9][0-9]*$") |
63 EXTENSIBLE_PARAMETER = re.compile("IN[1-9][0-9]*$") |
64 |
64 |
65 HIGHLIGHT_TYPES = { |
65 HIGHLIGHT_TYPES = { |
66 ERROR_HIGHLIGHT: STC_PLC_ERROR, |
66 ERROR_HIGHLIGHT: STC_PLC_ERROR, |
67 SEARCH_RESULT_HIGHLIGHT: STC_PLC_SEARCH_RESULT, |
67 SEARCH_RESULT_HIGHLIGHT: STC_PLC_SEARCH_RESULT, |
265 else: |
265 else: |
266 event.SetDragText("") |
266 event.SetDragText("") |
267 return |
267 return |
268 dialog.Destroy() |
268 dialog.Destroy() |
269 if blockname.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
269 if blockname.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
270 message = _("\"%s\" pou already exists!")%blockname |
270 message = _("\"%s\" pou already exists!") % blockname |
271 elif blockname.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
271 elif blockname.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
272 message = _("\"%s\" element for this pou already exists!")%blockname |
272 message = _("\"%s\" element for this pou already exists!") % blockname |
273 else: |
273 else: |
274 self.Controler.AddEditedElementPouVar(self.TagName, values[0], blockname) |
274 self.Controler.AddEditedElementPouVar(self.TagName, values[0], blockname) |
275 self.RefreshVariablePanel() |
275 self.RefreshVariablePanel() |
276 self.RefreshVariableTree() |
276 self.RefreshVariableTree() |
277 blockinfo = self.Controler.GetBlockType(blocktype, blockinputs, self.Debug) |
277 blockinfo = self.Controler.GetBlockType(blocktype, blockinputs, self.Debug) |
294 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
294 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
295 dlg.Destroy() |
295 dlg.Destroy() |
296 if var_name is None: |
296 if var_name is None: |
297 return |
297 return |
298 elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
298 elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
299 message = _("\"%s\" pou already exists!")%var_name |
299 message = _("\"%s\" pou already exists!") % var_name |
300 elif var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
300 elif var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
301 message = _("\"%s\" element for this pou already exists!")%var_name |
301 message = _("\"%s\" element for this pou already exists!") % var_name |
302 else: |
302 else: |
303 location = values[0] |
303 location = values[0] |
304 if not location.startswith("%"): |
304 if not location.startswith("%"): |
305 dialog = wx.SingleChoiceDialog(self.ParentWindow, |
305 dialog = wx.SingleChoiceDialog(self.ParentWindow, |
306 _("Select a variable class:"), _("Variable class"), |
306 _("Select a variable class:"), _("Variable class"), |
345 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
345 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
346 dlg.Destroy() |
346 dlg.Destroy() |
347 if var_name is None: |
347 if var_name is None: |
348 return |
348 return |
349 elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
349 elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
350 message = _("\"%s\" pou already exists!")%var_name |
350 message = _("\"%s\" pou already exists!") % var_name |
351 else: |
351 else: |
352 var_type = values[2] |
352 var_type = values[2] |
353 if not var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
353 if not var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
354 self.Controler.AddEditedElementPouVar(self.TagName, |
354 self.Controler.AddEditedElementPouVar(self.TagName, |
355 var_type, |
355 var_type, |
368 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
368 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
369 dlg.Destroy() |
369 dlg.Destroy() |
370 if var_name is None: |
370 if var_name is None: |
371 return |
371 return |
372 elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
372 elif var_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]: |
373 message = _("\"%s\" pou already exists!")%var_name |
373 message = _("\"%s\" pou already exists!") % var_name |
374 else: |
374 else: |
375 if not var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
375 if not var_name.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]: |
376 self.Controler.AddEditedElementPouExternalVar(self.TagName, values[2], var_name) |
376 self.Controler.AddEditedElementPouExternalVar(self.TagName, values[2], var_name) |
377 self.RefreshVariablePanel() |
377 self.RefreshVariablePanel() |
378 self.RefreshVariableTree() |
378 self.RefreshVariableTree() |