| author | lbessard |
| Mon, 10 Sep 2007 18:16:07 +0200 | |
| changeset 90 | 2245e8776086 |
| parent 80 | c798a68c5560 |
| child 91 | e8e9ddeed76c |
| 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 |
||
27 |
from plcopen.structures import * |
|
| 27 | 28 |
|
29 |
from Dialogs import * |
|
30 |
||
31 |
SCROLLBAR_UNIT = 10 |
|
32 |
WINDOW_BORDER = 10 |
|
33 |
SCROLL_ZONE = 10 |
|
| 0 | 34 |
|
35 |
#------------------------------------------------------------------------------- |
|
36 |
# Graphic elements Viewer base class |
|
37 |
#------------------------------------------------------------------------------- |
|
38 |
||
39 |
# ID Constants for menu items |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
40 |
[ID_FBDVIEWERCONTEXTUALMENUITEMS0, ID_FBDVIEWERCONTEXTUALMENUITEMS1, |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
41 |
ID_FBDVIEWERCONTEXTUALMENUITEMS2, ID_FBDVIEWERCONTEXTUALMENUITEMS3, |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
42 |
ID_FBDVIEWERCONTEXTUALMENUITEMS5, ID_FBDVIEWERCONTEXTUALMENUITEMS6, |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
43 |
ID_FBDVIEWERCONTEXTUALMENUITEMS8, ID_FBDVIEWERCONTEXTUALMENUITEMS9, |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
44 |
ID_FBDVIEWERCONTEXTUALMENUITEMS11, |
| 0 | 45 |
] = [wx.NewId() for _init_coll_ContextualMenu_Items in range(9)] |
46 |
||
47 |
||
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
48 |
class ViewerDropTarget(wx.TextDropTarget): |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
49 |
|
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
50 |
def __init__(self, parent): |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
51 |
wx.TextDropTarget.__init__(self) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
52 |
self.ParentWindow = parent |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
53 |
|
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
54 |
def OnDropText(self, x, y, data): |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
55 |
values = eval(data) |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
56 |
if values[1] in ["function", "functionBlock", "program"]: |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
57 |
id = self.ParentWindow.GetNewId() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
58 |
block = FBD_Block(self.ParentWindow, values[0], values[2], id) |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
59 |
block.SetPosition(x, y) |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
60 |
width, height = block.GetMinSize() |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
61 |
block.SetSize(width, height) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
62 |
self.ParentWindow.AddBlock(block) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
63 |
self.ParentWindow.Controler.AddCurrentElementEditingBlock(id) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
64 |
self.ParentWindow.RefreshBlockModel(block) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
65 |
self.ParentWindow.RefreshScrollBars() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
66 |
self.ParentWindow.Update() |
| 53 | 67 |
elif values[1] != "location": |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
68 |
id = self.ParentWindow.GetNewId() |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
69 |
if values[1] == "Output": |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
70 |
var_type = OUTPUT |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
71 |
elif values[1] == "InOut": |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
72 |
var_type = INPUT |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
73 |
else: |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
74 |
var_type = INPUT |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
75 |
variable = FBD_Variable(self.ParentWindow, var_type, values[0], values[2], id) |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
76 |
variable.SetPosition(x, y) |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
77 |
width, height = variable.GetMinSize() |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
78 |
variable.SetSize(width, height) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
79 |
self.ParentWindow.AddBlock(variable) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
80 |
self.ParentWindow.Controler.AddCurrentElementEditingVariable(id, var_type) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
81 |
self.ParentWindow.RefreshVariableModel(variable) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
82 |
self.ParentWindow.RefreshScrollBars() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
83 |
self.ParentWindow.Update() |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
84 |
|
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
85 |
|
| 0 | 86 |
""" |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
87 |
Class that implements a Viewer based on a wx.ScrolledWindow for drawing and |
| 0 | 88 |
manipulating graphic elements |
89 |
""" |
|
90 |
||
91 |
class Viewer(wx.ScrolledWindow): |
|
92 |
||
93 |
# Create Contextual Menu items |
|
94 |
def _init_coll_ContextualMenu_Items(self, parent): |
|
95 |
# Create menu items |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
96 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS0, |
| 0 | 97 |
kind=wx.ITEM_RADIO, text=u'No Modifier') |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
98 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS1, |
| 0 | 99 |
kind=wx.ITEM_RADIO, text=u'Negated') |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
100 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS2, |
| 0 | 101 |
kind=wx.ITEM_RADIO, text=u'Rising Edge') |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
102 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS3, |
| 0 | 103 |
kind=wx.ITEM_RADIO, text=u'Falling Edge') |
104 |
parent.AppendSeparator() |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
105 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS5, |
| 0 | 106 |
kind=wx.ITEM_NORMAL, text=u'Add Wire Segment') |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
107 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS6, |
| 0 | 108 |
kind=wx.ITEM_NORMAL, text=u'Delete Wire Segment') |
109 |
parent.AppendSeparator() |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
110 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS8, |
| 0 | 111 |
kind=wx.ITEM_NORMAL, text=u'Add Divergence Branch') |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
112 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS9, |
| 0 | 113 |
kind=wx.ITEM_NORMAL, text=u'Delete Divergence Branch') |
114 |
parent.AppendSeparator() |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
115 |
parent.Append(help='', id=ID_FBDVIEWERCONTEXTUALMENUITEMS11, |
| 0 | 116 |
kind=wx.ITEM_NORMAL, text=u'Delete') |
117 |
# Link menu event to corresponding called functions |
|
118 |
self.Bind(wx.EVT_MENU, self.OnNoModifierMenu, |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
119 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS0) |
| 0 | 120 |
self.Bind(wx.EVT_MENU, self.OnNegatedMenu, |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
121 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS1) |
| 0 | 122 |
self.Bind(wx.EVT_MENU, self.OnRisingEdgeMenu, |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
123 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS2) |
| 0 | 124 |
self.Bind(wx.EVT_MENU, self.OnFallingEdgeMenu, |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
125 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS3) |
| 0 | 126 |
self.Bind(wx.EVT_MENU, self.OnAddSegmentMenu, |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
127 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS5) |
| 0 | 128 |
self.Bind(wx.EVT_MENU, self.OnDeleteSegmentMenu, |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
129 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS6) |
| 0 | 130 |
self.Bind(wx.EVT_MENU, self.OnAddBranchMenu, |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
131 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS8) |
| 0 | 132 |
self.Bind(wx.EVT_MENU, self.OnDeleteBranchMenu, |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
133 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS9) |
| 0 | 134 |
self.Bind(wx.EVT_MENU, self.OnDeleteMenu, |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
135 |
id=ID_FBDVIEWERCONTEXTUALMENUITEMS11) |
| 0 | 136 |
|
137 |
# Create and initialize Contextual Menu |
|
138 |
def _init_menus(self): |
|
139 |
self.ContextualMenu = wx.Menu(title='') |
|
140 |
||
141 |
self._init_coll_ContextualMenu_Items(self.ContextualMenu) |
|
142 |
||
143 |
# Create a new Viewer |
|
144 |
def __init__(self, parent, window, controler): |
|
| 80 | 145 |
wx.ScrolledWindow.__init__(self, parent, pos=wx.Point(0, 0), size=wx.Size(0, 0), |
146 |
style=wx.SUNKEN_BORDER | wx.HSCROLL | wx.VSCROLL) |
|
| 0 | 147 |
self._init_menus() |
148 |
# Adding a rubberband to Viewer |
|
149 |
self.rubberBand = RubberBand(drawingSurface=self) |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
150 |
self.SetBackgroundColour(wx.Colour(255,255,255)) |
| 0 | 151 |
self.ResetView() |
152 |
self.Scaling = None |
|
153 |
#self.Scaling = (8, 8) |
|
154 |
self.DrawGrid = True |
|
155 |
self.current_id = 0 |
|
156 |
||
| 42 | 157 |
# Initialize Block, Wire and Comment numbers |
158 |
self.block_id = self.wire_id = self.comment_id = 0 |
|
159 |
||
| 0 | 160 |
# Initialize Viewer mode to Selection mode |
161 |
self.Mode = MODE_SELECTION |
|
|
3
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
162 |
self.SavedMode = False |
| 0 | 163 |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
164 |
self.ParentWindow = window |
| 0 | 165 |
self.Controler = controler |
166 |
||
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
167 |
self.SetDropTarget(ViewerDropTarget(self)) |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
168 |
|
| 0 | 169 |
# Link Viewer event to corresponding methods |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
170 |
self.Bind(wx.EVT_PAINT, self.OnPaint) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
171 |
self.Bind(wx.EVT_LEFT_DOWN, self.OnViewerLeftDown) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
172 |
self.Bind(wx.EVT_LEFT_UP, self.OnViewerLeftUp) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
173 |
self.Bind(wx.EVT_LEFT_DCLICK, self.OnViewerLeftDClick) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
174 |
self.Bind(wx.EVT_RIGHT_UP, self.OnViewerRightUp) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
175 |
self.Bind(wx.EVT_MOTION, self.OnViewerMotion) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
176 |
self.Bind(wx.EVT_CHAR, self.OnChar) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
177 |
if wx.VERSION < (2, 7, 0): |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
178 |
self.Bind(wx.EVT_SCROLLWIN, self.OnMoveWindow) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
179 |
self.Bind(wx.EVT_SIZE, self.OnMoveWindow) |
| 0 | 180 |
|
181 |
# Returns a new id |
|
182 |
def GetNewId(self): |
|
183 |
self.current_id += 1 |
|
184 |
return self.current_id |
|
185 |
||
186 |
# Destructor |
|
187 |
def __del__(self): |
|
188 |
self.ResetView() |
|
189 |
||
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
190 |
def GetLogicalDC(self, buffered=False): |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
191 |
if buffered: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
192 |
dc = wx.BufferedPaintDC(self) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
193 |
else: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
194 |
dc = wx.ClientDC(self) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
195 |
dc.SetFont(wx.NORMAL_FONT) |
| 27 | 196 |
self.DoPrepareDC(dc) |
197 |
return dc |
|
198 |
||
| 0 | 199 |
#------------------------------------------------------------------------------- |
| 42 | 200 |
# Element management functions |
201 |
#------------------------------------------------------------------------------- |
|
202 |
||
203 |
def AddBlock(self, block): |
|
204 |
self.block_id += 1 |
|
205 |
self.Blocks[block] = self.block_id |
|
206 |
||
207 |
def AddWire(self, wire): |
|
208 |
self.wire_id += 1 |
|
209 |
self.Wires[wire] = self.wire_id |
|
210 |
||
211 |
def AddComment(self, comment): |
|
212 |
self.comment_id += 1 |
|
213 |
self.Comments[comment] = self.comment_id |
|
214 |
||
215 |
def IsBlock(self, block): |
|
216 |
return self.Blocks.get(block, False) |
|
217 |
||
218 |
def IsWire(self, wire): |
|
219 |
return self.Wires.get(wire, False) |
|
220 |
||
221 |
def IsComment(self, comment): |
|
222 |
return self.Comments.get(comment, False) |
|
223 |
||
224 |
def RemoveBlock(self, block): |
|
225 |
self.Blocks.pop(block) |
|
226 |
||
227 |
def RemoveWire(self, wire): |
|
228 |
self.Wires.pop(wire) |
|
229 |
||
230 |
def RemoveComment(self, comment): |
|
231 |
self.Comments.pop(comment) |
|
232 |
||
233 |
def GetElements(self, sort_blocks=False, sort_wires=False, sort_comments=False): |
|
234 |
blocks = self.Blocks.keys() |
|
235 |
wires = self.Wires.keys() |
|
236 |
comments = self.Comments.keys() |
|
237 |
if sort_blocks: |
|
238 |
blocks.sort(lambda x,y:self.Blocks[x].__cmp__(self.Blocks[y])) |
|
239 |
if sort_wires: |
|
240 |
wires.sort(lambda x,y:self.Wires[x].__cmp__(self.Wires[y])) |
|
241 |
if sort_comments: |
|
242 |
comments.sort(lambda x,y:self.Comments[x].__cmp__(self.Comments[y])) |
|
243 |
return blocks + wires + comments |
|
244 |
||
245 |
#------------------------------------------------------------------------------- |
|
| 0 | 246 |
# Reset functions |
247 |
#------------------------------------------------------------------------------- |
|
248 |
||
249 |
# Resets Viewer lists |
|
250 |
def ResetView(self): |
|
| 42 | 251 |
self.Blocks = {}
|
252 |
self.Wires = {}
|
|
253 |
self.Comments = {}
|
|
| 0 | 254 |
self.SelectedElement = None |
255 |
||
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
256 |
# Remove all elements |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
257 |
def CleanView(self): |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
258 |
for block in self.Blocks.keys(): |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
259 |
block.Clean() |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
260 |
self.ResetView() |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
261 |
|
| 0 | 262 |
# Changes Viewer mode |
263 |
def SetMode(self, mode): |
|
|
3
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
264 |
if self.Mode != mode or mode == MODE_SELECTION: |
|
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
265 |
self.Mode = mode |
|
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
266 |
self.SavedMode = False |
|
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
267 |
else: |
|
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
268 |
self.SavedMode = True |
| 0 | 269 |
# Reset selection |
|
3
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
270 |
if self.Mode != MODE_SELECTION and self.SelectedElement: |
| 0 | 271 |
self.SelectedElement.SetSelected(False) |
272 |
self.SelectedElement = None |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
273 |
self.Refresh(False) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
274 |
|
| 27 | 275 |
# Return current drawing mode |
276 |
def GetDrawingMode(self): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
277 |
return self.ParentWindow.GetDrawingMode() |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
278 |
|
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
279 |
# Buffer the last model state |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
280 |
def RefreshBuffer(self): |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
281 |
self.Controler.BufferProject() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
282 |
self.ParentWindow.RefreshTitle() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
283 |
self.ParentWindow.RefreshEditMenu() |
| 27 | 284 |
|
| 0 | 285 |
#------------------------------------------------------------------------------- |
286 |
# Refresh functions |
|
287 |
#------------------------------------------------------------------------------- |
|
288 |
||
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
289 |
def ResetBuffer(self): |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
290 |
pass |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
291 |
|
| 0 | 292 |
# Refresh Viewer elements |
293 |
def RefreshView(self): |
|
294 |
self.current_id = 0 |
|
295 |
# Start by reseting Viewer |
|
296 |
self.ResetView() |
|
297 |
instance = True |
|
298 |
# List of ids of already loaded blocks |
|
299 |
ids = [] |
|
300 |
# Load Blocks until they are all loaded |
|
301 |
while instance: |
|
302 |
instance = self.Controler.GetCurrentElementEditingInstanceInfos(exclude=ids) |
|
303 |
if instance: |
|
304 |
self.loadInstance(instance, ids) |
|
| 42 | 305 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
306 |
self.Refresh(False) |
| 0 | 307 |
|
| 42 | 308 |
def RefreshScrollBars(self): |
| 27 | 309 |
xstart, ystart = self.GetViewStart() |
310 |
window_size = self.GetClientSize() |
|
311 |
maxx = maxy = 0 |
|
| 42 | 312 |
for element in self.GetElements(): |
| 27 | 313 |
posx, posy = element.GetPosition() |
314 |
width, height = element.GetSize() |
|
315 |
maxx = max(maxx, posx + width) |
|
316 |
maxy = max(maxy, posy + height) |
|
317 |
maxx = max(maxx + WINDOW_BORDER, xstart * SCROLLBAR_UNIT + window_size[0]) |
|
318 |
maxy = max(maxy + WINDOW_BORDER, ystart * SCROLLBAR_UNIT + window_size[1]) |
|
319 |
if self.rubberBand.IsShown(): |
|
320 |
extent = self.rubberBand.GetCurrentExtent() |
|
321 |
maxx = max(maxx, extent.x + extent.width) |
|
322 |
maxy = max(maxy, extent.y + extent.height) |
|
323 |
self.SetScrollbars(SCROLLBAR_UNIT, SCROLLBAR_UNIT, |
|
324 |
maxx / SCROLLBAR_UNIT, maxy / SCROLLBAR_UNIT, xstart, ystart) |
|
325 |
||
| 0 | 326 |
# Load instance from given informations |
327 |
def loadInstance(self, instance, ids): |
|
328 |
ids.append(instance["id"]) |
|
329 |
self.current_id = max(self.current_id, instance["id"]) |
|
330 |
if instance["type"] == "input": |
|
331 |
variable = FBD_Variable(self, INPUT, instance["name"], instance["value_type"], instance["id"]) |
|
332 |
variable.SetPosition(instance["x"], instance["y"]) |
|
333 |
variable.SetSize(instance["width"], instance["height"]) |
|
| 42 | 334 |
self.AddBlock(variable) |
| 0 | 335 |
connectors = variable.GetConnectors() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
336 |
connectors["output"].SetPosition(wx.Point(*instance["connector"]["position"])) |
| 0 | 337 |
if instance["connector"]["negated"]: |
338 |
connectors["output"].SetNegated(True) |
|
339 |
if instance["connector"]["edge"]: |
|
340 |
connectors["output"].SetEdge(instance["connector"]["edge"]) |
|
341 |
elif instance["type"] == "output": |
|
342 |
variable = FBD_Variable(self, OUTPUT, instance["name"], instance["value_type"], instance["id"]) |
|
343 |
variable.SetPosition(instance["x"], instance["y"]) |
|
344 |
variable.SetSize(instance["width"], instance["height"]) |
|
| 42 | 345 |
self.AddBlock(variable) |
| 0 | 346 |
connectors = variable.GetConnectors() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
347 |
connectors["input"].SetPosition(wx.Point(*instance["connector"]["position"])) |
| 0 | 348 |
if instance["connector"]["negated"]: |
349 |
connectors["input"].SetNegated(True) |
|
350 |
if instance["connector"]["edge"]: |
|
351 |
connectors["input"].SetEdge(instance["connector"]["edge"]) |
|
352 |
self.CreateWires(connectors["input"], instance["connector"]["links"], ids) |
|
353 |
elif instance["type"] == "inout": |
|
354 |
variable = FBD_Variable(self, INOUT, instance["name"], instance["value_type"], instance["id"]) |
|
355 |
variable.SetPosition(instance["x"], instance["y"]) |
|
356 |
variable.SetSize(instance["width"], instance["height"]) |
|
| 42 | 357 |
self.AddBlock(variable) |
| 0 | 358 |
connectors = variable.GetConnectors() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
359 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
360 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
| 0 | 361 |
if instance["connectors"]["output"]["negated"]: |
362 |
connectors["output"].SetNegated(True) |
|
363 |
if instance["connectors"]["output"]["edge"]: |
|
364 |
connectors["output"].SetEdge(instance["connectors"]["output"]["edge"]) |
|
365 |
if instance["connectors"]["input"]["negated"]: |
|
366 |
connectors["input"].SetNegated(True) |
|
367 |
if instance["connectors"]["input"]["edge"]: |
|
368 |
connectors["input"].SetEdge(instance["connectors"]["input"]["edge"]) |
|
369 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
|
370 |
elif instance["type"] == "continuation": |
|
371 |
connection = FBD_Connector(self, CONTINUATION, instance["name"], instance["id"]) |
|
372 |
connection.SetPosition(instance["x"], instance["y"]) |
|
373 |
connection.SetSize(instance["width"], instance["height"]) |
|
| 42 | 374 |
self.AddBlock(connection) |
| 0 | 375 |
connector = connection.GetConnector() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
376 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
| 0 | 377 |
elif instance["type"] == "connection": |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
378 |
connection = FBD_Connector(self, CONNECTOR, instance["name"], instance["id"]) |
| 0 | 379 |
connection.SetPosition(instance["x"], instance["y"]) |
380 |
connection.SetSize(instance["width"], instance["height"]) |
|
| 42 | 381 |
self.AddBlock(connection) |
| 0 | 382 |
connector = connection.GetConnector() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
383 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
| 0 | 384 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
385 |
elif instance["type"] == "comment": |
|
386 |
comment = Comment(self, instance["content"], instance["id"]) |
|
387 |
comment.SetPosition(instance["x"], instance["y"]) |
|
388 |
comment.SetSize(instance["width"], instance["height"]) |
|
| 42 | 389 |
self.AddComment(comment) |
| 0 | 390 |
elif instance["type"] == "leftPowerRail": |
391 |
leftpowerrail = LD_PowerRail(self, LEFTRAIL, instance["id"], [True for i in range(len(instance["connectors"]))]) |
|
392 |
leftpowerrail.SetPosition(instance["x"], instance["y"]) |
|
| 80 | 393 |
leftpowerrail.SetSize(instance["width"], instance["height"]) |
| 42 | 394 |
self.AddBlock(leftpowerrail) |
| 0 | 395 |
connectors = leftpowerrail.GetConnectors() |
396 |
for i, connector in enumerate(instance["connectors"]): |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
397 |
connectors[i].SetPosition(wx.Point(*connector["position"])) |
| 0 | 398 |
elif instance["type"] == "rightPowerRail": |
399 |
rightpowerrail = LD_PowerRail(self, RIGHTRAIL, instance["id"], [True for i in range(len(instance["connectors"]))]) |
|
400 |
rightpowerrail.SetPosition(instance["x"], instance["y"]) |
|
| 80 | 401 |
rightpowerrail.SetSize(instance["width"], instance["height"]) |
| 42 | 402 |
self.AddBlock(rightpowerrail) |
| 0 | 403 |
connectors = rightpowerrail.GetConnectors() |
404 |
for i, connector in enumerate(instance["connectors"]): |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
405 |
connectors[i].SetPosition(wx.Point(*connector["position"])) |
| 0 | 406 |
self.CreateWires(connectors[i], connector["links"], ids) |
407 |
elif instance["type"] == "contact": |
|
408 |
if instance["negated"]: |
|
409 |
negated = instance["negated"] |
|
410 |
else: |
|
411 |
negated = False |
|
412 |
if instance["edge"]: |
|
413 |
edge = instance["edge"] |
|
414 |
else: |
|
415 |
edge = "none" |
|
416 |
if negated and edge == "none": |
|
417 |
contact_type = CONTACT_REVERSE |
|
418 |
elif not negated and edge == "rising": |
|
419 |
contact_type = CONTACT_RISING |
|
420 |
elif not negated and edge == "falling": |
|
421 |
contact_type = CONTACT_FALLING |
|
422 |
else: |
|
423 |
contact_type = CONTACT_NORMAL |
|
424 |
contact = LD_Contact(self, contact_type, instance["name"], instance["id"]) |
|
425 |
contact.SetPosition(instance["x"], instance["y"]) |
|
| 42 | 426 |
self.AddBlock(contact) |
| 0 | 427 |
connectors = contact.GetConnectors() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
428 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
| 0 | 429 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
430 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
| 0 | 431 |
elif instance["type"] == "coil": |
432 |
if instance["negated"]: |
|
433 |
negated = instance["negated"] |
|
434 |
else: |
|
435 |
negated = False |
|
436 |
if instance["storage"]: |
|
437 |
storage = instance["storage"] |
|
438 |
else: |
|
439 |
storage = "none" |
|
440 |
if negated and storage == "none": |
|
441 |
coil_type = COIL_REVERSE |
|
442 |
elif not negated and storage == "set": |
|
443 |
coil_type = COIL_SET |
|
444 |
elif not negated and storage == "reset": |
|
445 |
coil_type = COIL_RESET |
|
446 |
else: |
|
447 |
coil_type = COIL_NORMAL |
|
448 |
coil = LD_Coil(self, coil_type, instance["name"], instance["id"]) |
|
449 |
coil.SetPosition(instance["x"], instance["y"]) |
|
| 42 | 450 |
self.AddBlock(coil) |
| 0 | 451 |
connectors = coil.GetConnectors() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
452 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
| 0 | 453 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
454 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
| 0 | 455 |
elif instance["type"] == "step": |
456 |
if instance["initial"]: |
|
457 |
initial = instance["initial"] |
|
458 |
else: |
|
459 |
initial = False |
|
460 |
step = SFC_Step(self, instance["name"], initial, instance["id"]) |
|
461 |
step.SetPosition(instance["x"], instance["y"]) |
|
462 |
step.SetSize(instance["width"], instance["height"]) |
|
| 42 | 463 |
self.AddBlock(step) |
| 0 | 464 |
if "output" in instance["connectors"]: |
465 |
step.AddOutput() |
|
466 |
if "action" in instance["connectors"]: |
|
467 |
step.AddAction() |
|
468 |
connectors = step.GetConnectors() |
|
469 |
if connectors["input"]: |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
470 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
| 0 | 471 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
472 |
if connectors["output"]: |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
473 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
| 0 | 474 |
if connectors["action"]: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
475 |
connectors["action"].SetPosition(wx.Point(*instance["connectors"]["action"]["position"])) |
| 0 | 476 |
elif instance["type"] == "transition": |
| 80 | 477 |
transition = SFC_Transition(self, instance["condition_type"], instance["condition"], instance["priority"], instance["id"]) |
| 0 | 478 |
transition.SetPosition(instance["x"], instance["y"]) |
| 42 | 479 |
self.AddBlock(transition) |
| 0 | 480 |
connectors = transition.GetConnectors() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
481 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
| 0 | 482 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
483 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
484 |
if instance["condition_type"] == "connection": |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
485 |
self.CreateWires(connectors["connection"], instance["connectors"]["connection"]["links"], ids) |
| 0 | 486 |
elif instance["type"] in ["selectionDivergence", "selectionConvergence", "simultaneousDivergence", "simultaneousConvergence"]: |
487 |
if instance["type"] == "selectionDivergence": |
|
488 |
divergence = SFC_Divergence(self, SELECTION_DIVERGENCE, |
|
489 |
len(instance["connectors"]["outputs"]), instance["id"]) |
|
490 |
elif instance["type"] == "selectionConvergence": |
|
491 |
divergence = SFC_Divergence(self, SELECTION_CONVERGENCE, |
|
492 |
len(instance["connectors"]["inputs"]), instance["id"]) |
|
493 |
elif instance["type"] == "simultaneousDivergence": |
|
494 |
divergence = SFC_Divergence(self, SIMULTANEOUS_DIVERGENCE, |
|
495 |
len(instance["connectors"]["outputs"]), instance["id"]) |
|
496 |
else: |
|
497 |
divergence = SFC_Divergence(self, SIMULTANEOUS_CONVERGENCE, |
|
498 |
len(instance["connectors"]["inputs"]), instance["id"]) |
|
499 |
divergence.SetPosition(instance["x"], instance["y"]) |
|
500 |
divergence.SetSize(instance["width"], instance["height"]) |
|
| 42 | 501 |
self.AddBlock(divergence) |
| 0 | 502 |
connectors = divergence.GetConnectors() |
503 |
for i, input_connector in enumerate(instance["connectors"]["inputs"]): |
|
504 |
connector = connectors["inputs"][i] |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
505 |
connector.SetPosition(wx.Point(*input_connector["position"])) |
| 0 | 506 |
self.CreateWires(connector, input_connector["links"], ids) |
507 |
for i, output_connector in enumerate(instance["connectors"]["outputs"]): |
|
508 |
connector = connectors["outputs"][i] |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
509 |
connector.SetPosition(wx.Point(*output_connector["position"])) |
| 0 | 510 |
elif instance["type"] == "jump": |
511 |
jump = SFC_Jump(self, instance["target"], instance["id"]) |
|
512 |
jump.SetPosition(instance["x"], instance["y"]) |
|
| 42 | 513 |
self.AddBlock(jump) |
| 0 | 514 |
connector = jump.GetConnector() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
515 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
| 0 | 516 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
517 |
elif instance["type"] == "actionBlock": |
|
518 |
actionBlock = SFC_ActionBlock(self, instance["actions"], instance["id"]) |
|
519 |
actionBlock.SetPosition(instance["x"], instance["y"]) |
|
520 |
actionBlock.SetSize(instance["width"], instance["height"]) |
|
| 42 | 521 |
self.AddBlock(actionBlock) |
| 0 | 522 |
connector = actionBlock.GetConnector() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
523 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
| 0 | 524 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
525 |
else: |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
526 |
connectors = {"inputs" : [], "outputs" : []}
|
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
527 |
for input in instance["connectors"]["inputs"]: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
528 |
if input["negated"]: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
529 |
connectors["inputs"].append((input["name"], None, "negated")) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
530 |
elif input["edge"]: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
531 |
connectors["inputs"].append((input["name"], None, input["edge"])) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
532 |
else: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
533 |
connectors["inputs"].append((input["name"], None, "none")) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
534 |
for output in instance["connectors"]["outputs"]: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
535 |
if output["negated"]: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
536 |
connectors["outputs"].append((output["name"], None, "negated")) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
537 |
elif output["edge"]: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
538 |
connectors["outputs"].append((output["name"], None, output["edge"])) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
539 |
else: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
540 |
connectors["outputs"].append((output["name"], None, "none")) |
| 0 | 541 |
if instance["name"] != None: |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
542 |
block = FBD_Block(self, instance["type"], instance["name"], instance["id"], len(instance["connectors"]["inputs"]), connectors=connectors) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
543 |
else: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
544 |
block = FBD_Block(self, instance["type"], "", instance["id"], len(instance["connectors"]["inputs"]), connectors=connectors) |
| 0 | 545 |
block.SetPosition(instance["x"], instance["y"]) |
546 |
block.SetSize(instance["width"], instance["height"]) |
|
| 42 | 547 |
self.AddBlock(block) |
| 0 | 548 |
connectors = block.GetConnectors() |
549 |
for i, input_connector in enumerate(instance["connectors"]["inputs"]): |
|
550 |
connector = connectors["inputs"][i] |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
551 |
connector.SetPosition(wx.Point(*input_connector["position"])) |
| 0 | 552 |
if input_connector["negated"]: |
553 |
connector.SetNegated(True) |
|
554 |
if input_connector["edge"]: |
|
555 |
connector.SetEdge(input_connector["edge"]) |
|
556 |
self.CreateWires(connector, input_connector["links"], ids) |
|
557 |
for i, output_connector in enumerate(instance["connectors"]["outputs"]): |
|
558 |
connector = connectors["outputs"][i] |
|
559 |
if output_connector["negated"]: |
|
560 |
connector.SetNegated(True) |
|
561 |
if output_connector["edge"]: |
|
562 |
connector.SetEdge(output_connector["edge"]) |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
563 |
connector.SetPosition(wx.Point(*output_connector["position"])) |
| 0 | 564 |
|
565 |
def CreateWires(self, start_connector, links, ids): |
|
566 |
for link in links: |
|
567 |
refLocalId = link["refLocalId"] |
|
568 |
if refLocalId != None: |
|
569 |
if refLocalId not in ids: |
|
570 |
new_instance = self.Controler.GetCurrentElementEditingInstanceInfos(refLocalId) |
|
571 |
if new_instance: |
|
572 |
self.loadInstance(new_instance, ids) |
|
573 |
connected = self.FindElementById(refLocalId) |
|
574 |
if connected: |
|
575 |
points = link["points"] |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
576 |
end_connector = connected.GetConnector(wx.Point(points[-1][0], points[-1][1]), link["formalParameter"]) |
| 0 | 577 |
if end_connector: |
578 |
wire = Wire(self) |
|
579 |
wire.SetPoints(points) |
|
580 |
start_connector.Connect((wire, 0), False) |
|
581 |
end_connector.Connect((wire, -1), False) |
|
582 |
wire.ConnectStartPoint(None, start_connector) |
|
583 |
wire.ConnectEndPoint(None, end_connector) |
|
| 42 | 584 |
self.AddWire(wire) |
| 0 | 585 |
|
586 |
#------------------------------------------------------------------------------- |
|
587 |
# Search Element functions |
|
588 |
#------------------------------------------------------------------------------- |
|
589 |
||
590 |
def FindBlock(self, pos): |
|
591 |
for block in self.Blocks: |
|
592 |
if block.HitTest(pos) or block.TestHandle(pos) != (0, 0): |
|
593 |
return block |
|
594 |
return None |
|
595 |
||
596 |
def FindWire(self, pos): |
|
597 |
for wire in self.Wires: |
|
598 |
if wire.HitTest(pos) or wire.TestHandle(pos) != (0, 0): |
|
599 |
return wire |
|
600 |
return None |
|
601 |
||
602 |
def FindElement(self, pos, exclude_group = False): |
|
603 |
if self.SelectedElement and not (exclude_group and isinstance(self.SelectedElement, Graphic_Group)): |
|
604 |
if self.SelectedElement.HitTest(pos) or self.SelectedElement.TestHandle(pos) != (0, 0): |
|
605 |
return self.SelectedElement |
|
| 42 | 606 |
for element in self.GetElements(): |
| 0 | 607 |
if element.HitTest(pos) or element.TestHandle(pos) != (0, 0): |
608 |
return element |
|
609 |
return None |
|
610 |
||
|
3
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
611 |
def FindBlockConnector(self, pos, exclude = True): |
| 0 | 612 |
for block in self.Blocks: |
|
3
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
613 |
result = block.TestConnector(pos, exclude) |
| 0 | 614 |
if result: |
615 |
return result |
|
616 |
return None |
|
617 |
||
618 |
def FindElementById(self, id): |
|
| 42 | 619 |
for element in self.Blocks: |
620 |
if element.GetId() == id: |
|
621 |
return element |
|
622 |
for element in self.Comments: |
|
| 0 | 623 |
if element.GetId() == id: |
624 |
return element |
|
625 |
return None |
|
626 |
||
627 |
def SearchElements(self, bbox): |
|
628 |
elements = [] |
|
| 42 | 629 |
for element in self.GetElements(): |
630 |
if element.IsInSelection(bbox): |
|
| 0 | 631 |
elements.append(element) |
632 |
return elements |
|
633 |
||
634 |
#------------------------------------------------------------------------------- |
|
635 |
# Popup menu functions |
|
636 |
#------------------------------------------------------------------------------- |
|
637 |
||
638 |
def PopupBlockMenu(self, connector = None): |
|
|
13
69075340d6a9
Adding support for forbidding insertion of function block into function
lbessard
parents:
10
diff
changeset
|
639 |
type = self.Controler.GetCurrentElementEditingType() |
| 0 | 640 |
self.ContextualMenu.FindItemByPosition(0).Enable(connector != None) |
641 |
self.ContextualMenu.FindItemByPosition(1).Enable(connector != None) |
|
|
13
69075340d6a9
Adding support for forbidding insertion of function block into function
lbessard
parents:
10
diff
changeset
|
642 |
self.ContextualMenu.FindItemByPosition(2).Enable(connector != None and type != "function") |
|
69075340d6a9
Adding support for forbidding insertion of function block into function
lbessard
parents:
10
diff
changeset
|
643 |
self.ContextualMenu.FindItemByPosition(3).Enable(connector != None and type != "function") |
| 0 | 644 |
self.ContextualMenu.FindItemByPosition(5).Enable(False) |
645 |
self.ContextualMenu.FindItemByPosition(6).Enable(False) |
|
646 |
self.ContextualMenu.FindItemByPosition(8).Enable(False) |
|
647 |
self.ContextualMenu.FindItemByPosition(9).Enable(False) |
|
648 |
if connector: |
|
649 |
if connector.IsNegated(): |
|
650 |
self.ContextualMenu.FindItemByPosition(1).Check(True) |
|
651 |
elif connector.GetEdge() == "rising": |
|
652 |
self.ContextualMenu.FindItemByPosition(2).Check(True) |
|
653 |
elif connector.GetEdge() == "falling": |
|
654 |
self.ContextualMenu.FindItemByPosition(3).Check(True) |
|
655 |
else: |
|
656 |
self.ContextualMenu.FindItemByPosition(0).Check(True) |
|
657 |
self.PopupMenu(self.ContextualMenu) |
|
658 |
||
659 |
def PopupVariableMenu(self, connector = None): |
|
660 |
self.ContextualMenu.FindItemByPosition(0).Enable(connector != None) |
|
661 |
self.ContextualMenu.FindItemByPosition(1).Enable(connector != None) |
|
662 |
self.ContextualMenu.FindItemByPosition(2).Enable(False) |
|
663 |
self.ContextualMenu.FindItemByPosition(3).Enable(False) |
|
664 |
self.ContextualMenu.FindItemByPosition(5).Enable(False) |
|
665 |
self.ContextualMenu.FindItemByPosition(6).Enable(False) |
|
666 |
self.ContextualMenu.FindItemByPosition(8).Enable(False) |
|
667 |
self.ContextualMenu.FindItemByPosition(9).Enable(False) |
|
668 |
if connector: |
|
669 |
if connector.IsNegated(): |
|
670 |
self.ContextualMenu.FindItemByPosition(1).Check(True) |
|
671 |
else: |
|
672 |
self.ContextualMenu.FindItemByPosition(0).Check(True) |
|
673 |
self.PopupMenu(self.ContextualMenu) |
|
674 |
||
675 |
def PopupWireMenu(self): |
|
676 |
self.ContextualMenu.FindItemByPosition(0).Enable(False) |
|
677 |
self.ContextualMenu.FindItemByPosition(1).Enable(False) |
|
678 |
self.ContextualMenu.FindItemByPosition(2).Enable(False) |
|
679 |
self.ContextualMenu.FindItemByPosition(3).Enable(False) |
|
680 |
self.ContextualMenu.FindItemByPosition(5).Enable(True) |
|
681 |
self.ContextualMenu.FindItemByPosition(6).Enable(True) |
|
682 |
self.ContextualMenu.FindItemByPosition(8).Enable(False) |
|
683 |
self.ContextualMenu.FindItemByPosition(9).Enable(False) |
|
684 |
self.PopupMenu(self.ContextualMenu) |
|
685 |
||
686 |
def PopupDivergenceMenu(self, connector): |
|
687 |
self.ContextualMenu.FindItemByPosition(0).Enable(False) |
|
688 |
self.ContextualMenu.FindItemByPosition(1).Enable(False) |
|
689 |
self.ContextualMenu.FindItemByPosition(2).Enable(False) |
|
690 |
self.ContextualMenu.FindItemByPosition(3).Enable(False) |
|
691 |
self.ContextualMenu.FindItemByPosition(5).Enable(False) |
|
692 |
self.ContextualMenu.FindItemByPosition(6).Enable(False) |
|
693 |
self.ContextualMenu.FindItemByPosition(8).Enable(True) |
|
694 |
self.ContextualMenu.FindItemByPosition(9).Enable(connector) |
|
695 |
self.PopupMenu(self.ContextualMenu) |
|
696 |
||
697 |
def PopupDefaultMenu(self): |
|
698 |
self.ContextualMenu.FindItemByPosition(0).Enable(False) |
|
699 |
self.ContextualMenu.FindItemByPosition(1).Enable(False) |
|
700 |
self.ContextualMenu.FindItemByPosition(2).Enable(False) |
|
701 |
self.ContextualMenu.FindItemByPosition(3).Enable(False) |
|
702 |
self.ContextualMenu.FindItemByPosition(5).Enable(False) |
|
703 |
self.ContextualMenu.FindItemByPosition(6).Enable(False) |
|
704 |
self.ContextualMenu.FindItemByPosition(8).Enable(False) |
|
705 |
self.ContextualMenu.FindItemByPosition(9).Enable(False) |
|
706 |
self.PopupMenu(self.ContextualMenu) |
|
707 |
||
708 |
#------------------------------------------------------------------------------- |
|
709 |
# Menu items functions |
|
710 |
#------------------------------------------------------------------------------- |
|
711 |
||
712 |
def OnNoModifierMenu(self, event): |
|
| 42 | 713 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
| 0 | 714 |
self.SelectedElement.SetConnectorNegated(False) |
| 80 | 715 |
self.RefreshBuffer() |
| 0 | 716 |
event.Skip() |
717 |
||
718 |
def OnNegatedMenu(self, event): |
|
| 42 | 719 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
| 0 | 720 |
self.SelectedElement.SetConnectorNegated(True) |
| 80 | 721 |
self.RefreshBuffer() |
| 0 | 722 |
event.Skip() |
723 |
||
724 |
def OnRisingEdgeMenu(self, event): |
|
| 42 | 725 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
| 0 | 726 |
self.SelectedElement.SetConnectorEdge("rising")
|
| 80 | 727 |
self.RefreshBuffer() |
| 0 | 728 |
event.Skip() |
729 |
||
730 |
def OnFallingEdgeMenu(self, event): |
|
| 42 | 731 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
| 0 | 732 |
self.SelectedElement.SetConnectorEdge("falling")
|
| 80 | 733 |
self.RefreshBuffer() |
| 0 | 734 |
event.Skip() |
735 |
||
736 |
def OnAddSegmentMenu(self, event): |
|
| 80 | 737 |
if self.SelectedElement and self.IsWire(self.SelectedElement): |
| 0 | 738 |
self.SelectedElement.AddSegment() |
739 |
event.Skip() |
|
740 |
||
741 |
def OnDeleteSegmentMenu(self, event): |
|
| 80 | 742 |
if self.SelectedElement and self.IsWire(self.SelectedElement): |
| 0 | 743 |
self.SelectedElement.DeleteSegment() |
744 |
event.Skip() |
|
745 |
||
746 |
def OnAddBranchMenu(self, event): |
|
| 42 | 747 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
| 0 | 748 |
self.AddDivergenceBranch(self.SelectedElement) |
| 80 | 749 |
self.RefreshBuffer() |
| 0 | 750 |
event.Skip() |
751 |
||
752 |
def OnDeleteBranchMenu(self, event): |
|
| 42 | 753 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
| 0 | 754 |
self.RemoveDivergenceBranch(self.SelectedElement) |
| 80 | 755 |
self.RefreshBuffer() |
| 0 | 756 |
event.Skip() |
757 |
||
758 |
def OnDeleteMenu(self, event): |
|
759 |
if self.SelectedElement: |
|
760 |
self.SelectedElement.Delete() |
|
761 |
self.SelectedElement = None |
|
| 80 | 762 |
self.RefreshBuffer() |
| 0 | 763 |
event.Skip() |
764 |
||
765 |
#------------------------------------------------------------------------------- |
|
766 |
# Mouse event functions |
|
767 |
#------------------------------------------------------------------------------- |
|
768 |
||
769 |
def OnViewerLeftDown(self, event): |
|
| 27 | 770 |
if self.Mode == MODE_SELECTION: |
771 |
dc = self.GetLogicalDC() |
|
772 |
pos = event.GetLogicalPosition(dc) |
|
773 |
if event.ControlDown() and self.SelectedElement: |
|
774 |
element = self.FindElement(pos, True) |
|
775 |
if element: |
|
776 |
if isinstance(self.SelectedElement, Graphic_Group): |
|
777 |
self.SelectedElement.SetSelected(False) |
|
778 |
self.SelectedElement.SelectElement(element) |
|
779 |
elif self.SelectedElement: |
|
780 |
group = Graphic_Group(self) |
|
781 |
group.SelectElement(self.SelectedElement) |
|
782 |
group.SelectElement(element) |
|
783 |
self.SelectedElement = group |
|
784 |
elements = self.SelectedElement.GetElements() |
|
785 |
if len(elements) == 0: |
|
786 |
self.SelectedElement = element |
|
787 |
elif len(elements) == 1: |
|
788 |
self.SelectedElement = elements[0] |
|
789 |
self.SelectedElement.SetSelected(True) |
|
790 |
else: |
|
791 |
element = self.FindElement(pos) |
|
792 |
if self.SelectedElement and self.SelectedElement != element: |
|
793 |
self.SelectedElement.SetSelected(False) |
|
794 |
self.SelectedElement = None |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
795 |
self.Refresh(False) |
| 27 | 796 |
if element: |
797 |
self.SelectedElement = element |
|
798 |
self.SelectedElement.OnLeftDown(event, dc, self.Scaling) |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
799 |
self.Refresh(False) |
| 27 | 800 |
else: |
801 |
self.rubberBand.Reset() |
|
802 |
self.rubberBand.OnLeftDown(event, dc, self.Scaling) |
|
803 |
elif self.Mode in [MODE_BLOCK, MODE_VARIABLE, MODE_CONNECTION, MODE_COMMENT, |
|
804 |
MODE_CONTACT, MODE_COIL, MODE_POWERRAIL, MODE_INITIALSTEP, |
|
805 |
MODE_STEP, MODE_TRANSITION, MODE_DIVERGENCE, MODE_JUMP, MODE_ACTION]: |
|
806 |
self.rubberBand.Reset() |
|
807 |
self.rubberBand.OnLeftDown(event, self.GetLogicalDC(), self.Scaling) |
|
808 |
elif self.Mode == MODE_WIRE: |
|
809 |
pos = GetScaledEventPosition(event, self.GetLogicalDC(), self.Scaling) |
|
810 |
connector = self.FindBlockConnector(pos) |
|
811 |
if connector: |
|
812 |
if (connector.GetDirection() == EAST): |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
813 |
wire = Wire(self, [wx.Point(pos.x, pos.y), EAST], [wx.Point(pos.x, pos.y), WEST]) |
| 27 | 814 |
else: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
815 |
wire = Wire(self, [wx.Point(pos.x, pos.y), WEST], [wx.Point(pos.x, pos.y), EAST]) |
| 27 | 816 |
wire.oldPos = pos |
817 |
wire.Handle = (HANDLE_POINT, 0) |
|
818 |
wire.ProcessDragging(0, 0) |
|
819 |
wire.Handle = (HANDLE_POINT, 1) |
|
| 42 | 820 |
self.AddWire(wire) |
| 27 | 821 |
if self.SelectedElement: |
822 |
self.SelectedElement.SetSelected(False) |
|
823 |
self.SelectedElement = wire |
|
824 |
elif self.SelectedElement: |
|
825 |
self.SelectedElement.SetSelected(False) |
|
826 |
self.SelectedElement = None |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
827 |
self.Refresh(False) |
| 0 | 828 |
event.Skip() |
829 |
||
830 |
def OnViewerLeftUp(self, event): |
|
| 27 | 831 |
if self.rubberBand.IsShown(): |
832 |
if self.Mode == MODE_SELECTION: |
|
833 |
elements = self.SearchElements(self.rubberBand.GetCurrentExtent()) |
|
834 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
| 80 | 835 |
if len(elements) == 1: |
836 |
self.SelectedElement = elements[0] |
|
837 |
self.SelectedElement.SetSelected(True) |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
838 |
self.Refresh(False) |
| 80 | 839 |
elif len(elements) > 1: |
| 27 | 840 |
self.SelectedElement = Graphic_Group(self) |
841 |
self.SelectedElement.SetElements(elements) |
|
842 |
self.SelectedElement.SetSelected(True) |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
843 |
self.Refresh(False) |
| 27 | 844 |
else: |
845 |
bbox = self.rubberBand.GetCurrentExtent() |
|
846 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
847 |
if self.Mode == MODE_BLOCK: |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
848 |
wx.CallAfter(self.AddNewBlock, bbox) |
| 27 | 849 |
elif self.Mode == MODE_VARIABLE: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
850 |
wx.CallAfter(self.AddNewVariable, bbox) |
| 27 | 851 |
elif self.Mode == MODE_CONNECTION: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
852 |
wx.CallAfter(self.AddNewConnection, bbox) |
| 27 | 853 |
elif self.Mode == MODE_COMMENT: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
854 |
wx.CallAfter(self.AddNewComment, bbox) |
| 27 | 855 |
elif self.Mode == MODE_CONTACT: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
856 |
wx.CallAfter(self.AddNewContact, bbox) |
| 27 | 857 |
elif self.Mode == MODE_COIL: |
|
67
3a1b0afdaf84
Adding support for automatically generate function blocks in interface when a block is added
lbessard
parents:
64
diff
changeset
|
858 |
wx.CallAfter(self.AddNewCoil, bbox) |
| 27 | 859 |
elif self.Mode == MODE_POWERRAIL: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
860 |
wx.CallAfter(self.AddNewPowerRail, bbox) |
| 27 | 861 |
elif self.Mode == MODE_INITIALSTEP: |
| 71 | 862 |
wx.CallAfter(self.AddNewStep, bbox, True) |
| 27 | 863 |
elif self.Mode == MODE_STEP: |
| 71 | 864 |
wx.CallAfter(self.AddNewStep, bbox, False) |
| 27 | 865 |
elif self.Mode == MODE_TRANSITION: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
866 |
wx.CallAfter(self.AddNewTransition, bbox) |
| 27 | 867 |
elif self.Mode == MODE_DIVERGENCE: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
868 |
wx.CallAfter(self.AddNewDivergence, bbox) |
| 27 | 869 |
elif self.Mode == MODE_JUMP: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
870 |
wx.CallAfter(self.AddNewJump, bbox) |
| 27 | 871 |
elif self.Mode == MODE_ACTION: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
872 |
wx.CallAfter(self.AddNewActionBlock, bbox) |
| 27 | 873 |
elif self.Mode == MODE_SELECTION and self.SelectedElement: |
874 |
self.SelectedElement.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
875 |
wx.CallAfter(self.SetCursor, wx.NullCursor) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
876 |
self.Refresh(False) |
| 27 | 877 |
elif self.Mode == MODE_WIRE and self.SelectedElement: |
| 42 | 878 |
if self.SelectedElement.EndConnected != None: |
| 27 | 879 |
self.SelectedElement.ResetPoints() |
| 45 | 880 |
self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling) |
| 27 | 881 |
self.SelectedElement.GeneratePoints() |
882 |
self.SelectedElement.RefreshModel() |
|
883 |
self.SelectedElement.SetSelected(True) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
884 |
self.RefreshBuffer() |
| 27 | 885 |
else: |
886 |
self.SelectedElement.Delete() |
|
887 |
self.SelectedElement = None |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
888 |
self.Refresh(False) |
| 27 | 889 |
if not self.SavedMode: |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
890 |
wx.CallAfter(self.ParentWindow.ResetCurrentMode) |
| 0 | 891 |
event.Skip() |
892 |
||
893 |
def OnViewerRightUp(self, event): |
|
| 80 | 894 |
dc = self.GetLogicalDC() |
895 |
pos = event.GetLogicalPosition(dc) |
|
| 27 | 896 |
element = self.FindElement(pos) |
897 |
if element: |
|
898 |
if self.SelectedElement and self.SelectedElement != element: |
|
899 |
self.SelectedElement.SetSelected(False) |
|
900 |
self.SelectedElement = element |
|
901 |
self.SelectedElement.SetSelected(True) |
|
902 |
self.SelectedElement.OnRightUp(event, self.GetLogicalDC(), self.Scaling) |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
903 |
wx.CallAfter(self.SetCursor, wx.NullCursor) |
| 27 | 904 |
self.ReleaseMouse() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
905 |
self.Refresh(False) |
| 0 | 906 |
event.Skip() |
907 |
||
908 |
def OnViewerLeftDClick(self, event): |
|
| 27 | 909 |
if self.Mode == MODE_SELECTION and self.SelectedElement: |
910 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
911 |
self.Refresh(False) |
| 0 | 912 |
event.Skip() |
913 |
||
914 |
def OnViewerMotion(self, event): |
|
| 27 | 915 |
if self.rubberBand.IsShown(): |
916 |
self.rubberBand.OnMotion(event, self.GetLogicalDC(), self.Scaling) |
|
917 |
elif self.Mode == MODE_SELECTION and self.SelectedElement: |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
918 |
if self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling): |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
919 |
self.Refresh(False) |
| 27 | 920 |
elif self.Mode == MODE_WIRE and self.SelectedElement: |
921 |
dc = self.GetLogicalDC() |
|
922 |
pos = GetScaledEventPosition(event, dc, self.Scaling) |
|
923 |
connector = self.FindBlockConnector(pos, False) |
|
924 |
if not connector or self.SelectedElement.EndConnected == None: |
|
925 |
self.SelectedElement.ResetPoints() |
|
926 |
self.SelectedElement.OnMotion(event, dc, self.Scaling) |
|
927 |
self.SelectedElement.GeneratePoints() |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
928 |
self.Refresh(False) |
| 71 | 929 |
event.Skip() |
930 |
||
931 |
def UpdateScrollPos(self, event): |
|
| 27 | 932 |
if (event.Dragging() and self.SelectedElement) or self.rubberBand.IsShown(): |
933 |
position = event.GetPosition() |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
934 |
move_window = wx.Point() |
| 27 | 935 |
window_size = self.GetClientSize() |
936 |
xstart, ystart = self.GetViewStart() |
|
937 |
if position.x < SCROLL_ZONE and xstart > 0: |
|
938 |
move_window.x = -1 |
|
939 |
elif position.x > window_size[0] - SCROLL_ZONE: |
|
940 |
move_window.x = 1 |
|
941 |
if position.y < SCROLL_ZONE and ystart > 0: |
|
942 |
move_window.y = -1 |
|
943 |
elif position.y > window_size[1] - SCROLL_ZONE: |
|
944 |
move_window.y = 1 |
|
945 |
if move_window.x != 0 or move_window.y != 0: |
|
946 |
self.Scroll(xstart + move_window.x, ystart + move_window.y) |
|
| 42 | 947 |
self.RefreshScrollBars() |
| 0 | 948 |
|
949 |
#------------------------------------------------------------------------------- |
|
950 |
# Keyboard event functions |
|
951 |
#------------------------------------------------------------------------------- |
|
952 |
||
953 |
def OnChar(self, event): |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
954 |
xpos, ypos = self.GetScrollPos(wx.HORIZONTAL), self.GetScrollPos(wx.VERTICAL) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
955 |
xmax = self.GetScrollRange(wx.HORIZONTAL) - self.GetScrollThumb(wx.HORIZONTAL) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
956 |
ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL) |
| 27 | 957 |
keycode = event.GetKeyCode() |
958 |
if self.Scaling: |
|
959 |
scaling = self.Scaling |
|
960 |
else: |
|
961 |
scaling = (8, 8) |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
962 |
if keycode == wx.WXK_DELETE and self.SelectedElement: |
| 27 | 963 |
self.SelectedElement.Clean() |
964 |
self.SelectedElement.Delete() |
|
965 |
self.SelectedElement = None |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
966 |
self.RefreshBuffer() |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
967 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
968 |
self.Refresh(False) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
969 |
elif keycode == wx.WXK_LEFT: |
| 42 | 970 |
if event.ControlDown() and event.ShiftDown(): |
971 |
self.Scroll(0, ypos) |
|
972 |
elif event.ControlDown(): |
|
973 |
self.Scroll(max(0, xpos - 1), ypos) |
|
974 |
elif self.SelectedElement: |
|
975 |
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
|
976 |
self.SelectedElement.RefreshModel() |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
977 |
self.RefreshBuffer() |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
978 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
979 |
self.Refresh(False) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
980 |
elif keycode == wx.WXK_RIGHT: |
| 42 | 981 |
if event.ControlDown() and event.ShiftDown(): |
982 |
self.Scroll(xmax, ypos) |
|
983 |
elif event.ControlDown(): |
|
984 |
self.Scroll(min(xpos + 1, xmax), ypos) |
|
985 |
elif self.SelectedElement: |
|
986 |
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
|
987 |
self.SelectedElement.RefreshModel() |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
988 |
self.RefreshBuffer() |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
989 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
990 |
self.Refresh(False) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
991 |
elif keycode == wx.WXK_UP: |
| 42 | 992 |
if event.ControlDown() and event.ShiftDown(): |
993 |
self.Scroll(xpos, 0) |
|
994 |
elif event.ControlDown(): |
|
995 |
self.Scroll(xpos, max(0, ypos - 1)) |
|
996 |
elif self.SelectedElement: |
|
997 |
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
|
998 |
self.SelectedElement.RefreshModel() |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
999 |
self.RefreshBuffer() |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1000 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1001 |
self.Refresh(False) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1002 |
elif keycode == wx.WXK_DOWN: |
| 42 | 1003 |
if event.ControlDown() and event.ShiftDown(): |
1004 |
self.Scroll(xpos, ymax) |
|
1005 |
elif event.ControlDown(): |
|
1006 |
self.Scroll(xpos, min(ypos + 1, ymax)) |
|
1007 |
elif self.SelectedElement: |
|
1008 |
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
|
1009 |
self.SelectedElement.RefreshModel() |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1010 |
self.RefreshBuffer() |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1011 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1012 |
self.Refresh(False) |
| 27 | 1013 |
|
1014 |
#------------------------------------------------------------------------------- |
|
1015 |
# Model adding functions |
|
1016 |
#------------------------------------------------------------------------------- |
|
1017 |
||
1018 |
def AddNewBlock(self, bbox): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1019 |
dialog = BlockPropertiesDialog(self.ParentWindow) |
| 27 | 1020 |
dialog.SetBlockList(self.Controler.GetBlockTypes()) |
| 70 | 1021 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
1022 |
dialog.SetPouElementNames(self.Controler.GetCurrentElementEditingVariables()) |
|
| 27 | 1023 |
dialog.SetMinBlockSize((bbox.width, bbox.height)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1024 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1025 |
id = self.GetNewId() |
1026 |
values = dialog.GetValues() |
|
1027 |
if "name" in values: |
|
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1028 |
block = FBD_Block(self, values["type"], values["name"], id, values["extension"], values["inputs"]) |
| 27 | 1029 |
else: |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1030 |
block = FBD_Block(self, values["type"], "", id, values["extension"], values["inputs"]) |
| 27 | 1031 |
block.SetPosition(bbox.x, bbox.y) |
1032 |
block.SetSize(values["width"], values["height"]) |
|
| 42 | 1033 |
self.AddBlock(block) |
|
67
3a1b0afdaf84
Adding support for automatically generate function blocks in interface when a block is added
lbessard
parents:
64
diff
changeset
|
1034 |
self.Controler.AddCurrentElementEditingBlock(id, values["type"], values.get("name", None))
|
| 27 | 1035 |
self.RefreshBlockModel(block) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1036 |
self.RefreshBuffer() |
| 42 | 1037 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1038 |
self.ParentWindow.RefreshEditor() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1039 |
self.Refresh(False) |
| 27 | 1040 |
dialog.Destroy() |
1041 |
||
1042 |
def AddNewVariable(self, bbox): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1043 |
dialog = VariablePropertiesDialog(self.ParentWindow) |
| 27 | 1044 |
dialog.SetMinVariableSize((bbox.width, bbox.height)) |
1045 |
varlist = [] |
|
1046 |
vars = self.Controler.GetCurrentElementEditingInterfaceVars() |
|
1047 |
if vars: |
|
1048 |
for var in vars: |
|
| 70 | 1049 |
if var["Edit"]: |
1050 |
varlist.append((var["Name"], var["Class"], var["Type"])) |
|
| 27 | 1051 |
returntype = self.Controler.GetCurrentElementEditingInterfaceReturnType() |
1052 |
if returntype: |
|
1053 |
varlist.append((self.Controler.GetCurrentElementEditingName(), "Output", returntype)) |
|
1054 |
dialog.SetVariables(varlist) |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1055 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1056 |
id = self.GetNewId() |
1057 |
values = dialog.GetValues() |
|
1058 |
variable = FBD_Variable(self, values["type"], values["name"], values["value_type"], id) |
|
1059 |
variable.SetPosition(bbox.x, bbox.y) |
|
1060 |
variable.SetSize(values["width"], values["height"]) |
|
| 42 | 1061 |
self.AddBlock(variable) |
| 27 | 1062 |
self.Controler.AddCurrentElementEditingVariable(id, values["type"]) |
1063 |
self.RefreshVariableModel(variable) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1064 |
self.RefreshBuffer() |
| 42 | 1065 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1066 |
self.Refresh(False) |
| 27 | 1067 |
dialog.Destroy() |
1068 |
||
1069 |
def AddNewConnection(self, bbox): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1070 |
dialog = ConnectionPropertiesDialog(self.ParentWindow) |
| 27 | 1071 |
dialog.SetMinConnectionSize((bbox.width, bbox.height)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1072 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1073 |
id = self.GetNewId() |
1074 |
values = dialog.GetValues() |
|
1075 |
connection = FBD_Connector(self, values["type"], values["name"], id) |
|
1076 |
connection.SetPosition(bbox.x, bbox.y) |
|
1077 |
connection.SetSize(values["width"], values["height"]) |
|
| 42 | 1078 |
self.AddBlock(connection) |
| 27 | 1079 |
self.Controler.AddCurrentElementEditingConnection(id, values["type"]) |
1080 |
self.RefreshConnectionModel(connection) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1081 |
self.RefreshBuffer() |
| 42 | 1082 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1083 |
self.Refresh(False) |
| 27 | 1084 |
dialog.Destroy() |
1085 |
||
1086 |
def AddNewComment(self, bbox): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1087 |
dialog = wx.TextEntryDialog(self.ParentWindow, "Add a new comment", "Please enter comment text", "", wx.OK|wx.CANCEL|wx.TE_MULTILINE) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1088 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1089 |
value = dialog.GetValue() |
1090 |
id = self.GetNewId() |
|
1091 |
comment = Comment(self, value, id) |
|
1092 |
comment.SetPosition(bbox.x, bbox.y) |
|
1093 |
min_width, min_height = comment.GetMinSize() |
|
1094 |
comment.SetSize(max(min_width,bbox.width),max(min_height,bbox.height)) |
|
| 42 | 1095 |
self.AddComment(comment) |
| 27 | 1096 |
self.Controler.AddCurrentElementEditingComment(id) |
1097 |
self.RefreshCommentModel(comment) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1098 |
self.RefreshBuffer() |
| 42 | 1099 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1100 |
self.Refresh(False) |
| 27 | 1101 |
dialog.Destroy() |
1102 |
||
1103 |
def AddNewContact(self, bbox): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1104 |
dialog = LDElementDialog(self.ParentWindow, "contact") |
| 27 | 1105 |
varlist = [] |
1106 |
vars = self.Controler.GetCurrentElementEditingInterfaceVars() |
|
1107 |
if vars: |
|
1108 |
for var in vars: |
|
1109 |
if var["Class"] != "Output" and var["Type"] == "BOOL": |
|
1110 |
varlist.append(var["Name"]) |
|
1111 |
dialog.SetVariables(varlist) |
|
1112 |
dialog.SetValues({"name":"","type":CONTACT_NORMAL})
|
|
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1113 |
dialog.SetElementSize((bbox.width, bbox.height)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1114 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1115 |
id = self.GetNewId() |
1116 |
values = dialog.GetValues() |
|
1117 |
contact = LD_Contact(self, values["type"], values["name"], id) |
|
1118 |
contact.SetPosition(bbox.x, bbox.y) |
|
1119 |
contact.SetSize(values["width"], values["height"]) |
|
| 42 | 1120 |
self.AddBlock(contact) |
| 27 | 1121 |
self.Controler.AddCurrentElementEditingContact(id) |
1122 |
self.RefreshContactModel(contact) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1123 |
self.RefreshBuffer() |
| 42 | 1124 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1125 |
self.Refresh(False) |
| 27 | 1126 |
dialog.Destroy() |
1127 |
||
1128 |
def AddNewCoil(self, bbox): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1129 |
dialog = LDElementDialog(self.ParentWindow, "coil") |
| 27 | 1130 |
varlist = [] |
1131 |
vars = self.Controler.GetCurrentElementEditingInterfaceVars() |
|
1132 |
if vars: |
|
1133 |
for var in vars: |
|
1134 |
if var["Class"] != "Input" and var["Type"] == "BOOL": |
|
1135 |
varlist.append(var["Name"]) |
|
1136 |
returntype = self.Controler.GetCurrentElementEditingInterfaceReturnType() |
|
1137 |
if returntype == "BOOL": |
|
1138 |
varlist.append(self.Controler.GetCurrentElementEditingName()) |
|
1139 |
dialog.SetVariables(varlist) |
|
1140 |
dialog.SetValues({"name":"","type":COIL_NORMAL})
|
|
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1141 |
dialog.SetElementSize((bbox.width, bbox.height)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1142 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1143 |
id = self.GetNewId() |
1144 |
values = dialog.GetValues() |
|
1145 |
coil = LD_Coil(self, values["type"], values["name"], id) |
|
1146 |
coil.SetPosition(bbox.x, bbox.y) |
|
1147 |
coil.SetSize(values["width"], values["height"]) |
|
| 42 | 1148 |
self.AddBlock(coil) |
| 27 | 1149 |
self.Controler.AddCurrentElementEditingCoil(id) |
|
67
3a1b0afdaf84
Adding support for automatically generate function blocks in interface when a block is added
lbessard
parents:
64
diff
changeset
|
1150 |
self.RefreshCoilModel(coil) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1151 |
self.RefreshBuffer() |
| 42 | 1152 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1153 |
self.Refresh(False) |
| 27 | 1154 |
dialog.Destroy() |
1155 |
||
1156 |
def AddNewPowerRail(self, bbox): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1157 |
dialog = LDPowerRailDialog(self.ParentWindow) |
| 27 | 1158 |
dialog.SetMinSize((bbox.width, bbox.height)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1159 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1160 |
id = self.GetNewId() |
1161 |
values = dialog.GetValues() |
|
1162 |
powerrail = LD_PowerRail(self, values["type"], id, [True for i in xrange(values["number"])]) |
|
1163 |
powerrail.SetPosition(bbox.x, bbox.y) |
|
1164 |
powerrail.SetSize(values["width"], values["height"]) |
|
| 42 | 1165 |
self.AddBlock(powerrail) |
| 27 | 1166 |
self.Controler.AddCurrentElementEditingPowerRail(id, values["type"]) |
1167 |
self.RefreshPowerRailModel(powerrail) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1168 |
self.RefreshBuffer() |
| 42 | 1169 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1170 |
self.Refresh(False) |
| 27 | 1171 |
dialog.Destroy() |
1172 |
||
| 71 | 1173 |
def AddNewStep(self, bbox, initial = False): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1174 |
dialog = StepContentDialog(self.ParentWindow, initial) |
| 71 | 1175 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
1176 |
dialog.SetVariables(self.Controler.GetCurrentElementEditingInterfaceVars()) |
|
1177 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step)]) |
|
1178 |
dialog.SetMinStepSize((bbox.width, bbox.height)) |
|
1179 |
if dialog.ShowModal() == wx.ID_OK: |
|
1180 |
id = self.GetNewId() |
|
1181 |
values = dialog.GetValues() |
|
1182 |
step = SFC_Step(self, values["name"], initial, id) |
|
1183 |
if values["input"]: |
|
1184 |
step.AddInput() |
|
1185 |
else: |
|
1186 |
step.RemoveInput() |
|
1187 |
if values["output"]: |
|
1188 |
step.AddOutput() |
|
1189 |
else: |
|
1190 |
step.RemoveOutput() |
|
1191 |
if values["action"]: |
|
1192 |
step.AddAction() |
|
1193 |
else: |
|
1194 |
step.RemoveAction() |
|
1195 |
step.SetPosition(bbox.x, bbox.y) |
|
1196 |
min_width, min_height = step.GetMinSize() |
|
1197 |
step.SetSize(max(bbox.width, min_width), max(bbox.height, min_height)) |
|
1198 |
self.AddBlock(step) |
|
1199 |
self.Controler.AddCurrentElementEditingStep(id) |
|
1200 |
self.RefreshStepModel(step) |
|
1201 |
self.RefreshBuffer() |
|
1202 |
self.RefreshScrollBars() |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1203 |
self.Refresh(False) |
| 71 | 1204 |
dialog.Destroy() |
1205 |
||
| 27 | 1206 |
def AddNewTransition(self, bbox): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1207 |
dialog = TransitionContentDialog(self.ParentWindow, self.GetDrawingMode() == FREEDRAWING_MODE) |
| 27 | 1208 |
dialog.SetTransitions(self.Controler.GetCurrentElementEditingTransitions()) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1209 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1210 |
id = self.GetNewId() |
1211 |
values = dialog.GetValues() |
|
| 80 | 1212 |
transition = SFC_Transition(self, values["type"], values["value"], values["priority"], id) |
| 27 | 1213 |
transition.SetPosition(bbox.x, bbox.y) |
1214 |
min_width, min_height = transition.GetMinSize() |
|
1215 |
transition.SetSize(max(bbox.width, min_width), max(bbox.height, min_height)) |
|
| 42 | 1216 |
self.AddBlock(transition) |
| 27 | 1217 |
self.Controler.AddCurrentElementEditingTransition(id) |
1218 |
self.RefreshTransitionModel(transition) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1219 |
self.RefreshBuffer() |
| 42 | 1220 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1221 |
self.Refresh(False) |
| 27 | 1222 |
dialog.Destroy() |
1223 |
||
1224 |
def AddNewDivergence(self, bbox): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1225 |
dialog = DivergenceCreateDialog(self.ParentWindow) |
| 27 | 1226 |
dialog.SetMinSize((bbox.width, bbox.height)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1227 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1228 |
id = self.GetNewId() |
1229 |
values = dialog.GetValues() |
|
1230 |
divergence = SFC_Divergence(self, values["type"], values["number"], id) |
|
1231 |
divergence.SetPosition(bbox.x, bbox.y) |
|
1232 |
min_width, min_height = divergence.GetMinSize() |
|
1233 |
divergence.SetSize(max(bbox.width, min_width), max(bbox.height, min_height)) |
|
| 42 | 1234 |
self.AddBlock(divergence) |
| 27 | 1235 |
self.Controler.AddCurrentElementEditingDivergence(id, values["type"]) |
1236 |
self.RefreshDivergenceModel(divergence) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1237 |
self.RefreshBuffer() |
| 42 | 1238 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1239 |
self.Refresh(False) |
| 27 | 1240 |
dialog.Destroy() |
| 0 | 1241 |
|
| 27 | 1242 |
|
1243 |
#------------------------------------------------------------------------------- |
|
1244 |
# Edit element content functions |
|
1245 |
#------------------------------------------------------------------------------- |
|
1246 |
||
1247 |
def EditBlockContent(self, block): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1248 |
dialog = BlockPropertiesDialog(self.ParentWindow) |
| 27 | 1249 |
dialog.SetBlockList(self.Controler.GetBlockTypes()) |
| 70 | 1250 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
1251 |
dialog.SetPouElementNames(self.Controler.GetCurrentElementEditingVariables()) |
|
| 27 | 1252 |
dialog.SetMinBlockSize(block.GetSize()) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1253 |
values = {"name" : block.GetName(), "type" : block.GetType(), "inputs" : block.GetInputTypes()}
|
| 27 | 1254 |
values["extension"] = block.GetExtension() |
1255 |
dialog.SetValues(values) |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1256 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1257 |
values = dialog.GetValues() |
1258 |
if "name" in values: |
|
1259 |
block.SetName(values["name"]) |
|
1260 |
block.SetSize(values["width"], values["height"]) |
|
1261 |
block.SetType(values["type"], values["extension"]) |
|
1262 |
self.RefreshBlockModel(block) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1263 |
self.RefreshBuffer() |
| 42 | 1264 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1265 |
self.Refresh(False) |
| 27 | 1266 |
dialog.Destroy() |
1267 |
||
1268 |
def EditVariableContent(self, variable): |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1269 |
dialog = VariablePropertiesDialog(self.ParentWindow) |
| 27 | 1270 |
dialog.SetMinVariableSize(variable.GetSize()) |
1271 |
varlist = [] |
|
1272 |
vars = self.Controler.GetCurrentElementEditingInterfaceVars() |
|
1273 |
if vars: |
|
1274 |
for var in vars: |
|
| 70 | 1275 |
if var["Edit"]: |
1276 |
varlist.append((var["Name"], var["Class"], var["Type"])) |
|
| 27 | 1277 |
returntype = self.Controler.GetCurrentElementEditingInterfaceReturnType() |
1278 |
if returntype: |
|
1279 |
varlist.append((self.Controler.GetCurrentElementEditingName(), "Output", returntype)) |
|
1280 |
dialog.SetVariables(varlist) |
|
1281 |
values = {"name" : variable.GetName(), "type" : variable.GetType()}
|
|
1282 |
dialog.SetValues(values) |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1283 |
if dialog.ShowModal() == wx.ID_OK: |
| 27 | 1284 |
old_type = variable.GetType() |
1285 |
values = dialog.GetValues() |
|
1286 |
variable.SetName(values["name"]) |
|
1287 |
variable.SetType(values["type"], values["value_type"]) |
|
1288 |
variable.SetSize(values["width"], values["height"]) |
|
1289 |
if old_type != values["type"]: |
|
1290 |
id = variable.GetId() |
|
1291 |
self.Controler.RemoveCurrentElementEditingInstance(id) |
|
1292 |
self.Controler.AddCurrentElementEditingVariable(id, values["type"]) |
|
1293 |
self.RefreshVariableModel(variable) |
|
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1294 |
self.RefreshBuffer() |
| 42 | 1295 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1296 |
self.Refresh(False) |
| 27 | 1297 |
dialog.Destroy() |
1298 |
||
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1299 |
def EditConnectionContent(self, connection): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1300 |
dialog = ConnectionPropertiesDialog(self.ParentWindow) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1301 |
dialog.SetMinConnectionSize(connection.GetSize()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1302 |
values = {"name" : connection.GetName(), "type" : connection.GetType()}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1303 |
dialog.SetValues(values) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1304 |
if dialog.ShowModal() == wx.ID_OK: |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1305 |
old_type = connection.GetType() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1306 |
values = dialog.GetValues() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1307 |
connection.SetName(values["name"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1308 |
connection.SetType(values["type"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1309 |
connection.SetSize(values["width"], values["height"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1310 |
if old_type != values["type"]: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1311 |
id = connection.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1312 |
self.Controler.RemoveCurrentElementEditingInstance(id) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1313 |
self.Controler.AddCurrentElementEditingConnection(id, values["type"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1314 |
self.RefreshConnectionModel(connection) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1315 |
self.RefreshBuffer() |
| 42 | 1316 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1317 |
self.Refresh(False) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1318 |
dialog.Destroy() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1319 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1320 |
def EditContactContent(self, contact): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1321 |
dialog = LDElementDialog(self.ParentWindow, "contact") |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1322 |
varlist = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1323 |
vars = self.Controler.GetCurrentElementEditingInterfaceVars() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1324 |
if vars: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1325 |
for var in vars: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1326 |
if var["Class"] != "Output" and var["Type"] == "BOOL": |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1327 |
varlist.append(var["Name"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1328 |
dialog.SetVariables(varlist) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1329 |
values = {"name" : contact.GetName(), "type" : contact.GetType()}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1330 |
dialog.SetValues(values) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1331 |
dialog.SetElementSize(contact.GetSize()) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1332 |
if dialog.ShowModal() == wx.ID_OK: |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1333 |
values = dialog.GetValues() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1334 |
contact.SetName(values["name"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1335 |
contact.SetType(values["type"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1336 |
contact.SetSize(values["width"], values["height"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1337 |
self.RefreshContactModel(contact) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1338 |
self.RefreshBuffer() |
| 42 | 1339 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1340 |
self.Refresh(False) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1341 |
dialog.Destroy() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1342 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1343 |
def EditCoilContent(self, coil): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1344 |
dialog = LDElementDialog(self.ParentWindow, "coil") |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1345 |
varlist = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1346 |
vars = self.Controler.GetCurrentElementEditingInterfaceVars() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1347 |
if vars: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1348 |
for var in vars: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1349 |
if var["Class"] != "Input" and var["Type"] == "BOOL": |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1350 |
varlist.append(var["Name"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1351 |
returntype = self.Controler.GetCurrentElementEditingInterfaceReturnType() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1352 |
if returntype == "BOOL": |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1353 |
varlist.append(self.Controler.GetCurrentElementEditingName()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1354 |
dialog.SetVariables(varlist) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1355 |
values = {"name" : coil.GetName(), "type" : coil.GetType()}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1356 |
dialog.SetValues(values) |
|
61
dc7142ae9438
Adding possibility to change Type and Pin number of power rails
lbessard
parents:
58
diff
changeset
|
1357 |
dialog.SetElementSize(coil.GetSize()) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1358 |
if dialog.ShowModal() == wx.ID_OK: |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1359 |
values = dialog.GetValues() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1360 |
coil.SetName(values["name"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1361 |
coil.SetType(values["type"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1362 |
coil.SetSize(values["width"], values["height"]) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1363 |
self.RefreshCoilModel(coil) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1364 |
self.RefreshBuffer() |
| 42 | 1365 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1366 |
self.Refresh(False) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1367 |
dialog.Destroy() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1368 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1369 |
def EditPowerRailContent(self, powerrail): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1370 |
dialog = LDPowerRailDialog(self.ParentWindow, powerrail.GetType(), len(powerrail.GetConnectors())) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1371 |
dialog.SetMinSize(powerrail.GetSize()) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1372 |
if dialog.ShowModal() == wx.ID_OK: |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1373 |
old_type = powerrail.GetType() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1374 |
values = dialog.GetValues() |
|
61
dc7142ae9438
Adding possibility to change Type and Pin number of power rails
lbessard
parents:
58
diff
changeset
|
1375 |
powerrail.SetType(values["type"], [True for i in xrange(values["number"])]) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1376 |
powerrail.SetSize(values["width"], values["height"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1377 |
if old_type != values["type"]: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1378 |
id = powerrail.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1379 |
self.Controler.RemoveCurrentElementEditingInstance(id) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1380 |
self.Controler.AddCurrentElementEditingPowerRail(id, values["type"]) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1381 |
self.RefreshPowerRailModel(powerrail) |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1382 |
self.RefreshBuffer() |
| 42 | 1383 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1384 |
self.Refresh(False) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1385 |
dialog.Destroy() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1386 |
|
| 71 | 1387 |
def EditStepContent(self, step): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1388 |
dialog = StepContentDialog(self.ParentWindow, step.GetInitial()) |
| 71 | 1389 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
1390 |
dialog.SetVariables(self.Controler.GetCurrentElementEditingInterfaceVars()) |
|
1391 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step) and block.GetName() != step.GetName()]) |
|
1392 |
dialog.SetMinStepSize(step.GetSize()) |
|
1393 |
values = {"name" : step.GetName()}
|
|
1394 |
connectors = step.GetConnectors() |
|
1395 |
values["input"] = connectors["input"] != None |
|
1396 |
values["output"] = connectors["output"] != None |
|
1397 |
values["action"] = connectors["action"] != None |
|
1398 |
dialog.SetValues(values) |
|
1399 |
if dialog.ShowModal() == wx.ID_OK: |
|
1400 |
values = dialog.GetValues() |
|
1401 |
step.SetName(values["name"]) |
|
1402 |
if values["input"]: |
|
1403 |
step.AddInput() |
|
1404 |
else: |
|
1405 |
step.RemoveInput() |
|
1406 |
if values["output"]: |
|
1407 |
step.AddOutput() |
|
1408 |
else: |
|
1409 |
step.RemoveOutput() |
|
1410 |
if values["action"]: |
|
1411 |
step.AddAction() |
|
1412 |
else: |
|
1413 |
step.RemoveAction() |
|
1414 |
step.UpdateSize(values["width"], values["height"]) |
|
1415 |
step.RefreshModel() |
|
1416 |
self.RefreshBuffer() |
|
1417 |
self.RefreshScrollBars() |
|
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1418 |
self.Refresh(False) |
| 71 | 1419 |
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1420 |
def EditTransitionContent(self, transition): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1421 |
dialog = TransitionContentDialog(self.ParentWindow, self.GetDrawingMode() == FREEDRAWING_MODE) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1422 |
dialog.SetTransitions(self.Controler.GetCurrentElementEditingTransitions()) |
| 80 | 1423 |
dialog.SetValues({"type":transition.GetType(),"value":transition.GetCondition(), "priority":transition.GetPriority()})
|
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1424 |
dialog.SetElementSize(transition.GetSize()) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1425 |
if dialog.ShowModal() == wx.ID_OK: |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1426 |
values = dialog.GetValues() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1427 |
transition.SetType(values["type"],values["value"]) |
| 80 | 1428 |
transition.SetPriority(values["priority"]) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1429 |
transition.RefreshModel() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1430 |
self.RefreshBuffer() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1431 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1432 |
self.Refresh(False) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1433 |
dialog.Destroy() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1434 |
|
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1435 |
def EditJumpContent(self, jump): |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1436 |
choices = [] |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1437 |
for block in self.Blocks: |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1438 |
if isinstance(block, SFC_Step): |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1439 |
choices.append(block.GetName()) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1440 |
dialog = wx.SingleChoiceDialog(self.ParentWindow, "Edit jump target", "Please choose a target", choices, wx.OK|wx.CANCEL) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1441 |
dialog.SetSelection(choices.index(jump.GetTarget())) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1442 |
if dialog.ShowModal() == wx.ID_OK: |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1443 |
value = dialog.GetStringSelection() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1444 |
jump.SetTarget(value) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1445 |
jump.RefreshModel() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1446 |
self.RefreshBuffer() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1447 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1448 |
self.Refresh(False) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1449 |
dialog.Destroy() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1450 |
|
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1451 |
def EditActionBlockContent(self, actionblock): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1452 |
dialog = ActionBlockDialog(self.ParentWindow) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1453 |
dialog.SetQualifierList(self.Controler.GetQualifierTypes()) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1454 |
dialog.SetActionList(self.Controler.GetCurrentElementEditingActions()) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1455 |
dialog.SetVariableList(self.Controler.GetCurrentElementEditingInterfaceVars()) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1456 |
dialog.SetValues(actionblock.GetActions()) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1457 |
if dialog.ShowModal() == wx.ID_OK: |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1458 |
actions = dialog.GetValues() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1459 |
actionblock.SetActions(actions) |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1460 |
actionblock.RefreshModel() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1461 |
self.RefreshBuffer() |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1462 |
self.RefreshScrollBars() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1463 |
self.Refresh(False) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1464 |
dialog.Destroy() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1465 |
|
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1466 |
def EditCommentContent(self, comment): |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1467 |
dialog = wx.TextEntryDialog(self.ParentWindow, "Edit comment", "Please enter comment text", comment.GetContent(), wx.OK|wx.CANCEL|wx.TE_MULTILINE) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1468 |
if dialog.ShowModal() == wx.ID_OK: |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1469 |
value = dialog.GetValue() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1470 |
comment.SetContent(value) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1471 |
comment.RefreshModel() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1472 |
self.RefreshBuffer() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1473 |
self.RefreshScrollBars() |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1474 |
self.Refresh(False) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1475 |
dialog.Destroy() |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1476 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1477 |
#------------------------------------------------------------------------------- |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1478 |
# Model update functions |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1479 |
#------------------------------------------------------------------------------- |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1480 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1481 |
def RefreshBlockModel(self, block): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1482 |
blockid = block.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1483 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1484 |
infos["type"] = block.GetType() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1485 |
infos["name"] = block.GetName() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1486 |
infos["x"], infos["y"] = block.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1487 |
infos["width"], infos["height"] = block.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1488 |
infos["connectors"] = block.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1489 |
self.Controler.SetCurrentElementEditingBlockInfos(blockid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1490 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1491 |
def RefreshVariableModel(self, variable): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1492 |
variableid = variable.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1493 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1494 |
infos["name"] = variable.GetName() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1495 |
infos["x"], infos["y"] = variable.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1496 |
infos["width"], infos["height"] = variable.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1497 |
infos["connectors"] = variable.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1498 |
self.Controler.SetCurrentElementEditingVariableInfos(variableid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1499 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1500 |
def RefreshConnectionModel(self, connection): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1501 |
connectionid = connection.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1502 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1503 |
infos["name"] = connection.GetName() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1504 |
infos["x"], infos["y"] = connection.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1505 |
infos["width"], infos["height"] = connection.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1506 |
infos["connector"] = connection.GetConnector() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1507 |
self.Controler.SetCurrentElementEditingConnectionInfos(connectionid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1508 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1509 |
def RefreshCommentModel(self, comment): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1510 |
commentid = comment.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1511 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1512 |
infos["content"] = comment.GetContent() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1513 |
infos["x"], infos["y"] = comment.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1514 |
infos["width"], infos["height"] = comment.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1515 |
self.Controler.SetCurrentElementEditingCommentInfos(commentid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1516 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1517 |
def RefreshPowerRailModel(self, powerrail): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1518 |
powerrailid = powerrail.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1519 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1520 |
infos["x"], infos["y"] = powerrail.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1521 |
infos["width"], infos["height"] = powerrail.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1522 |
infos["connectors"] = powerrail.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1523 |
self.Controler.SetCurrentElementEditingPowerRailInfos(powerrailid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1524 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1525 |
def RefreshContactModel(self, contact): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1526 |
contactid = contact.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1527 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1528 |
infos["name"] = contact.GetName() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1529 |
infos["type"] = contact.GetType() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1530 |
infos["x"], infos["y"] = contact.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1531 |
infos["width"], infos["height"] = contact.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1532 |
infos["connectors"] = contact.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1533 |
self.Controler.SetCurrentElementEditingContactInfos(contactid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1534 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1535 |
def RefreshCoilModel(self, coil): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1536 |
coilid = coil.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1537 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1538 |
infos["name"] = coil.GetName() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1539 |
infos["type"] = coil.GetType() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1540 |
infos["x"], infos["y"] = coil.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1541 |
infos["width"], infos["height"] = coil.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1542 |
infos["connectors"] = coil.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1543 |
self.Controler.SetCurrentElementEditingCoilInfos(coilid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1544 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1545 |
def RefreshStepModel(self, step): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1546 |
stepid = step.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1547 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1548 |
infos["name"] = step.GetName() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1549 |
infos["initial"] = step.GetInitial() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1550 |
infos["x"], infos["y"] = step.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1551 |
infos["width"], infos["height"] = step.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1552 |
infos["connectors"] = step.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1553 |
self.Controler.SetCurrentElementEditingStepInfos(stepid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1554 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1555 |
def RefreshTransitionModel(self, transition): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1556 |
transitionid = transition.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1557 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1558 |
infos["type"] = transition.GetType() |
| 80 | 1559 |
infos["priority"] = transition.GetPriority() |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1560 |
infos["condition"] = transition.GetCondition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1561 |
infos["x"], infos["y"] = transition.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1562 |
infos["width"], infos["height"] = transition.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1563 |
infos["connectors"] = transition.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1564 |
self.Controler.SetCurrentElementEditingTransitionInfos(transitionid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1565 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1566 |
def RefreshDivergenceModel(self, divergence): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1567 |
divergenceid = divergence.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1568 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1569 |
infos["x"], infos["y"] = divergence.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1570 |
infos["width"], infos["height"] = divergence.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1571 |
infos["connectors"] = divergence.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1572 |
self.Controler.SetCurrentElementEditingDivergenceInfos(divergenceid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1573 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1574 |
def RefreshJumpModel(self, jump): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1575 |
jumpid = jump.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1576 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1577 |
infos["target"] = jump.GetTarget() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1578 |
infos["x"], infos["y"] = jump.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1579 |
infos["width"], infos["height"] = jump.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1580 |
infos["connector"] = jump.GetConnector() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1581 |
self.Controler.SetCurrentElementEditingJumpInfos(jumpid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1582 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1583 |
def RefreshActionBlockModel(self, actionblock): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1584 |
actionblockid = actionblock.GetId() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1585 |
infos = {}
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1586 |
infos["actions"] = actionblock.GetActions() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1587 |
infos["x"], infos["y"] = actionblock.GetPosition() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1588 |
infos["width"], infos["height"] = actionblock.GetSize() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1589 |
infos["connector"] = actionblock.GetConnector() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1590 |
self.Controler.SetCurrentElementEditingActionBlockInfos(actionblockid, infos) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1591 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1592 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1593 |
#------------------------------------------------------------------------------- |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1594 |
# Model delete functions |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1595 |
#------------------------------------------------------------------------------- |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1596 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1597 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1598 |
def DeleteBlock(self, block): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1599 |
elements = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1600 |
for output in block.GetConnectors()["outputs"]: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1601 |
for element in output.GetConnectedBlocks(): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1602 |
if element not in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1603 |
elements.append(element) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1604 |
block.Clean() |
| 42 | 1605 |
self.RemoveBlock(block) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1606 |
self.Controler.RemoveCurrentElementEditingInstance(block.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1607 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1608 |
element.RefreshModel() |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1609 |
wx.CallAfter(self.ParentWindow.RefreshEditor) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1610 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1611 |
def DeleteVariable(self, variable): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1612 |
connectors = variable.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1613 |
if connectors["output"]: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1614 |
elements = connectors["output"].GetConnectedBlocks() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1615 |
else: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1616 |
elements = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1617 |
variable.Clean() |
| 42 | 1618 |
self.RemoveBlock(variable) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1619 |
self.Controler.RemoveCurrentElementEditingInstance(variable.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1620 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1621 |
element.RefreshModel() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1622 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1623 |
def DeleteConnection(self, connection): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1624 |
if connection.GetType() == CONTINUATION: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1625 |
elements = connection.GetConnector().GetConnectedBlocks() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1626 |
else: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1627 |
elements = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1628 |
connection.Clean() |
| 42 | 1629 |
self.RemoveBlock(connection) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1630 |
self.Controler.RemoveCurrentElementEditingInstance(connection.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1631 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1632 |
element.RefreshModel() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1633 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1634 |
def DeleteComment(self, comment): |
| 42 | 1635 |
self.RemoveComment(comment) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1636 |
self.Controler.RemoveCurrentElementEditingInstance(comment.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1637 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1638 |
def DeleteWire(self, wire): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1639 |
if wire in self.Wires: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1640 |
connected = wire.GetConnected() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1641 |
wire.Clean() |
| 42 | 1642 |
self.RemoveWire(wire) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1643 |
for connector in connected: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1644 |
connector.RefreshParentBlock() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1645 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1646 |
def DeleteContact(self, contact): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1647 |
connectors = contact.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1648 |
elements = connectors["output"].GetConnectedBlocks() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1649 |
contact.Clean() |
| 42 | 1650 |
self.RemoveBlock(contact) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1651 |
self.Controler.RemoveCurrentElementEditingInstance(contact.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1652 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1653 |
element.RefreshModel() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1654 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1655 |
def DeleteCoil(self, coil): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1656 |
connectors = coil.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1657 |
elements = connectors["output"].GetConnectedBlocks() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1658 |
coil.Clean() |
| 42 | 1659 |
self.RemoveBlock(coil) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1660 |
self.Controler.RemoveCurrentElementEditingInstance(coil.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1661 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1662 |
element.RefreshModel() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1663 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1664 |
def DeletePowerRail(self, powerrail): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1665 |
elements = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1666 |
if powerrail.GetType() == LEFTRAIL: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1667 |
for connector in powerrail.GetConnectors(): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1668 |
for element in connector.GetConnectedBlocks(): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1669 |
if element not in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1670 |
elements.append(element) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1671 |
powerrrail.Clean() |
| 42 | 1672 |
self.RemoveBlock(powerrrail) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1673 |
self.Controler.RemoveCurrentElementEditingInstance(powerrrail.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1674 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1675 |
element.RefreshModel() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1676 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1677 |
def DeleteStep(self, step): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1678 |
elements = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1679 |
connectors = step.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1680 |
if connectors["output"]: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1681 |
for element in connectors["output"].GetConnectedBlocks(): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1682 |
if element not in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1683 |
elements.append(element) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1684 |
if connectors["action"]: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1685 |
for element in connectors["action"].GetConnectedBlocks(): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1686 |
if element not in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1687 |
elements.append(element) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1688 |
step.Clean() |
| 42 | 1689 |
self.RemoveBlock(step) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1690 |
self.Controler.RemoveCurrentElementEditingInstance(step.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1691 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1692 |
element.RefreshModel() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1693 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1694 |
def DeleteTransition(self, transition): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1695 |
elements = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1696 |
connectors = transition.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1697 |
if connectors["output"]: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1698 |
for element in connectors["output"].GetConnectedBlocks(): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1699 |
if element not in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1700 |
elements.append(element) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1701 |
transition.Clean() |
| 42 | 1702 |
self.RemoveBlock(transition) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1703 |
self.Controler.RemoveCurrentElementEditingInstance(transition.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1704 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1705 |
element.RefreshModel() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1706 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1707 |
def DeleteDivergence(self, divergence): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1708 |
elements = [] |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1709 |
connectors = divergence.GetConnectors() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1710 |
for output in connectors["outputs"]: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1711 |
for element in output.GetConnectedBlocks(): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1712 |
if element not in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1713 |
elements.append(element) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1714 |
divergence.Clean() |
| 42 | 1715 |
self.RemoveBlock(divergence) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1716 |
self.Controler.RemoveCurrentElementEditingInstance(divergence.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1717 |
for element in elements: |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1718 |
element.RefreshModel() |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1719 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1720 |
def DeleteJump(self, jump): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1721 |
jump.Clean() |
| 42 | 1722 |
self.RemoveBlock(jump) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1723 |
self.Controler.RemoveCurrentElementEditingInstance(jump.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1724 |
|
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1725 |
def DeleteActionBlock(self, actionblock): |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1726 |
actionblock.Clean() |
| 42 | 1727 |
self.RemoveBlock(actionblock) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1728 |
self.Controler.RemoveCurrentElementEditingInstance(actionblock.GetId()) |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1729 |
|
| 27 | 1730 |
|
| 0 | 1731 |
#------------------------------------------------------------------------------- |
1732 |
# Editing functions |
|
1733 |
#------------------------------------------------------------------------------- |
|
1734 |
||
1735 |
def Cut(self): |
|
1736 |
pass |
|
1737 |
||
1738 |
def Copy(self): |
|
1739 |
pass |
|
1740 |
||
1741 |
def Paste(self): |
|
1742 |
pass |
|
1743 |
||
1744 |
#------------------------------------------------------------------------------- |
|
1745 |
# Drawing functions |
|
1746 |
#------------------------------------------------------------------------------- |
|
1747 |
||
| 27 | 1748 |
def OnMoveWindow(self, event): |
| 80 | 1749 |
self.GetBestSize() |
| 42 | 1750 |
self.RefreshScrollBars() |
| 27 | 1751 |
event.Skip() |
1752 |
||
| 0 | 1753 |
def OnPaint(self, event): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1754 |
dc = self.GetLogicalDC(True) |
| 0 | 1755 |
dc.Clear() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1756 |
dc.SetPen(wx.Pen(wx.Colour(230, 230, 230))) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1757 |
dc.BeginDrawing() |
| 0 | 1758 |
if self.Scaling and self.DrawGrid: |
1759 |
width, height = dc.GetSize() |
|
1760 |
for i in xrange(1, width / self.Scaling[0] + 1): |
|
1761 |
dc.DrawLine(i * self.Scaling[0], 0, i * self.Scaling[0], height) |
|
1762 |
for i in xrange(1, height / self.Scaling[1] + 1): |
|
1763 |
dc.DrawLine(0, i * self.Scaling[1], width, i * self.Scaling[1]) |
|
| 42 | 1764 |
for comment in self.Comments: |
1765 |
if comment != self.SelectedElement: |
|
1766 |
comment.Draw(dc) |
|
| 0 | 1767 |
for wire in self.Wires: |
1768 |
if wire != self.SelectedElement: |
|
1769 |
wire.Draw(dc) |
|
| 42 | 1770 |
for block in self.Blocks: |
1771 |
if block != self.SelectedElement: |
|
1772 |
block.Draw(dc) |
|
| 0 | 1773 |
if self.SelectedElement: |
1774 |
self.SelectedElement.Draw(dc) |
|
| 27 | 1775 |
if self.rubberBand.IsShown(): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1776 |
self.rubberBand.Draw(dc) |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1777 |
dc.EndDrawing() |
| 27 | 1778 |
event.Skip() |
1779 |
||
1780 |