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