equal
deleted
inserted
replaced
315 selected = dialog.GetSelection() |
315 selected = dialog.GetSelection() |
316 else: |
316 else: |
317 selected = None |
317 selected = None |
318 dialog.Destroy() |
318 dialog.Destroy() |
319 if selected is None: |
319 if selected is None: |
320 return |
320 return False |
321 if selected == 0: |
321 if selected == 0: |
322 location = "%I" + location |
322 location = "%I" + location |
323 elif selected == 1: |
323 elif selected == 1: |
324 location = "%Q" + location |
324 location = "%Q" + location |
325 else: |
325 else: |
331 _('Variable Drop'), var_name) |
331 _('Variable Drop'), var_name) |
332 dlg.SetValue(var_name) |
332 dlg.SetValue(var_name) |
333 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
333 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
334 dlg.Destroy() |
334 dlg.Destroy() |
335 if var_name is None: |
335 if var_name is None: |
336 return |
336 return False |
337 elif var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
337 elif var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
338 message = _("\"%s\" pou already exists!") % var_name |
338 message = _("\"%s\" pou already exists!") % var_name |
339 elif not var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
339 elif not var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
340 if location[1] == "Q": |
340 if location[1] == "Q": |
341 var_class = OUTPUT |
341 var_class = OUTPUT |
361 _('Variable Drop'), var_name) |
361 _('Variable Drop'), var_name) |
362 dlg.SetValue(var_name) |
362 dlg.SetValue(var_name) |
363 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
363 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
364 dlg.Destroy() |
364 dlg.Destroy() |
365 if var_name is None: |
365 if var_name is None: |
366 return |
366 return False |
367 elif var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
367 elif var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
368 message = _("\"%s\" pou already exists!") % var_name |
368 message = _("\"%s\" pou already exists!") % var_name |
369 elif not var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
369 elif not var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
370 var_class = INPUT |
370 var_class = INPUT |
371 var_type = values[2] |
371 var_type = values[2] |
383 _('Variable Drop'), var_name) |
383 _('Variable Drop'), var_name) |
384 dlg.SetValue(var_name) |
384 dlg.SetValue(var_name) |
385 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
385 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
386 dlg.Destroy() |
386 dlg.Destroy() |
387 if var_name is None: |
387 if var_name is None: |
388 return |
388 return False |
389 elif var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
389 elif var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
390 message = _("\"%s\" pou already exists!") % var_name |
390 message = _("\"%s\" pou already exists!") % var_name |
391 elif not var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
391 elif not var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
392 kwargs = dict(description=values[4]) if len(values)>4 else {} |
392 kwargs = dict(description=values[4]) if len(values)>4 else {} |
393 self.ParentWindow.Controler.AddEditedElementPouExternalVar(tagname, values[2], var_name, **kwargs) |
393 self.ParentWindow.Controler.AddEditedElementPouExternalVar(tagname, values[2], var_name, **kwargs) |
417 message = _("Unknown variable \"%s\" for this POU!") % values[0] |
417 message = _("Unknown variable \"%s\" for this POU!") % values[0] |
418 else: |
418 else: |
419 message = _("Variable don't belong to this POU!") |
419 message = _("Variable don't belong to this POU!") |
420 if message is not None: |
420 if message is not None: |
421 wx.CallAfter(self.ShowMessage, message) |
421 wx.CallAfter(self.ShowMessage, message) |
|
422 return False |
|
423 return True |
422 |
424 |
423 def GenerateTreeMenu(self, x, y, scaling, menu, base_path, var_class, tree): |
425 def GenerateTreeMenu(self, x, y, scaling, menu, base_path, var_class, tree): |
424 for child_name, child_type, (child_tree, child_dimensions) in tree: |
426 for child_name, child_type, (child_tree, child_dimensions) in tree: |
425 if base_path: |
427 if base_path: |
426 child_path = "%s.%s" % (base_path, child_name) |
428 child_path = "%s.%s" % (base_path, child_name) |