521 self.VariablesGrid.SetEditable(not self.Debug) |
521 self.VariablesGrid.SetEditable(not self.Debug) |
522 |
522 |
523 def _AddVariable(new_row): |
523 def _AddVariable(new_row): |
524 if new_row > 0: |
524 if new_row > 0: |
525 row_content = self.Values[new_row - 1].copy() |
525 row_content = self.Values[new_row - 1].copy() |
|
526 |
526 result = VARIABLE_NAME_SUFFIX_MODEL.search(row_content["Name"]) |
527 result = VARIABLE_NAME_SUFFIX_MODEL.search(row_content["Name"]) |
527 if result is not None: |
528 if result is not None: |
528 name = row_content["Name"][:result.start(1)] |
529 name = row_content["Name"][:result.start(1)] |
529 suffix = result.group(1) |
530 suffix = result.group(1) |
530 if suffix != "": |
531 if suffix != "": |
532 else: |
533 else: |
533 start_idx = 0 |
534 start_idx = 0 |
534 else: |
535 else: |
535 name = row_content["Name"] |
536 name = row_content["Name"] |
536 start_idx = 0 |
537 start_idx = 0 |
537 row_content["Name"] = self.Controler.GenerateNewName( |
538 else: |
538 self.TagName, None, name + "%d", start_idx) |
539 name = "" |
|
540 |
|
541 if row_content is not None and row_content["Edit"]: |
|
542 row_content = self.Values[new_row - 1].copy() |
539 else: |
543 else: |
540 row_content = self.DefaultValue.copy() |
544 row_content = self.DefaultValue.copy() |
541 if self.Filter in self.DefaultTypes: |
545 if self.Filter in self.DefaultTypes: |
542 row_content["Class"] = self.DefaultTypes[self.Filter] |
546 row_content["Class"] = self.DefaultTypes[self.Filter] |
543 else: |
547 else: |
544 row_content["Class"] = self.Filter |
548 row_content["Class"] = self.Filter |
|
549 |
|
550 row_content["Name"] = self.Controler.GenerateNewName( |
|
551 self.TagName, None, name + "%d", start_idx) |
|
552 |
545 if self.Filter == "All" and len(self.Values) > 0: |
553 if self.Filter == "All" and len(self.Values) > 0: |
546 self.Values.insert(new_row, row_content) |
554 self.Values.insert(new_row, row_content) |
547 else: |
555 else: |
548 self.Values.append(row_content) |
556 self.Values.append(row_content) |
549 new_row = self.Table.GetNumberRows() |
557 new_row = self.Table.GetNumberRows() |