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