author | lbessard |
Fri, 05 Oct 2007 18:11:27 +0200 | |
changeset 106 | 3fc63036de16 |
parent 90 | 2245e8776086 |
child 112 | 317148fc1225 |
permissions | -rw-r--r-- |
0 | 1 |
#!/usr/bin/env python |
2 |
# -*- coding: utf-8 -*- |
|
3 |
||
4 |
#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor |
|
5 |
#based on the plcopen standard. |
|
6 |
# |
|
58 | 7 |
#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
0 | 8 |
# |
9 |
#See COPYING file for copyrights details. |
|
10 |
# |
|
11 |
#This library is free software; you can redistribute it and/or |
|
5 | 12 |
#modify it under the terms of the GNU General Public |
0 | 13 |
#License as published by the Free Software Foundation; either |
14 |
#version 2.1 of the License, or (at your option) any later version. |
|
15 |
# |
|
16 |
#This library is distributed in the hope that it will be useful, |
|
17 |
#but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
18 |
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
58 | 19 |
#General Public License for more details. |
0 | 20 |
# |
5 | 21 |
#You should have received a copy of the GNU General Public |
0 | 22 |
#License along with this library; if not, write to the Free Software |
23 |
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
24 |
||
25 |
import wx |
|
26 |
from types import * |
|
27 |
||
28 |
from Viewer import * |
|
29 |
||
30 |
class SFC_Viewer(Viewer): |
|
31 |
||
32 |
def __init__(self, parent, window, controler): |
|
33 |
Viewer.__init__(self, parent, window, controler) |
|
34 |
||
35 |
def ConnectConnectors(self, start, end): |
|
36 |
startpoint = [start.GetPosition(False), start.GetDirection()] |
|
37 |
endpoint = [end.GetPosition(False), end.GetDirection()] |
|
38 |
wire = Wire(self, startpoint, endpoint) |
|
42 | 39 |
self.AddWire(wire) |
0 | 40 |
start.Connect((wire, 0), False) |
41 |
end.Connect((wire, -1), False) |
|
42 |
wire.ConnectStartPoint(None, start) |
|
43 |
wire.ConnectEndPoint(None, end) |
|
44 |
return wire |
|
45 |
||
46 |
def CreateTransition(self, connector, next = None): |
|
47 |
previous = connector.GetParentBlock() |
|
48 |
id = self.GetNewId() |
|
80 | 49 |
transition = SFC_Transition(self, "reference", "", 0, id) |
0 | 50 |
pos = connector.GetPosition(False) |
51 |
transition.SetPosition(pos.x, pos.y + SFC_WIRE_MIN_SIZE) |
|
52 |
transition_connectors = transition.GetConnectors() |
|
53 |
wire = self.ConnectConnectors(transition_connectors["input"], connector) |
|
54 |
if isinstance(previous, SFC_Divergence): |
|
55 |
previous.RefreshConnectedPosition(connector) |
|
56 |
else: |
|
57 |
previous.RefreshOutputPosition() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
58 |
wire.SetPoints([wx.Point(pos.x, pos.y + GetWireSize(previous)), wx.Point(pos.x, pos.y)]) |
42 | 59 |
self.AddBlock(transition) |
0 | 60 |
self.Controler.AddCurrentElementEditingTransition(id) |
61 |
self.RefreshTransitionModel(transition) |
|
62 |
if next: |
|
63 |
wire = self.ConnectConnectors(next, transition_connectors["output"]) |
|
64 |
pos = transition_connectors["output"].GetPosition(False) |
|
65 |
next_block = next.GetParentBlock() |
|
66 |
next_pos = next.GetPosition(False) |
|
67 |
transition.RefreshOutputPosition((0, pos.y + SFC_WIRE_MIN_SIZE - next_pos.y)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
68 |
wire.SetPoints([wx.Point(pos.x, pos.y + SFC_WIRE_MIN_SIZE), wx.Point(pos.x, pos.y)]) |
0 | 69 |
if isinstance(next_block, SFC_Divergence): |
70 |
next_block.RefreshPosition() |
|
2 | 71 |
transition.RefreshOutputModel(True) |
0 | 72 |
return transition |
73 |
||
74 |
def RemoveTransition(self, transition): |
|
75 |
connectors = transition.GetConnectors() |
|
76 |
input_wires = connectors["input"].GetWires() |
|
77 |
if len(input_wires) != 1: |
|
78 |
return |
|
79 |
input_wire = input_wires[0][0] |
|
80 |
previous = input_wire.EndConnected |
|
81 |
input_wire.Clean() |
|
42 | 82 |
self.RemoveWire(input_wire) |
0 | 83 |
output_wires = connectors["output"].GetWires() |
84 |
if len(output_wires) != 1: |
|
85 |
return |
|
86 |
output_wire = output_wires[0][0] |
|
87 |
next = output_wire.StartConnected |
|
88 |
output_wire.Clean() |
|
42 | 89 |
self.RemoveWire(output_wire) |
0 | 90 |
transition.Clean() |
42 | 91 |
self.RemoveBlock(transition) |
0 | 92 |
self.Controler.RemoveCurrentElementEditingInstance(transition.GetId()) |
93 |
wire = self.ConnectConnectors(next, previous) |
|
94 |
return wire |
|
95 |
||
96 |
def CreateStep(self, name, connector, next = None): |
|
97 |
previous = connector.GetParentBlock() |
|
98 |
id = self.GetNewId() |
|
99 |
step = SFC_Step(self, name, False, id) |
|
100 |
if next: |
|
101 |
step.AddOutput() |
|
102 |
min_width, min_height = step.GetMinSize() |
|
103 |
pos = connector.GetPosition(False) |
|
104 |
step.SetPosition(pos.x, pos.y + SFC_WIRE_MIN_SIZE) |
|
105 |
step.SetSize(min_width, min_height) |
|
106 |
step_connectors = step.GetConnectors() |
|
107 |
wire = self.ConnectConnectors(step_connectors["input"], connector) |
|
108 |
if isinstance(previous, SFC_Divergence): |
|
109 |
previous.RefreshConnectedPosition(connector) |
|
110 |
else: |
|
111 |
previous.RefreshOutputPosition() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
112 |
wire.SetPoints([wx.Point(pos.x, pos.y + GetWireSize(previous)), wx.Point(pos.x, pos.y)]) |
42 | 113 |
self.AddBlock(step) |
0 | 114 |
self.Controler.AddCurrentElementEditingStep(id) |
115 |
self.RefreshStepModel(step) |
|
116 |
if next: |
|
117 |
wire = self.ConnectConnectors(next, step_connectors["output"]) |
|
118 |
pos = step_connectors["output"].GetPosition(False) |
|
119 |
next_block = next.GetParentBlock() |
|
120 |
next_pos = next.GetPosition(False) |
|
121 |
step.RefreshOutputPosition((0, pos.y + SFC_WIRE_MIN_SIZE - next_pos.y)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
122 |
wire.SetPoints([wx.Point(pos.x, pos.y + SFC_WIRE_MIN_SIZE), wx.Point(pos.x, pos.y)]) |
0 | 123 |
if isinstance(next_block, SFC_Divergence): |
124 |
next_block.RefreshPosition() |
|
2 | 125 |
step.RefreshOutputModel(True) |
0 | 126 |
return step |
127 |
||
128 |
def RemoveStep(self, step): |
|
129 |
connectors = step.GetConnectors() |
|
130 |
if connectors["input"]: |
|
131 |
input_wires = connectors["input"].GetWires() |
|
132 |
if len(input_wires) != 1: |
|
133 |
return |
|
134 |
input_wire = input_wires[0][0] |
|
135 |
previous = input_wire.EndConnected |
|
136 |
input_wire.Clean() |
|
42 | 137 |
self.RemoveWire(input_wire) |
0 | 138 |
else: |
139 |
previous = None |
|
140 |
if connectors["output"]: |
|
141 |
output_wires = connectors["output"].GetWires() |
|
142 |
if len(output_wires) != 1: |
|
143 |
return |
|
144 |
output_wire = output_wires[0][0] |
|
145 |
next = output_wire.StartConnected |
|
146 |
output_wire.Clean() |
|
42 | 147 |
self.RemoveWire(output_wire) |
0 | 148 |
else: |
149 |
next = None |
|
150 |
action = step.GetActionConnector() |
|
151 |
if action: |
|
152 |
self.DeleteActionBlock(action.GetParentBlock()) |
|
153 |
step.Clean() |
|
42 | 154 |
self.RemoveBlock(step) |
0 | 155 |
self.Controler.RemoveCurrentElementEditingInstance(step.GetId()) |
156 |
if next and previous: |
|
157 |
wire = self.ConnectConnectors(next, previous) |
|
158 |
return wire |
|
159 |
else: |
|
160 |
return None |
|
161 |
||
162 |
#------------------------------------------------------------------------------- |
|
163 |
# Mouse event functions |
|
164 |
#------------------------------------------------------------------------------- |
|
165 |
||
166 |
def OnViewerLeftDown(self, event): |
|
27 | 167 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
168 |
Viewer.OnViewerLeftDown(self, event) |
|
169 |
elif self.Mode == MODE_SELECTION: |
|
170 |
dc = self.GetLogicalDC() |
|
171 |
pos = event.GetLogicalPosition(dc) |
|
0 | 172 |
if event.ControlDown(): |
173 |
element = self.FindElement(pos, True) |
|
42 | 174 |
if element and not self.IsWire(element): |
0 | 175 |
if isinstance(self.SelectedElement, Graphic_Group): |
176 |
self.SelectedElement.SelectElement(element) |
|
177 |
else: |
|
178 |
group = Graphic_Group(self) |
|
179 |
self.SelectedElement.SetSelected(False) |
|
180 |
group.SelectElement(self.SelectedElement) |
|
181 |
group.SelectElement(element) |
|
182 |
self.SelectedElement = group |
|
183 |
elements = self.SelectedElement.GetElements() |
|
184 |
if len(elements) == 0: |
|
185 |
self.SelectedElement = element |
|
186 |
elif len(elements) == 1: |
|
187 |
self.SelectedElement = elements[0] |
|
188 |
else: |
|
189 |
element = self.FindElement(pos) |
|
190 |
if self.SelectedElement and self.SelectedElement != element: |
|
42 | 191 |
if self.IsWire(self.SelectedElement): |
0 | 192 |
self.SelectedElement.SetSelectedSegment(None) |
193 |
else: |
|
194 |
self.SelectedElement.SetSelected(False) |
|
195 |
self.SelectedElement = None |
|
196 |
self.Refresh() |
|
197 |
if element: |
|
198 |
self.SelectedElement = element |
|
27 | 199 |
self.SelectedElement.OnLeftDown(event, dc, self.Scaling) |
0 | 200 |
self.Refresh() |
201 |
else: |
|
202 |
self.rubberBand.Reset() |
|
27 | 203 |
self.rubberBand.OnLeftDown(event, dc, self.Scaling) |
0 | 204 |
elif self.Mode == MODE_COMMENT: |
205 |
self.rubberBand.Reset() |
|
27 | 206 |
self.rubberBand.OnLeftDown(event, self.GetLogicalDC(), self.Scaling) |
0 | 207 |
elif self.Mode == MODE_WIRE: |
27 | 208 |
pos = GetScaledEventPosition(event, self.GetLogicalDC(), self.Scaling) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
209 |
wire = Wire(self, [wx.Point(pos.x, pos.y), SOUTH], [wx.Point(pos.x, pos.y), NORTH]) |
0 | 210 |
wire.oldPos = pos |
211 |
wire.Handle = (HANDLE_POINT, 0) |
|
212 |
wire.ProcessDragging(0, 0) |
|
213 |
wire.Handle = (HANDLE_POINT, 1) |
|
42 | 214 |
self.AddWire(wire) |
0 | 215 |
if self.SelectedElement: |
216 |
self.SelectedElement.SetSelected(False) |
|
217 |
self.SelectedElement = wire |
|
218 |
self.Refresh() |
|
219 |
event.Skip() |
|
220 |
||
221 |
def OnViewerLeftUp(self, event): |
|
27 | 222 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
223 |
Viewer.OnViewerLeftUp(self, event) |
|
224 |
elif self.rubberBand.IsShown(): |
|
0 | 225 |
if self.Mode == MODE_SELECTION: |
226 |
elements = self.SearchElements(self.rubberBand.GetCurrentExtent()) |
|
27 | 227 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
0 | 228 |
if len(elements) > 0: |
229 |
self.SelectedElement = Graphic_Group(self) |
|
230 |
self.SelectedElement.SetElements(elements) |
|
231 |
self.SelectedElement.SetSelected(True) |
|
232 |
self.Refresh() |
|
233 |
elif self.Mode == MODE_COMMENT: |
|
234 |
bbox = self.rubberBand.GetCurrentExtent() |
|
27 | 235 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
236 |
wx.CallAfter(self.AddComment, bbox) |
27 | 237 |
elif self.Mode == MODE_INITIALSTEP: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
238 |
wx.CallAfter(self.AddInitialStep, GetScaledEventPosition(event, self.GetLogicalDC(), self.Scaling)) |
0 | 239 |
elif self.Mode == MODE_SELECTION and self.SelectedElement: |
42 | 240 |
if self.IsWire(self.SelectedElement): |
0 | 241 |
self.SelectedElement.SetSelectedSegment(0) |
242 |
else: |
|
27 | 243 |
self.SelectedElement.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
244 |
wx.CallAfter(self.SetCursor, wx.NullCursor) |
0 | 245 |
self.ReleaseMouse() |
246 |
self.Refresh() |
|
247 |
elif self.Mode == MODE_WIRE and self.SelectedElement: |
|
248 |
self.SelectedElement.ResetPoints() |
|
27 | 249 |
self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling) |
0 | 250 |
self.SelectedElement.GeneratePoints() |
251 |
self.SelectedElement.RefreshModel() |
|
252 |
self.SelectedElement.SetSelected(True) |
|
253 |
self.Refresh() |
|
254 |
event.Skip() |
|
255 |
||
256 |
def OnViewerRightUp(self, event): |
|
27 | 257 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
258 |
Viewer.OnViewerRightUp(self, event) |
|
259 |
else: |
|
260 |
dc = self.GetLogicalDC() |
|
261 |
pos = event.GetLogicalPosition(dc) |
|
262 |
element = self.FindElement(pos) |
|
263 |
if element: |
|
264 |
if self.SelectedElement and self.SelectedElement != element: |
|
265 |
self.SelectedElement.SetSelected(False) |
|
266 |
self.SelectedElement = element |
|
42 | 267 |
if self.IsWire(self.SelectedElement): |
27 | 268 |
self.SelectedElement.SetSelectedSegment(0) |
269 |
else: |
|
270 |
self.SelectedElement.SetSelected(True) |
|
271 |
self.SelectedElement.OnRightUp(event, dc, self.Scaling) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
272 |
wx.CallAfter(self.SetCursor, wx.NullCursor) |
27 | 273 |
self.ReleaseMouse() |
274 |
self.Refresh() |
|
0 | 275 |
event.Skip() |
276 |
||
277 |
def OnViewerLeftDClick(self, event): |
|
27 | 278 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
279 |
Viewer.OnViewerLeftDClick(self, event) |
|
280 |
elif self.Mode == MODE_SELECTION and self.SelectedElement: |
|
281 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
|
0 | 282 |
self.Refresh() |
283 |
event.Skip() |
|
284 |
||
285 |
def OnViewerMotion(self, event): |
|
27 | 286 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
287 |
Viewer.OnViewerMotion(self, event) |
|
71 | 288 |
else: |
289 |
if self.rubberBand.IsShown(): |
|
290 |
self.rubberBand.OnMotion(event, self.GetLogicalDC(), self.Scaling) |
|
291 |
elif self.Mode == MODE_SELECTION and self.SelectedElement: |
|
292 |
if not self.IsWire(self.SelectedElement) and not isinstance(self.SelectedElement, Graphic_Group): |
|
293 |
self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling) |
|
294 |
self.Refresh() |
|
295 |
elif self.Mode == MODE_WIRE and self.SelectedElement: |
|
296 |
self.SelectedElement.ResetPoints() |
|
27 | 297 |
self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling) |
71 | 298 |
self.SelectedElement.GeneratePoints() |
299 |
self.Refresh() |
|
300 |
self.UpdateScrollPos(event) |
|
0 | 301 |
event.Skip() |
302 |
||
303 |
#------------------------------------------------------------------------------- |
|
304 |
# Keyboard event functions |
|
305 |
#------------------------------------------------------------------------------- |
|
306 |
||
307 |
def OnChar(self, event): |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
308 |
xpos, ypos = self.GetScrollPos(wx.HORIZONTAL), self.GetScrollPos(wx.VERTICAL) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
309 |
xmax = self.GetScrollRange(wx.HORIZONTAL) - self.GetScrollThumb(wx.HORIZONTAL) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
310 |
ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL) |
0 | 311 |
keycode = event.GetKeyCode() |
312 |
if self.Scaling: |
|
313 |
scaling = self.Scaling |
|
314 |
else: |
|
315 |
scaling = (8, 8) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
316 |
if keycode == wx.WXK_DELETE and self.SelectedElement: |
0 | 317 |
self.SelectedElement.Delete() |
318 |
self.SelectedElement = None |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
319 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
320 |
self.RefreshScrollBars() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
321 |
self.Refresh() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
322 |
elif keycode == wx.WXK_LEFT: |
42 | 323 |
if event.ControlDown() and event.ShiftDown(): |
324 |
self.Scroll(0, ypos) |
|
325 |
elif event.ControlDown(): |
|
326 |
self.Scroll(max(0, xpos - 1), ypos) |
|
327 |
elif self.SelectedElement: |
|
328 |
self.SelectedElement.Move(-scaling[0], 0) |
|
67
3a1b0afdaf84
Adding support for automatically generate function blocks in interface when a block is added
lbessard
parents:
64
diff
changeset
|
329 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
330 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
331 |
self.RefreshScrollBars() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
332 |
self.Refresh() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
333 |
elif keycode == wx.WXK_RIGHT: |
42 | 334 |
if event.ControlDown() and event.ShiftDown(): |
335 |
self.Scroll(xmax, ypos) |
|
336 |
elif event.ControlDown(): |
|
337 |
self.Scroll(min(xpos + 1, xmax), ypos) |
|
338 |
elif self.SelectedElement: |
|
339 |
self.SelectedElement.Move(scaling[0], 0) |
|
67
3a1b0afdaf84
Adding support for automatically generate function blocks in interface when a block is added
lbessard
parents:
64
diff
changeset
|
340 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
341 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
342 |
self.RefreshScrollBars() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
343 |
self.Refresh() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
344 |
elif keycode == wx.WXK_UP: |
42 | 345 |
if event.ControlDown() and event.ShiftDown(): |
346 |
self.Scroll(xpos, 0) |
|
347 |
elif event.ControlDown(): |
|
348 |
self.Scroll(xpos, max(0, ypos - 1)) |
|
349 |
elif self.SelectedElement: |
|
350 |
self.SelectedElement.Move(0, -scaling[1]) |
|
67
3a1b0afdaf84
Adding support for automatically generate function blocks in interface when a block is added
lbessard
parents:
64
diff
changeset
|
351 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
352 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
353 |
self.RefreshScrollBars() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
354 |
self.Refresh() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
355 |
elif keycode == wx.WXK_DOWN: |
42 | 356 |
if event.ControlDown() and event.ShiftDown(): |
357 |
self.Scroll(xpos, ymax) |
|
358 |
elif event.ControlDown(): |
|
359 |
self.Scroll(xpos, min(ypos + 1, ymax)) |
|
360 |
elif self.SelectedElement: |
|
361 |
self.SelectedElement.Move(0, scaling[1]) |
|
67
3a1b0afdaf84
Adding support for automatically generate function blocks in interface when a block is added
lbessard
parents:
64
diff
changeset
|
362 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
363 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
364 |
self.RefreshScrollBars() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
365 |
self.Refresh() |
0 | 366 |
|
367 |
#------------------------------------------------------------------------------- |
|
368 |
# Adding element functions |
|
369 |
#------------------------------------------------------------------------------- |
|
370 |
||
371 |
def AddInitialStep(self, pos): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
372 |
dialog = StepNameDialog(self.ParentWindow, "Add a new initial step", "Please enter step name", "", wx.OK|wx.CANCEL) |
9 | 373 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
374 |
dialog.SetVariables(self.Controler.GetCurrentElementEditingInterfaceVars()) |
|
375 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step)]) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
376 |
if dialog.ShowModal() == wx.ID_OK: |
0 | 377 |
id = self.GetNewId() |
378 |
name = dialog.GetValue() |
|
379 |
step = SFC_Step(self, name, True, id) |
|
380 |
min_width, min_height = step.GetMinSize() |
|
381 |
step.SetPosition(pos.x, pos.y) |
|
382 |
width, height = step.GetSize() |
|
383 |
step.SetSize(max(min_width, width), max(min_height, height)) |
|
42 | 384 |
self.AddBlock(step) |
0 | 385 |
self.Controler.AddCurrentElementEditingStep(id) |
386 |
self.RefreshStepModel(step) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
387 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
388 |
self.RefreshScrollBars() |
0 | 389 |
self.Refresh() |
390 |
dialog.Destroy() |
|
391 |
||
392 |
def AddStep(self): |
|
393 |
if self.SelectedElement in self.Wires or isinstance(self.SelectedElement, SFC_Step): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
394 |
dialog = StepNameDialog(self.ParentWindow, "Add a new step", "Please enter step name", "", wx.OK|wx.CANCEL) |
9 | 395 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
396 |
dialog.SetVariables(self.Controler.GetCurrentElementEditingInterfaceVars()) |
|
397 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step)]) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
398 |
if dialog.ShowModal() == wx.ID_OK: |
0 | 399 |
name = dialog.GetValue() |
42 | 400 |
if self.IsWire(self.SelectedElement): |
0 | 401 |
self.SelectedElement.SetSelectedSegment(None) |
402 |
previous = self.SelectedElement.EndConnected |
|
403 |
next = self.SelectedElement.StartConnected |
|
404 |
self.SelectedElement.Clean() |
|
42 | 405 |
self.RemoveWire(self.SelectedElement) |
0 | 406 |
else: |
407 |
connectors = self.SelectedElement.GetConnectors() |
|
408 |
if connectors["output"]: |
|
409 |
previous = connectors["output"] |
|
410 |
wires = previous.GetWires() |
|
411 |
if len(wires) != 1: |
|
412 |
return |
|
413 |
wire = wires[0][0] |
|
414 |
next = wire.StartConnected |
|
415 |
wire.Clean() |
|
42 | 416 |
self.RemoveWire(wire) |
0 | 417 |
else: |
418 |
self.SelectedElement.AddOutput() |
|
419 |
connectors = self.SelectedElement.GetConnectors() |
|
420 |
self.RefreshStepModel(self.SelectedElement) |
|
421 |
previous = connectors["output"] |
|
422 |
next = None |
|
423 |
previous_block = previous.GetParentBlock() |
|
424 |
if isinstance(previous_block, SFC_Step) or isinstance(previous_block, SFC_Divergence) and previous_block.GetType() in [SELECTION_DIVERGENCE, SELECTION_CONVERGENCE]: |
|
425 |
transition = self.CreateTransition(previous) |
|
426 |
transition_connectors = transition.GetConnectors() |
|
427 |
step = self.CreateStep(name, transition_connectors["output"], next) |
|
428 |
else: |
|
429 |
step = self.CreateStep(name, previous) |
|
430 |
step.AddOutput() |
|
431 |
step.RefreshModel() |
|
432 |
step_connectors = step.GetConnectors() |
|
433 |
transition = self.CreateTransition(step_connectors["output"], next) |
|
42 | 434 |
if self.IsWire(self.SelectedElement): |
0 | 435 |
self.SelectedElement = wire |
436 |
self.SelectedElement.SetSelectedSegment(0) |
|
437 |
else: |
|
438 |
self.SelectedElement.SetSelected(False) |
|
439 |
self.SelectedElement = step |
|
440 |
self.SelectedElement.SetSelected(True) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
441 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
442 |
self.RefreshScrollBars() |
0 | 443 |
self.Refresh() |
444 |
dialog.Destroy() |
|
445 |
||
446 |
def AddStepAction(self): |
|
447 |
if isinstance(self.SelectedElement, SFC_Step): |
|
448 |
connectors = self.SelectedElement.GetConnectors() |
|
449 |
if not connectors["action"]: |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
450 |
dialog = ActionBlockDialog(self.ParentWindow) |
0 | 451 |
dialog.SetQualifierList(self.Controler.GetQualifierTypes()) |
452 |
dialog.SetActionList(self.Controler.GetCurrentElementEditingActions()) |
|
453 |
dialog.SetVariableList(self.Controler.GetCurrentElementEditingInterfaceVars()) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
454 |
if dialog.ShowModal() == wx.ID_OK: |
0 | 455 |
actions = dialog.GetValues() |
456 |
self.SelectedElement.AddAction() |
|
457 |
self.RefreshStepModel(self.SelectedElement) |
|
458 |
connectors = self.SelectedElement.GetConnectors() |
|
459 |
pos = connectors["action"].GetPosition(False) |
|
460 |
id = self.GetNewId() |
|
461 |
actionblock = SFC_ActionBlock(self, [], id) |
|
462 |
actionblock.SetPosition(pos.x + SFC_WIRE_MIN_SIZE, pos.y - SFC_STEP_DEFAULT_SIZE[1] / 2) |
|
463 |
actionblock_connector = actionblock.GetConnector() |
|
464 |
wire = self.ConnectConnectors(actionblock_connector, connectors["action"]) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
465 |
wire.SetPoints([wx.Point(pos.x + SFC_WIRE_MIN_SIZE, pos.y), wx.Point(pos.x, pos.y)]) |
0 | 466 |
actionblock.SetActions(actions) |
42 | 467 |
self.AddBlock(actionblock) |
0 | 468 |
self.Controler.AddCurrentElementEditingActionBlock(id) |
469 |
self.RefreshActionBlockModel(actionblock) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
470 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
471 |
self.RefreshScrollBars() |
0 | 472 |
self.Refresh() |
473 |
dialog.Destroy() |
|
474 |
||
475 |
def AddDivergence(self): |
|
476 |
if self.SelectedElement in self.Wires or isinstance(self.SelectedElement, Graphic_Group) or isinstance(self.SelectedElement, SFC_Step): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
477 |
dialog = DivergenceCreateDialog(self.ParentWindow) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
478 |
if dialog.ShowModal() == wx.ID_OK: |
0 | 479 |
value = dialog.GetValues() |
480 |
if value["type"] == SELECTION_DIVERGENCE: |
|
481 |
if self.SelectedElement in self.Wires and isinstance(self.SelectedElement.EndConnected.GetParentBlock(), SFC_Step): |
|
482 |
self.SelectedElement.SetSelectedSegment(None) |
|
483 |
previous = self.SelectedElement.EndConnected |
|
484 |
next = self.SelectedElement.StartConnected |
|
485 |
self.SelectedElement.Clean() |
|
42 | 486 |
self.RemoveWire(self.SelectedElement) |
0 | 487 |
self.SelectedElement = None |
488 |
elif isinstance(self.SelectedElement, SFC_Step): |
|
489 |
connectors = self.SelectedElement.GetConnectors() |
|
490 |
if connectors["output"]: |
|
491 |
previous = connectors["output"] |
|
492 |
wires = previous.GetWires() |
|
493 |
if len(wires) != 1: |
|
494 |
return |
|
495 |
wire = wires[0][0] |
|
496 |
next = wire.StartConnected |
|
497 |
wire.Clean() |
|
42 | 498 |
self.RemoveWire(wire) |
0 | 499 |
else: |
500 |
self.SelectedElement.AddOutput() |
|
501 |
connectors = self.SelectedElement.GetConnectors() |
|
502 |
self.RefreshStepModel(self.SelectedElement) |
|
503 |
previous = connectors["output"] |
|
504 |
next = None |
|
505 |
else: |
|
506 |
return |
|
507 |
id = self.GetNewId() |
|
508 |
divergence = SFC_Divergence(self, SELECTION_DIVERGENCE, value["number"], id) |
|
509 |
pos = previous.GetPosition(False) |
|
510 |
previous_block = previous.GetParentBlock() |
|
511 |
wire_size = GetWireSize(previous_block) |
|
512 |
divergence.SetPosition(pos.x, pos.y + wire_size) |
|
513 |
divergence_connectors = divergence.GetConnectors() |
|
514 |
wire = self.ConnectConnectors(divergence_connectors["inputs"][0], previous) |
|
515 |
previous_block.RefreshOutputPosition() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
516 |
wire.SetPoints([wx.Point(pos.x, pos.y + wire_size), wx.Point(pos.x, pos.y)]) |
42 | 517 |
self.AddBlock(divergence) |
0 | 518 |
self.Controler.AddCurrentElementEditingDivergence(id, value["type"]) |
519 |
self.RefreshDivergenceModel(divergence) |
|
520 |
for index, connector in enumerate(divergence_connectors["outputs"]): |
|
521 |
if next: |
|
522 |
wire = self.ConnectConnectors(next, connector) |
|
523 |
pos = connector.GetPosition(False) |
|
524 |
next_pos = next.GetPosition(False) |
|
525 |
next_block = next.GetParentBlock() |
|
526 |
divergence.RefreshOutputPosition((0, pos.y + SFC_WIRE_MIN_SIZE - next_pos.y)) |
|
527 |
divergence.RefreshConnectedPosition(connector) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
528 |
wire.SetPoints([wx.Point(pos.x, pos.y + SFC_WIRE_MIN_SIZE), wx.Point(pos.x, pos.y)]) |
0 | 529 |
next_block.RefreshModel() |
530 |
next = None |
|
531 |
else: |
|
532 |
transition = self.CreateTransition(connector) |
|
533 |
transition_connectors = transition.GetConnectors() |
|
534 |
step = self.CreateStep("Step", transition_connectors["output"]) |
|
535 |
elif value["type"] == SIMULTANEOUS_DIVERGENCE: |
|
536 |
if self.SelectedElement in self.Wires and isinstance(self.SelectedElement.EndConnected.GetParentBlock(), SFC_Transition): |
|
537 |
self.SelectedElement.SetSelectedSegment(None) |
|
538 |
previous = self.SelectedElement.EndConnected |
|
539 |
next = self.SelectedElement.StartConnected |
|
540 |
self.SelectedElement.Clean() |
|
42 | 541 |
self.RemoveWire(self.SelectedElement) |
0 | 542 |
self.SelectedElement = None |
543 |
elif isinstance(self.SelectedElement, SFC_Step): |
|
544 |
connectors = self.SelectedElement.GetConnectors() |
|
545 |
if connectors["output"]: |
|
546 |
previous = connectors["output"] |
|
547 |
wires = previous.GetWires() |
|
548 |
if len(wires) != 1: |
|
549 |
return |
|
550 |
wire = wires[0][0] |
|
551 |
next = wire.StartConnected |
|
552 |
wire.Clean() |
|
42 | 553 |
self.RemoveWire(wire) |
0 | 554 |
else: |
555 |
self.SelectedElement.AddOutput() |
|
556 |
connectors = self.SelectedElement.GetConnectors() |
|
557 |
self.RefreshStepModel(self.SelectedElement) |
|
558 |
previous = connectors["output"] |
|
559 |
next = None |
|
560 |
transition = self.CreateTransition(previous) |
|
561 |
transition_connectors = transition.GetConnectors() |
|
562 |
previous = transition_connectors["output"] |
|
563 |
else: |
|
564 |
return |
|
565 |
id = self.GetNewId() |
|
566 |
divergence = SFC_Divergence(self, SIMULTANEOUS_DIVERGENCE, value["number"], id) |
|
567 |
pos = previous.GetPosition(False) |
|
568 |
previous_block = previous.GetParentBlock() |
|
569 |
wire_size = GetWireSize(previous_block) |
|
570 |
divergence.SetPosition(pos.x, pos.y + wire_size) |
|
571 |
divergence_connectors = divergence.GetConnectors() |
|
572 |
wire = self.ConnectConnectors(divergence_connectors["inputs"][0], previous) |
|
573 |
previous_block.RefreshOutputPosition() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
574 |
wire.SetPoints([wx.Point(pos.x, pos.y + wire_size), wx.Point(pos.x, pos.y)]) |
42 | 575 |
self.AddBlock(divergence) |
0 | 576 |
self.Controler.AddCurrentElementEditingDivergence(id, value["type"]) |
577 |
self.RefreshDivergenceModel(divergence) |
|
578 |
for index, connector in enumerate(divergence_connectors["outputs"]): |
|
579 |
if next: |
|
580 |
wire = self.ConnectConnectors(next, connector) |
|
581 |
pos = connector.GetPosition(False) |
|
582 |
next_pos = next.GetPosition(False) |
|
583 |
next_block = next.GetParentBlock() |
|
584 |
divergence.RefreshOutputPosition((0, pos.y + SFC_WIRE_MIN_SIZE - next_pos.y)) |
|
585 |
divergence.RefreshConnectedPosition(connector) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
586 |
wire.SetPoints([wx.Point(pos.x, pos.y + SFC_WIRE_MIN_SIZE), wx.Point(pos.x, pos.y)]) |
0 | 587 |
next_block.RefreshModel() |
588 |
next = None |
|
589 |
else: |
|
590 |
step = self.CreateStep("Step", connector) |
|
591 |
elif isinstance(self.SelectedElement, Graphic_Group) and len(self.SelectedElement.GetElements()) > 1: |
|
592 |
next = None |
|
593 |
for element in self.SelectedElement.GetElements(): |
|
594 |
connectors = element.GetConnectors() |
|
595 |
if not isinstance(element, SFC_Step) or connectors["output"] and next: |
|
596 |
return |
|
597 |
elif connectors["output"] and not next: |
|
598 |
wires = connectors["output"].GetWires() |
|
599 |
if len(wires) != 1: |
|
600 |
return |
|
601 |
if value["type"] == SELECTION_CONVERGENCE: |
|
602 |
transition = wires[0][0].StartConnected.GetParentBlock() |
|
603 |
transition_connectors = transition.GetConnectors() |
|
604 |
wires = transition_connectors["output"].GetWires() |
|
605 |
if len(wires) != 1: |
|
606 |
return |
|
607 |
wire = wires[0][0] |
|
608 |
next = wire.StartConnected |
|
609 |
wire.Clean() |
|
42 | 610 |
self.RemoveWire(wire) |
0 | 611 |
inputs = [] |
612 |
for input in self.SelectedElement.GetElements(): |
|
613 |
input_connectors = input.GetConnectors() |
|
614 |
if not input_connectors["output"]: |
|
615 |
input.AddOutput() |
|
616 |
input.RefreshModel() |
|
617 |
input_connectors = input.GetConnectors() |
|
618 |
if value["type"] == SELECTION_CONVERGENCE: |
|
619 |
transition = self.CreateTransition(input_connectors["output"]) |
|
620 |
transition_connectors = transition.GetConnectors() |
|
621 |
inputs.append(transition_connectors["output"]) |
|
622 |
else: |
|
623 |
inputs.append(input_connectors["output"]) |
|
624 |
elif value["type"] == SELECTION_CONVERGENCE: |
|
625 |
wires = input_connectors["output"].GetWires() |
|
626 |
transition = wires[0][0].StartConnected.GetParentBlock() |
|
627 |
transition_connectors = transition.GetConnectors() |
|
628 |
inputs.append(transition_connectors["output"]) |
|
629 |
else: |
|
630 |
inputs.append(input_connectors["output"]) |
|
631 |
id = self.GetNewId() |
|
632 |
divergence = SFC_Divergence(self, value["type"], len(inputs), id) |
|
633 |
pos = inputs[0].GetPosition(False) |
|
634 |
divergence.SetPosition(pos.x, pos.y + SFC_WIRE_MIN_SIZE) |
|
635 |
divergence_connectors = divergence.GetConnectors() |
|
636 |
for i, input in enumerate(inputs): |
|
637 |
pos = input.GetPosition(False) |
|
638 |
wire = self.ConnectConnectors(divergence_connectors["inputs"][i], input) |
|
639 |
wire_size = GetWireSize(input) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
640 |
wire.SetPoints([wx.Point(pos.x, pos.y + wire_size), wx.Point(pos.x, pos.y)]) |
0 | 641 |
input_block = input.GetParentBlock() |
642 |
input_block.RefreshOutputPosition() |
|
643 |
divergence.RefreshPosition() |
|
644 |
pos = divergence_connectors["outputs"][0].GetRelPosition() |
|
645 |
divergence.MoveConnector(divergence_connectors["outputs"][0], - pos.x) |
|
42 | 646 |
self.AddBlock(divergence) |
0 | 647 |
self.Controler.AddCurrentElementEditingDivergence(id, value["type"]) |
648 |
self.RefreshDivergenceModel(divergence) |
|
649 |
if next: |
|
650 |
wire = self.ConnectConnectors(next, divergence_connectors["outputs"][0]) |
|
651 |
pos = divergence_connectors["outputs"][0].GetPosition(False) |
|
652 |
next_pos = next.GetPosition(False) |
|
653 |
next_block = next.GetParentBlock() |
|
654 |
divergence.RefreshOutputPosition((0, pos.y + SFC_WIRE_MIN_SIZE - next_pos.y)) |
|
655 |
divergence.RefreshConnectedPosition(divergence_connectors["outputs"][0]) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
656 |
wire.SetPoints([wx.Point(pos.x, pos.y + SFC_WIRE_MIN_SIZE), wx.Point(pos.x, pos.y)]) |
0 | 657 |
next_block.RefreshModel() |
658 |
else: |
|
659 |
if value["type"] == SELECTION_CONVERGENCE: |
|
660 |
previous = divergence_connectors["outputs"][0] |
|
661 |
else: |
|
662 |
transition = self.CreateTransition(divergence_connectors["outputs"][0]) |
|
663 |
transition_connectors = transition.GetConnectors() |
|
664 |
previous = transition_connectors["output"] |
|
665 |
self.CreateStep("Step", previous) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
666 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
667 |
self.RefreshScrollBars() |
0 | 668 |
self.Refresh() |
669 |
dialog.Destroy() |
|
670 |
||
671 |
def AddDivergenceBranch(self, divergence): |
|
672 |
if isinstance(divergence, SFC_Divergence): |
|
80 | 673 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
0 | 674 |
divergence.AddBranch() |
80 | 675 |
else: |
676 |
type = divergence.GetType() |
|
677 |
if type in [SELECTION_DIVERGENCE, SIMULTANEOUS_DIVERGENCE]: |
|
678 |
divergence.AddBranch() |
|
679 |
divergence_connectors = divergence.GetConnectors() |
|
680 |
if type == SELECTION_DIVERGENCE: |
|
681 |
transition = self.CreateTransition(divergence_connectors["outputs"][-1]) |
|
682 |
transition_connectors = transition.GetConnectors() |
|
683 |
previous = transition_connectors["output"] |
|
684 |
else: |
|
685 |
previous = divergence_connectors["outputs"][-1] |
|
686 |
step = self.CreateStep("Step", previous) |
|
687 |
self.RefreshBuffer() |
|
688 |
self.RefreshScrollBars() |
|
689 |
self.Refresh() |
|
690 |
||
691 |
def RemoveDivergenceBranch(self, divergence): |
|
692 |
if isinstance(divergence, SFC_Divergence): |
|
693 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
|
694 |
divergence.RemoveHandledBranch() |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
695 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
696 |
self.RefreshScrollBars() |
0 | 697 |
self.Refresh() |
698 |
||
699 |
def AddJump(self): |
|
700 |
if isinstance(self.SelectedElement, SFC_Step) and not self.SelectedElement.Output: |
|
701 |
choices = [] |
|
702 |
for block in self.Blocks: |
|
703 |
if isinstance(block, SFC_Step): |
|
704 |
choices.append(block.GetName()) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
705 |
dialog = wx.SingleChoiceDialog(self.ParentWindow, "Add a new jump", "Please choose a target", choices, wx.OK|wx.CANCEL) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
706 |
if dialog.ShowModal() == wx.ID_OK: |
0 | 707 |
value = dialog.GetStringSelection() |
708 |
self.SelectedElement.AddOutput() |
|
709 |
self.RefreshStepModel(self.SelectedElement) |
|
710 |
step_connectors = self.SelectedElement.GetConnectors() |
|
711 |
transition = self.CreateTransition(step_connectors["output"]) |
|
712 |
transition_connectors = transition.GetConnectors() |
|
713 |
id = self.GetNewId() |
|
714 |
jump = SFC_Jump(self, value, id) |
|
715 |
pos = transition_connectors["output"].GetPosition(False) |
|
716 |
jump.SetPosition(pos.x, pos.y + SFC_WIRE_MIN_SIZE) |
|
42 | 717 |
self.AddBlock(jump) |
0 | 718 |
self.Controler.AddCurrentElementEditingJump(id) |
719 |
jump_connector = jump.GetConnector() |
|
720 |
wire = self.ConnectConnectors(jump_connector, transition_connectors["output"]) |
|
721 |
transition.RefreshOutputPosition() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
722 |
wire.SetPoints([wx.Point(pos.x, pos.y + SFC_WIRE_MIN_SIZE), wx.Point(pos.x, pos.y)]) |
0 | 723 |
self.RefreshJumpModel(jump) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
724 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
45
diff
changeset
|
725 |
self.RefreshScrollBars() |
0 | 726 |
self.Refresh() |
727 |
dialog.Destroy() |
|
728 |
||
729 |
def EditStepContent(self, step): |
|
71 | 730 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
731 |
Viewer.EditStepContent(self, step) |
|
732 |
else: |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
733 |
dialog = StepNameDialog(self.ParentWindow, "Edit step name", "Please enter step name", step.GetName(), wx.OK|wx.CANCEL) |
71 | 734 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
735 |
dialog.SetVariables(self.Controler.GetCurrentElementEditingInterfaceVars()) |
|
736 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step) and block.GetName() != step.GetName()]) |
|
737 |
if dialog.ShowModal() == wx.ID_OK: |
|
738 |
value = dialog.GetValue() |
|
739 |
step.SetName(value) |
|
740 |
min_size = step.GetMinSize() |
|
741 |
size = step.GetSize() |
|
742 |
step.UpdateSize(max(min_size[0], size[0]), max(min_size[1], size[1])) |
|
743 |
step.RefreshModel() |
|
744 |
self.RefreshBuffer() |
|
745 |
self.RefreshScrollBars() |
|
746 |
self.Refresh() |
|
747 |
dialog.Destroy() |
|
0 | 748 |
|
749 |
#------------------------------------------------------------------------------- |
|
750 |
# Delete element functions |
|
751 |
#------------------------------------------------------------------------------- |
|
752 |
||
753 |
def DeleteStep(self, step): |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
754 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
755 |
Viewer.DeleteStep(self, step) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
756 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
757 |
step_connectors = step.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
758 |
if not step.GetInitial() or not step_connectors["output"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
759 |
previous = step.GetPreviousConnector() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
760 |
if previous: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
761 |
previous_block = previous.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
762 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
763 |
previous_block = None |
0 | 764 |
next = step.GetNextConnector() |
765 |
if next: |
|
766 |
next_block = next.GetParentBlock() |
|
767 |
else: |
|
768 |
next_block = None |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
769 |
if isinstance(next_block, SFC_Transition): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
770 |
self.RemoveTransition(next_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
771 |
next = step.GetNextConnector() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
772 |
if next: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
773 |
next_block = next.GetParentBlock() |
0 | 774 |
else: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
775 |
next_block = None |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
776 |
elif isinstance(previous_block, SFC_Transition): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
777 |
self.RemoveTransition(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
778 |
previous = step.GetPreviousConnector() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
779 |
if previous: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
780 |
previous_block = previous.GetParentBlock() |
0 | 781 |
else: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
782 |
previous_block = None |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
783 |
wire = self.RemoveStep(step) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
784 |
self.SelectedElement = None |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
785 |
if next_block: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
786 |
if isinstance(next_block, SFC_Divergence) and next_block.GetType() == SIMULTANEOUS_CONVERGENCE and isinstance(previous_block, SFC_Divergence) and previous_block.GetType() == SIMULTANEOUS_DIVERGENCE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
787 |
wire.Clean() |
42 | 788 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
789 |
next_block.RemoveBranch(next) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
790 |
if next_block.GetBranchNumber() < 2: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
791 |
self.DeleteDivergence(next_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
792 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
793 |
next_block.RefreshModel() |
0 | 794 |
previous_block.RemoveBranch(previous) |
795 |
if previous_block.GetBranchNumber() < 2: |
|
796 |
self.DeleteDivergence(previous_block) |
|
797 |
else: |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
798 |
previous_block.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
799 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
800 |
pos = previous.GetPosition(False) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
801 |
next_pos = next.GetPosition(False) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
802 |
wire_size = GetWireSize(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
803 |
previous_block.RefreshOutputPosition((0, pos.y + wire_size - next_pos.y)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
804 |
wire.SetPoints([wx.Point(pos.x, pos.y + wire_size), wx.Point(pos.x, pos.y)]) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
805 |
if isinstance(next_block, SFC_Divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
806 |
next_block.RefreshPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
807 |
previous_block.RefreshOutputModel(True) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
808 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
809 |
if isinstance(previous_block, SFC_Step): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
810 |
previous_block.RemoveOutput() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
811 |
self.RefreshStepModel(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
812 |
elif isinstance(previous_block, SFC_Divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
813 |
if previous_block.GetType() in [SELECTION_CONVERGENCE, SIMULTANEOUS_CONVERGENCE]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
814 |
self.DeleteDivergence(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
815 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
816 |
previous_block.RemoveBranch(previous) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
817 |
if previous_block.GetBranchNumber() < 2: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
818 |
self.DeleteDivergence(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
819 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
820 |
self.RefreshDivergenceModel(previous_block) |
0 | 821 |
|
822 |
def DeleteTransition(self, transition): |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
823 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
824 |
Viewer.DeleteTransition(self, transition) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
825 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
826 |
previous = transition.GetPreviousConnector() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
827 |
previous_block = previous.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
828 |
next = transition.GetNextConnector() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
829 |
next_block = next.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
830 |
if isinstance(previous_block, SFC_Divergence) and previous_block.GetType() == SELECTION_DIVERGENCE and isinstance(next_block, SFC_Divergence) and next_block.GetType() == SELECTION_CONVERGENCE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
831 |
wires = previous.GetWires() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
832 |
if len(wires) != 1: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
833 |
return |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
834 |
wire = wires[0][0] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
835 |
wire.Clean() |
42 | 836 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
837 |
wires = next.GetWires() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
838 |
if len(wires) != 1: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
839 |
return |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
840 |
wire = wires[0][0] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
841 |
wire.Clean() |
42 | 842 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
843 |
transition.Clean() |
44 | 844 |
self.RemoveBlock(transition) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
845 |
self.Controler.RemoveCurrentElementEditingInstance(transition.GetId()) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
846 |
previous_block.RemoveBranch(previous) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
847 |
if previous_block.GetBranchNumber() < 2: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
848 |
self.DeleteDivergence(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
849 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
850 |
self.RefreshDivergenceModel(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
851 |
next_block.RemoveBranch(next) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
852 |
if next_block.GetBranchNumber() < 2: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
853 |
self.DeleteDivergence(next_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
854 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
855 |
self.RefreshDivergenceModel(next_block) |
80 | 856 |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
857 |
def DeleteDivergence(self, divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
858 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
859 |
Viewer.DeleteDivergence(self, divergence) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
860 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
861 |
connectors = divergence.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
862 |
type = divergence.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
863 |
if type in [SELECTION_CONVERGENCE, SIMULTANEOUS_CONVERGENCE]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
864 |
wires = connectors["outputs"][0].GetWires() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
865 |
if len(wires) > 1: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
866 |
return |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
867 |
elif len(wires) == 1: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
868 |
next = wires[0][0].StartConnected |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
869 |
next_block = next.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
870 |
wire = wires[0][0] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
871 |
wire.Clean() |
42 | 872 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
873 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
874 |
next = None |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
875 |
next_block = None |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
876 |
for index, connector in enumerate(connectors["inputs"]): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
877 |
if next and index == 0: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
878 |
wires = connector.GetWires() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
879 |
wire = wires[0][0] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
880 |
previous = wires[0][0].EndConnected |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
881 |
wire.Clean() |
42 | 882 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
883 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
884 |
if type == SELECTION_CONVERGENCE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
885 |
wires = connector.GetWires() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
886 |
previous_block = wires[0][0].EndConnected.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
887 |
self.RemoveTransition(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
888 |
wires = connector.GetWires() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
889 |
wire = wires[0][0] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
890 |
previous_connector = wire.EndConnected |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
891 |
previous_block = previous_connector.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
892 |
wire.Clean() |
42 | 893 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
894 |
if isinstance(previous_block, SFC_Step): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
895 |
previous_block.RemoveOutput() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
896 |
self.RefreshStepModel(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
897 |
elif isinstance(previous_block, SFC_Divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
898 |
if previous_block.GetType() in [SELECTION_DIVERGENCE, SIMULTANEOUS_DIVERGENCE]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
899 |
previous_block.RemoveBranch(previous_connector) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
900 |
if previous_block.GetBranchNumber() < 2: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
901 |
self.DeleteDivergence(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
902 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
903 |
self.RefreshDivergenceModel(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
904 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
905 |
self.DeleteDivergence(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
906 |
divergence.Clean() |
44 | 907 |
self.RemoveBlock(divergence) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
908 |
self.Controler.RemoveCurrentElementEditingInstance(divergence.GetId()) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
909 |
if next: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
910 |
wire = self.ConnectConnectors(next, previous) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
911 |
previous_block = previous.GetParentBlock() |
45 | 912 |
previous_pos = previous.GetPosition(False) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
913 |
next_pos = next.GetPosition(False) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
914 |
wire_size = GetWireSize(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
915 |
previous_block.RefreshOutputPosition((0, previous_pos.y + wire_size - next_pos.y)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
916 |
wire.SetPoints([wx.Point(previous_pos.x, previous_pos.y + wire_size), |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
917 |
wx.Point(previous_pos.x, previous_pos.y)]) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
918 |
if isinstance(next_block, SFC_Divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
919 |
next_block.RefreshPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
920 |
previous_block.RefreshOutputModel(True) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
921 |
elif divergence.GetBranchNumber() == 1: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
922 |
wires = connectors["inputs"][0].GetWires() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
923 |
if len(wires) != 1: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
924 |
return |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
925 |
wire = wires[0][0] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
926 |
previous = wire.EndConnected |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
927 |
previous_block = previous.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
928 |
wire.Clean() |
42 | 929 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
930 |
wires = connectors["outputs"][0].GetWires() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
931 |
if len(wires) != 1: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
932 |
return |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
933 |
wire = wires[0][0] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
934 |
next = wire.StartConnected |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
935 |
next_block = next.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
936 |
wire.Clean() |
42 | 937 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
938 |
divergence.Clean() |
44 | 939 |
self.RemoveBlock(divergence) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
940 |
self.Controler.RemoveCurrentElementEditingInstance(divergence.GetId()) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
941 |
wire = self.ConnectConnectors(next, previous) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
942 |
previous_pos = previous.GetPosition(False) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
943 |
next_pos = next.GetPosition(False) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
944 |
wire_size = GetWireSize(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
945 |
previous_block.RefreshOutputPosition((previous_pos.x - next_pos.x, previous_pos.y + wire_size - next_pos.y)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
946 |
wire.SetPoints([wx.Point(previous_pos.x, previous_pos.y + wire_size), |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
58
diff
changeset
|
947 |
wx.Point(previous_pos.x, previous_pos.y)]) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
948 |
if isinstance(next_block, SFC_Divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
949 |
next_block.RefreshPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
950 |
previous_block.RefreshOutputModel(True) |
80 | 951 |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
952 |
def DeleteJump(self, jump): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
953 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
954 |
Viewer.DeleteJump(self, jump) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
955 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
956 |
previous = jump.GetPreviousConnector() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
957 |
previous_block = previous.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
958 |
if isinstance(previous_block, SFC_Transition): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
959 |
self.RemoveTransition(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
960 |
previous = jump.GetPreviousConnector() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
961 |
if previous: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
962 |
previous_block = previous.GetParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
963 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
964 |
previous_block = None |
0 | 965 |
wires = previous.GetWires() |
966 |
if len(wires) != 1: |
|
967 |
return |
|
968 |
wire = wires[0][0] |
|
969 |
wire.Clean() |
|
42 | 970 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
971 |
jump.Clean() |
44 | 972 |
self.RemoveBlock(jump) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
973 |
self.Controler.RemoveCurrentElementEditingInstance(jump.GetId()) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
974 |
if isinstance(previous_block, SFC_Step): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
975 |
previous_block.RemoveOutput() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
976 |
self.RefreshStepModel(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
977 |
elif isinstance(previous_block, SFC_Divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
978 |
if previous_block.GetType() in [SELECTION_CONVERGENCE, SIMULTANEOUS_CONVERGENCE]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
979 |
self.DeleteDivergence(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
980 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
981 |
previous_block.RemoveBranch(previous) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
982 |
if previous_block.GetBranchNumber() < 2: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
983 |
self.DeleteDivergence(previous_block) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
984 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
985 |
previous_block.RefreshModel() |
80 | 986 |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
987 |
def DeleteActionBlock(self, actionblock): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
988 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
989 |
Viewer.DeleteActionBlock(self, actionblock) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
990 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
991 |
connector = actionblock.GetConnector() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
992 |
wires = connector.GetWires() |
0 | 993 |
if len(wires) != 1: |
994 |
return |
|
995 |
wire = wires[0][0] |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
996 |
step = wire.EndConnected.GetParentBlock() |
0 | 997 |
wire.Clean() |
42 | 998 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
999 |
actionblock.Clean() |
44 | 1000 |
self.RemoveBlock(actionblock) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1001 |
self.Controler.RemoveCurrentElementEditingInstance(actionblock.GetId()) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1002 |
step.RemoveAction() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1003 |
self.RefreshStepModel(step) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1004 |
step.RefreshOutputPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1005 |
step.RefreshOutputModel(True) |
80 | 1006 |
|
0 | 1007 |
def DeleteWire(self, wire): |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1008 |
if self.GetDrawingMode() == FREEDRAWING_MODE: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1009 |
Viewer.DeleteWire(self, wire) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1010 |