equal
deleted
inserted
replaced
851 return |
851 return |
852 wire = wires[0][0] |
852 wire = wires[0][0] |
853 wire.Clean() |
853 wire.Clean() |
854 self.RemoveWire(wire) |
854 self.RemoveWire(wire) |
855 transition.Clean() |
855 transition.Clean() |
856 self.AddBlock(transition) |
856 self.RemoveBlock(transition) |
857 self.Controler.RemoveCurrentElementEditingInstance(transition.GetId()) |
857 self.Controler.RemoveCurrentElementEditingInstance(transition.GetId()) |
858 previous_block.RemoveBranch(previous) |
858 previous_block.RemoveBranch(previous) |
859 if previous_block.GetBranchNumber() < 2: |
859 if previous_block.GetBranchNumber() < 2: |
860 self.DeleteDivergence(previous_block) |
860 self.DeleteDivergence(previous_block) |
861 else: |
861 else: |
915 else: |
915 else: |
916 self.RefreshDivergenceModel(previous_block) |
916 self.RefreshDivergenceModel(previous_block) |
917 else: |
917 else: |
918 self.DeleteDivergence(previous_block) |
918 self.DeleteDivergence(previous_block) |
919 divergence.Clean() |
919 divergence.Clean() |
920 self.AddBlocks(divergence) |
920 self.RemoveBlock(divergence) |
921 self.Controler.RemoveCurrentElementEditingInstance(divergence.GetId()) |
921 self.Controler.RemoveCurrentElementEditingInstance(divergence.GetId()) |
922 if next: |
922 if next: |
923 wire = self.ConnectConnectors(next, previous) |
923 wire = self.ConnectConnectors(next, previous) |
924 previous_block = previous.GetParentBlock() |
924 previous_block = previous.GetParentBlock() |
925 pos = previous.GetPosition(False) |
925 pos = previous.GetPosition(False) |
947 next = wire.StartConnected |
947 next = wire.StartConnected |
948 next_block = next.GetParentBlock() |
948 next_block = next.GetParentBlock() |
949 wire.Clean() |
949 wire.Clean() |
950 self.RemoveWire(wire) |
950 self.RemoveWire(wire) |
951 divergence.Clean() |
951 divergence.Clean() |
952 self.AddBlock(divergence) |
952 self.RemoveBlock(divergence) |
953 self.Controler.RemoveCurrentElementEditingInstance(divergence.GetId()) |
953 self.Controler.RemoveCurrentElementEditingInstance(divergence.GetId()) |
954 wire = self.ConnectConnectors(next, previous) |
954 wire = self.ConnectConnectors(next, previous) |
955 previous_pos = previous.GetPosition(False) |
955 previous_pos = previous.GetPosition(False) |
956 next_pos = next.GetPosition(False) |
956 next_pos = next.GetPosition(False) |
957 wire_size = GetWireSize(previous_block) |
957 wire_size = GetWireSize(previous_block) |
981 return |
981 return |
982 wire = wires[0][0] |
982 wire = wires[0][0] |
983 wire.Clean() |
983 wire.Clean() |
984 self.RemoveWire(wire) |
984 self.RemoveWire(wire) |
985 jump.Clean() |
985 jump.Clean() |
986 self.AddBlocks(jump) |
986 self.RemoveBlock(jump) |
987 self.Controler.RemoveCurrentElementEditingInstance(jump.GetId()) |
987 self.Controler.RemoveCurrentElementEditingInstance(jump.GetId()) |
988 if isinstance(previous_block, SFC_Step): |
988 if isinstance(previous_block, SFC_Step): |
989 previous_block.RemoveOutput() |
989 previous_block.RemoveOutput() |
990 self.RefreshStepModel(previous_block) |
990 self.RefreshStepModel(previous_block) |
991 elif isinstance(previous_block, SFC_Divergence): |
991 elif isinstance(previous_block, SFC_Divergence): |
1010 wire = wires[0][0] |
1010 wire = wires[0][0] |
1011 step = wire.EndConnected.GetParentBlock() |
1011 step = wire.EndConnected.GetParentBlock() |
1012 wire.Clean() |
1012 wire.Clean() |
1013 self.RemoveWire(wire) |
1013 self.RemoveWire(wire) |
1014 actionblock.Clean() |
1014 actionblock.Clean() |
1015 self.AddBlock(actionblock) |
1015 self.RemoveBlock(actionblock) |
1016 self.Controler.RemoveCurrentElementEditingInstance(actionblock.GetId()) |
1016 self.Controler.RemoveCurrentElementEditingInstance(actionblock.GetId()) |
1017 step.RemoveAction() |
1017 step.RemoveAction() |
1018 self.RefreshStepModel(step) |
1018 self.RefreshStepModel(step) |
1019 step.RefreshOutputPosition() |
1019 step.RefreshOutputPosition() |
1020 step.RefreshOutputModel(True) |
1020 step.RefreshOutputModel(True) |