equal
deleted
inserted
replaced
311 if values[1] in ["location","NamedConstant"]: |
311 if values[1] in ["location","NamedConstant"]: |
312 var_name = values[3] |
312 var_name = values[3] |
313 else: |
313 else: |
314 var_name = values[0] |
314 var_name = values[0] |
315 tagname = self.ParentWindow.GetTagName() |
315 tagname = self.ParentWindow.GetTagName() |
316 if var_name.upper() in [name.upper() |
316 dlg = wx.TextEntryDialog( |
|
317 self.ParentWindow.ParentWindow.ParentWindow, |
|
318 _("Confirm or change variable name"), |
|
319 'Variable Drop', var_name) |
|
320 dlg.SetValue(var_name) |
|
321 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None |
|
322 dlg.Destroy() |
|
323 if var_name is None: |
|
324 return |
|
325 elif var_name.upper() in [name.upper() |
317 for name in self.ParentWindow.Controler.\ |
326 for name in self.ParentWindow.Controler.\ |
318 GetProjectPouNames(self.ParentWindow.Debug)]: |
327 GetProjectPouNames(self.ParentWindow.Debug)]: |
319 message = _("\"%s\" pou already exists!")%var_name |
328 message = _("\"%s\" pou already exists!")%var_name |
320 elif not var_name.upper() in [name.upper() |
329 elif not var_name.upper() in [name.upper() |
321 for name in self.ParentWindow.Controler.\ |
330 for name in self.ParentWindow.Controler.\ |
360 var_infos.Class = "Local" |
369 var_infos.Class = "Local" |
361 else: |
370 else: |
362 var_infos.Class = "Global" |
371 var_infos.Class = "Global" |
363 var_infos.Location = location |
372 var_infos.Location = location |
364 elif values[1] == "NamedConstant": |
373 elif values[1] == "NamedConstant": |
365 print "Fuck" |
|
366 if element_type in ["functionBlock","program"]: |
374 if element_type in ["functionBlock","program"]: |
367 var_infos.Class = "Local" |
375 var_infos.Class = "Local" |
368 var_infos.InitialValue = values[0] |
376 var_infos.InitialValue = values[0] |
369 else : |
377 else : |
370 return |
378 return |
372 var_infos.Class = "External" |
380 var_infos.Class = "External" |
373 var_infos.Number = len(self.ParentWindow.Values) |
381 var_infos.Number = len(self.ParentWindow.Values) |
374 self.ParentWindow.Values.append(var_infos) |
382 self.ParentWindow.Values.append(var_infos) |
375 self.ParentWindow.SaveValues() |
383 self.ParentWindow.SaveValues() |
376 self.ParentWindow.RefreshValues() |
384 self.ParentWindow.RefreshValues() |
|
385 else: |
|
386 message = _("\"%s\" element for this pou already exists!")%var_name |
377 |
387 |
378 if message is not None: |
388 if message is not None: |
379 wx.CallAfter(self.ShowMessage, message) |
389 wx.CallAfter(self.ShowMessage, message) |
380 |
390 |
381 def ShowMessage(self, message): |
391 def ShowMessage(self, message): |