author | lbessard |
Tue, 29 Jan 2008 18:31:36 +0100 | |
changeset 163 | e4949f54c5d6 |
parent 162 | e746ff4aa8be |
child 165 | e464a4e4e06d |
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 * |
|
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
28 |
from PLCControler import ITEM_POU |
27 | 29 |
|
30 |
from Dialogs import * |
|
31 |
||
32 |
SCROLLBAR_UNIT = 10 |
|
33 |
WINDOW_BORDER = 10 |
|
34 |
SCROLL_ZONE = 10 |
|
0 | 35 |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
36 |
def AppendMenu(parent, help, id, kind, text): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
37 |
if wx.VERSION >= (2, 6, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
38 |
parent.Append(help=help, id=id, kind=kind, text=text) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
39 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
40 |
parent.Append(helpString=help, id=id, kind=kind, item=text) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
41 |
|
157 | 42 |
if wx.Platform == '__WXMSW__': |
43 |
faces = { 'times': 'Times New Roman', |
|
44 |
'mono' : 'Courier New', |
|
45 |
'helv' : 'Arial', |
|
46 |
'other': 'Comic Sans MS', |
|
158 | 47 |
'size' : 20, |
157 | 48 |
} |
49 |
else: |
|
50 |
faces = { 'times': 'Times', |
|
51 |
'mono' : 'Courier', |
|
52 |
'helv' : 'Helvetica', |
|
53 |
'other': 'new century schoolbook', |
|
158 | 54 |
'size' : 20, |
157 | 55 |
} |
56 |
||
0 | 57 |
#------------------------------------------------------------------------------- |
58 |
# Graphic elements Viewer base class |
|
59 |
#------------------------------------------------------------------------------- |
|
60 |
||
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
61 |
# ID Constants for alignment menu items |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
62 |
[ID_VIEWERALIGNMENTMENUITEMS0, ID_VIEWERALIGNMENTMENUITEMS1, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
63 |
ID_VIEWERALIGNMENTMENUITEMS2, ID_VIEWERALIGNMENTMENUITEMS4, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
64 |
ID_VIEWERALIGNMENTMENUITEMS5, ID_VIEWERALIGNMENTMENUITEMS6, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
65 |
] = [wx.NewId() for _init_coll_AlignmentMenu_Items in range(6)] |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
66 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
67 |
# ID Constants for contextual menu items |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
68 |
[ID_VIEWERCONTEXTUALMENUITEMS0, ID_VIEWERCONTEXTUALMENUITEMS1, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
69 |
ID_VIEWERCONTEXTUALMENUITEMS2, ID_VIEWERCONTEXTUALMENUITEMS3, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
70 |
ID_VIEWERCONTEXTUALMENUITEMS5, ID_VIEWERCONTEXTUALMENUITEMS6, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
71 |
ID_VIEWERCONTEXTUALMENUITEMS8, ID_VIEWERCONTEXTUALMENUITEMS9, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
72 |
ID_VIEWERCONTEXTUALMENUITEMS11, ID_VIEWERCONTEXTUALMENUITEMS12, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
73 |
ID_VIEWERCONTEXTUALMENUITEMS14, ID_VIEWERCONTEXTUALMENUITEMS16, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
74 |
ID_VIEWERCONTEXTUALMENUITEMS17, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
75 |
] = [wx.NewId() for _init_coll_ContextualMenu_Items in range(13)] |
0 | 76 |
|
77 |
||
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
78 |
class ViewerDropTarget(wx.TextDropTarget): |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
79 |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
80 |
def __init__(self, parent): |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
81 |
wx.TextDropTarget.__init__(self) |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
82 |
self.ParentWindow = parent |
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
83 |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
84 |
def OnDropText(self, x, y, data): |
108 | 85 |
x, y = self.ParentWindow.CalcUnscrolledPosition(x, y) |
145 | 86 |
scaling = self.ParentWindow.Scaling |
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
87 |
values = eval(data) |
97 | 88 |
if values[1] == "program": |
89 |
message = wx.MessageDialog(self.ParentWindow, "Programs can't be used by other POUs!", "Error", wx.OK|wx.ICON_ERROR) |
|
90 |
message.ShowModal() |
|
91 |
message.Destroy() |
|
92 |
elif values[1] in ["function", "functionBlock", "program"]: |
|
122
e6faee0c271b
Adding support for Project Tree selected item following current item edited.
lbessard
parents:
121
diff
changeset
|
93 |
name, type = self.ParentWindow.Controler.GetEditedElementType(self.ParentWindow.GetTagName()) |
97 | 94 |
if name == values[0]: |
95 |
message = wx.MessageDialog(self.ParentWindow, "\"%s\" can't use itself!"%name, "Error", wx.OK|wx.ICON_ERROR) |
|
96 |
message.ShowModal() |
|
97 |
message.Destroy() |
|
98 |
elif type == "function" and values[1] != "function": |
|
99 |
message = wx.MessageDialog(self.ParentWindow, "Function Blocks can't be used by Functions!", "Error", wx.OK|wx.ICON_ERROR) |
|
100 |
message.ShowModal() |
|
101 |
message.Destroy() |
|
102 |
elif self.ParentWindow.Controler.PouIsUsedBy(name, values[0]): |
|
103 |
message = wx.MessageDialog(self.ParentWindow, "\"%s\" is already used by \"%s\"!"%(name, values[0]), "Error", wx.OK|wx.ICON_ERROR) |
|
104 |
message.ShowModal() |
|
105 |
message.Destroy() |
|
106 |
else: |
|
106
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
107 |
blockname = values[2] |
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
108 |
if values[1] != "function" and blockname == "": |
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
109 |
dialog = wx.TextEntryDialog(self.ParentWindow, "Block name", "Please enter a block name", "", wx.OK|wx.CANCEL|wx.CENTRE) |
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
110 |
if dialog.ShowModal(): |
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
111 |
blockname = dialog.GetValue() |
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
112 |
dialog.Destroy() |
97 | 113 |
id = self.ParentWindow.GetNewId() |
106
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
114 |
block = FBD_Block(self.ParentWindow, values[0], blockname, id) |
145 | 115 |
width, height = block.GetMinSize() |
116 |
if scaling is not None: |
|
117 |
x = round(float(x) / float(scaling[0])) * scaling[0] |
|
118 |
y = round(float(y) / float(scaling[1])) * scaling[1] |
|
119 |
width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0] |
|
120 |
height = round(float(height) / float(scaling[1]) + 0.5) * scaling[1] |
|
97 | 121 |
block.SetPosition(x, y) |
122 |
block.SetSize(width, height) |
|
123 |
self.ParentWindow.AddBlock(block) |
|
122
e6faee0c271b
Adding support for Project Tree selected item following current item edited.
lbessard
parents:
121
diff
changeset
|
124 |
self.ParentWindow.Controler.AddEditedElementBlock(self.ParentWindow.GetTagName(), id, values[0], blockname) |
97 | 125 |
self.ParentWindow.RefreshBlockModel(block) |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
126 |
self.ParentWindow.RefreshBuffer() |
97 | 127 |
self.ParentWindow.RefreshScrollBars() |
145 | 128 |
self.ParentWindow.ParentWindow.RefreshVariablePanel(self.ParentWindow.GetTagName()) |
155 | 129 |
self.ParentWindow.Refresh(False) |
53 | 130 |
elif values[1] != "location": |
121 | 131 |
if values[3] == self.ParentWindow.GetTagName(): |
132 |
id = self.ParentWindow.GetNewId() |
|
133 |
if values[1] == "Output": |
|
134 |
var_type = OUTPUT |
|
135 |
elif values[1] == "InOut": |
|
136 |
var_type = INPUT |
|
137 |
else: |
|
138 |
var_type = INPUT |
|
139 |
variable = FBD_Variable(self.ParentWindow, var_type, values[0], values[2], id) |
|
145 | 140 |
width, height = variable.GetMinSize() |
141 |
if scaling is not None: |
|
142 |
x = round(float(x) / float(scaling[0])) * scaling[0] |
|
143 |
y = round(float(y) / float(scaling[1])) * scaling[1] |
|
144 |
width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0] |
|
145 |
height = round(float(height) / float(scaling[1]) + 0.5) * scaling[1] |
|
121 | 146 |
variable.SetPosition(x, y) |
147 |
variable.SetSize(width, height) |
|
148 |
self.ParentWindow.AddBlock(variable) |
|
145 | 149 |
self.ParentWindow.Controler.AddEditedElementVariable(self.ParentWindow.GetTagName(), id, var_type) |
121 | 150 |
self.ParentWindow.RefreshVariableModel(variable) |
151 |
self.ParentWindow.RefreshBuffer() |
|
152 |
self.ParentWindow.RefreshScrollBars() |
|
155 | 153 |
self.ParentWindow.Refresh(False) |
121 | 154 |
else: |
155 |
message = wx.MessageDialog(self.ParentWindow, "Variable don't belong to this POU!", "Error", wx.OK|wx.ICON_ERROR) |
|
156 |
message.ShowModal() |
|
157 |
message.Destroy() |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
158 |
|
121 | 159 |
if wx.VERSION >= (2, 8, 0): |
160 |
import wx.aui |
|
161 |
||
162 |
class MDIViewer(wx.aui.AuiMDIChildFrame): |
|
163 |
def __init__(self, parent, tagname, window, controler): |
|
164 |
wx.aui.AuiMDIChildFrame.__init__(self, parent, -1, title = "") |
|
165 |
||
166 |
sizer = wx.BoxSizer(wx.HORIZONTAL) |
|
167 |
||
168 |
self.Viewer = Viewer(self, tagname, window, controler) |
|
169 |
||
170 |
sizer.AddWindow(self.Viewer, 1, border=0, flag=wx.GROW) |
|
171 |
||
172 |
self.SetSizer(sizer) |
|
173 |
||
174 |
def GetViewer(self): |
|
175 |
return self.Viewer |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
176 |
|
0 | 177 |
""" |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
178 |
Class that implements a Viewer based on a wx.ScrolledWindow for drawing and |
0 | 179 |
manipulating graphic elements |
180 |
""" |
|
181 |
||
182 |
class Viewer(wx.ScrolledWindow): |
|
183 |
||
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
184 |
if wx.VERSION < (2, 6, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
185 |
def Bind(self, event, function, id = None): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
186 |
if id is not None: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
187 |
event(self, id, function) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
188 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
189 |
event(self, function) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
190 |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
191 |
# Create Alignment Menu items |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
192 |
def _init_coll_AlignmentMenu_Items(self, parent): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
193 |
# Create menu items |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
194 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS0, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
195 |
kind=wx.ITEM_NORMAL, text=u'Left') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
196 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS1, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
197 |
kind=wx.ITEM_NORMAL, text=u'Center') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
198 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS2, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
199 |
kind=wx.ITEM_NORMAL, text=u'Right') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
200 |
parent.AppendSeparator() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
201 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS4, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
202 |
kind=wx.ITEM_NORMAL, text=u'Top') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
203 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS5, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
204 |
kind=wx.ITEM_NORMAL, text=u'Middle') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
205 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS6, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
206 |
kind=wx.ITEM_NORMAL, text=u'Bottom') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
207 |
# Link menu event to corresponding called functions |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
208 |
self.Bind(wx.EVT_MENU, self.OnAlignLeftMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
209 |
id=ID_VIEWERALIGNMENTMENUITEMS0) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
210 |
self.Bind(wx.EVT_MENU, self.OnAlignCenterMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
211 |
id=ID_VIEWERALIGNMENTMENUITEMS1) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
212 |
self.Bind(wx.EVT_MENU, self.OnAlignRightMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
213 |
id=ID_VIEWERALIGNMENTMENUITEMS2) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
214 |
self.Bind(wx.EVT_MENU, self.OnAlignTopMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
215 |
id=ID_VIEWERALIGNMENTMENUITEMS4) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
216 |
self.Bind(wx.EVT_MENU, self.OnAlignMiddleMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
217 |
id=ID_VIEWERALIGNMENTMENUITEMS5) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
218 |
self.Bind(wx.EVT_MENU, self.OnAlignBottomMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
219 |
id=ID_VIEWERALIGNMENTMENUITEMS6) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
220 |
|
0 | 221 |
# Create Contextual Menu items |
222 |
def _init_coll_ContextualMenu_Items(self, parent): |
|
223 |
# Create menu items |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
224 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS0, |
0 | 225 |
kind=wx.ITEM_RADIO, text=u'No Modifier') |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
226 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS1, |
0 | 227 |
kind=wx.ITEM_RADIO, text=u'Negated') |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
228 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS2, |
0 | 229 |
kind=wx.ITEM_RADIO, text=u'Rising Edge') |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
230 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS3, |
0 | 231 |
kind=wx.ITEM_RADIO, text=u'Falling Edge') |
232 |
parent.AppendSeparator() |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
233 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS5, |
0 | 234 |
kind=wx.ITEM_NORMAL, text=u'Add Wire Segment') |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
235 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS6, |
0 | 236 |
kind=wx.ITEM_NORMAL, text=u'Delete Wire Segment') |
237 |
parent.AppendSeparator() |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
238 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS8, |
0 | 239 |
kind=wx.ITEM_NORMAL, text=u'Add Divergence Branch') |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
240 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS9, |
0 | 241 |
kind=wx.ITEM_NORMAL, text=u'Delete Divergence Branch') |
242 |
parent.AppendSeparator() |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
243 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS11, |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
244 |
kind=wx.ITEM_NORMAL, text=u'Clear Execution Order') |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
245 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS12, |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
246 |
kind=wx.ITEM_NORMAL, text=u'Reset Execution Order') |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
247 |
parent.AppendSeparator() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
248 |
parent.AppendMenu(ID_VIEWERCONTEXTUALMENUITEMS14, "Alignment", self.AlignmentMenu) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
249 |
parent.AppendSeparator() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
250 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS16, |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
251 |
kind=wx.ITEM_NORMAL, text=u'Edit Block') |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
252 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS17, |
0 | 253 |
kind=wx.ITEM_NORMAL, text=u'Delete') |
254 |
# Link menu event to corresponding called functions |
|
255 |
self.Bind(wx.EVT_MENU, self.OnNoModifierMenu, |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
256 |
id=ID_VIEWERCONTEXTUALMENUITEMS0) |
0 | 257 |
self.Bind(wx.EVT_MENU, self.OnNegatedMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
258 |
id=ID_VIEWERCONTEXTUALMENUITEMS1) |
0 | 259 |
self.Bind(wx.EVT_MENU, self.OnRisingEdgeMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
260 |
id=ID_VIEWERCONTEXTUALMENUITEMS2) |
0 | 261 |
self.Bind(wx.EVT_MENU, self.OnFallingEdgeMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
262 |
id=ID_VIEWERCONTEXTUALMENUITEMS3) |
0 | 263 |
self.Bind(wx.EVT_MENU, self.OnAddSegmentMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
264 |
id=ID_VIEWERCONTEXTUALMENUITEMS5) |
0 | 265 |
self.Bind(wx.EVT_MENU, self.OnDeleteSegmentMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
266 |
id=ID_VIEWERCONTEXTUALMENUITEMS6) |
0 | 267 |
self.Bind(wx.EVT_MENU, self.OnAddBranchMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
268 |
id=ID_VIEWERCONTEXTUALMENUITEMS8) |
0 | 269 |
self.Bind(wx.EVT_MENU, self.OnDeleteBranchMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
270 |
id=ID_VIEWERCONTEXTUALMENUITEMS9) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
271 |
self.Bind(wx.EVT_MENU, self.OnClearExecutionOrderMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
272 |
id=ID_VIEWERCONTEXTUALMENUITEMS11) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
273 |
self.Bind(wx.EVT_MENU, self.OnResetExecutionOrderMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
274 |
id=ID_VIEWERCONTEXTUALMENUITEMS12) |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
275 |
self.Bind(wx.EVT_MENU, self.OnEditBlockMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
276 |
id=ID_VIEWERCONTEXTUALMENUITEMS16) |
0 | 277 |
self.Bind(wx.EVT_MENU, self.OnDeleteMenu, |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
278 |
id=ID_VIEWERCONTEXTUALMENUITEMS17) |
0 | 279 |
|
280 |
# Create and initialize Contextual Menu |
|
281 |
def _init_menus(self): |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
282 |
self.AlignmentMenu = wx.Menu(title='') |
0 | 283 |
self.ContextualMenu = wx.Menu(title='') |
284 |
||
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
285 |
self._init_coll_AlignmentMenu_Items(self.AlignmentMenu) |
0 | 286 |
self._init_coll_ContextualMenu_Items(self.ContextualMenu) |
287 |
||
288 |
# Create a new Viewer |
|
121 | 289 |
def __init__(self, parent, tagname, window, controler): |
80 | 290 |
wx.ScrolledWindow.__init__(self, parent, pos=wx.Point(0, 0), size=wx.Size(0, 0), |
291 |
style=wx.SUNKEN_BORDER | wx.HSCROLL | wx.VSCROLL) |
|
0 | 292 |
self._init_menus() |
293 |
# Adding a rubberband to Viewer |
|
294 |
self.rubberBand = RubberBand(drawingSurface=self) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
295 |
self.SetBackgroundColour(wx.Colour(255,255,255)) |
0 | 296 |
self.ResetView() |
297 |
self.Scaling = None |
|
298 |
self.DrawGrid = True |
|
145 | 299 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
300 |
self.DrawingWire = False |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
301 |
self.current_id = 0 |
121 | 302 |
self.TagName = tagname |
0 | 303 |
|
42 | 304 |
# Initialize Block, Wire and Comment numbers |
305 |
self.block_id = self.wire_id = self.comment_id = 0 |
|
306 |
||
0 | 307 |
# Initialize Viewer mode to Selection mode |
308 |
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
|
309 |
self.SavedMode = False |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
310 |
self.CurrentLanguage = "FBD" |
0 | 311 |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
312 |
self.ParentWindow = window |
0 | 313 |
self.Controler = controler |
314 |
||
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
315 |
self.SetDropTarget(ViewerDropTarget(self)) |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
316 |
|
156 | 317 |
dc = wx.ClientDC(self) |
157 | 318 |
self.Font = wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.NORMAL, faceName = faces["mono"]) |
156 | 319 |
dc.SetFont(self.Font) |
158 | 320 |
width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ") |
321 |
while width > 260: |
|
157 | 322 |
faces["size"] -= 1 |
323 |
self.Font = wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.NORMAL, faceName = faces["mono"]) |
|
156 | 324 |
dc.SetFont(self.Font) |
158 | 325 |
width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ") |
156 | 326 |
|
0 | 327 |
# Link Viewer event to corresponding methods |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
328 |
self.Bind(wx.EVT_PAINT, self.OnPaint) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
329 |
self.Bind(wx.EVT_LEFT_DOWN, self.OnViewerLeftDown) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
330 |
self.Bind(wx.EVT_LEFT_UP, self.OnViewerLeftUp) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
331 |
self.Bind(wx.EVT_LEFT_DCLICK, self.OnViewerLeftDClick) |
145 | 332 |
self.Bind(wx.EVT_RIGHT_DOWN, self.OnViewerRightDown) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
333 |
self.Bind(wx.EVT_RIGHT_UP, self.OnViewerRightUp) |
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
334 |
self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeaveViewer) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
335 |
self.Bind(wx.EVT_MOTION, self.OnViewerMotion) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
336 |
self.Bind(wx.EVT_CHAR, self.OnChar) |
144 | 337 |
self.Bind(wx.EVT_SCROLLWIN, self.OnMoveWindow) |
338 |
self.Bind(wx.EVT_SIZE, self.OnMoveWindow) |
|
339 |
||
340 |
def GetScrolledRect(self, rect): |
|
341 |
rect.x, rect.y = self.CalcScrolledPosition(rect.x, rect.y) |
|
342 |
return rect |
|
0 | 343 |
|
145 | 344 |
def GetScaling(self): |
345 |
return self.Scaling |
|
346 |
||
121 | 347 |
def SetTagName(self, tagname): |
348 |
self.TagName = tagname |
|
349 |
||
350 |
def GetTagName(self): |
|
351 |
return self.TagName |
|
352 |
||
353 |
def IsViewing(self, tagname): |
|
354 |
return self.TagName == tagname |
|
355 |
||
0 | 356 |
# Returns a new id |
357 |
def GetNewId(self): |
|
358 |
self.current_id += 1 |
|
359 |
return self.current_id |
|
360 |
||
361 |
# Destructor |
|
362 |
def __del__(self): |
|
363 |
self.ResetView() |
|
364 |
||
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
365 |
def GetLogicalDC(self, buffered=False): |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
366 |
if buffered: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
367 |
dc = wx.BufferedPaintDC(self) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
368 |
else: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
369 |
dc = wx.ClientDC(self) |
156 | 370 |
dc.SetFont(self.Font) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
371 |
if wx.VERSION >= (2, 6, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
372 |
self.DoPrepareDC(dc) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
373 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
374 |
self.PrepareDC(dc) |
27 | 375 |
return dc |
376 |
||
0 | 377 |
#------------------------------------------------------------------------------- |
42 | 378 |
# Element management functions |
379 |
#------------------------------------------------------------------------------- |
|
380 |
||
381 |
def AddBlock(self, block): |
|
382 |
self.block_id += 1 |
|
383 |
self.Blocks[block] = self.block_id |
|
384 |
||
385 |
def AddWire(self, wire): |
|
386 |
self.wire_id += 1 |
|
387 |
self.Wires[wire] = self.wire_id |
|
388 |
||
389 |
def AddComment(self, comment): |
|
390 |
self.comment_id += 1 |
|
391 |
self.Comments[comment] = self.comment_id |
|
392 |
||
393 |
def IsBlock(self, block): |
|
394 |
return self.Blocks.get(block, False) |
|
395 |
||
396 |
def IsWire(self, wire): |
|
397 |
return self.Wires.get(wire, False) |
|
398 |
||
399 |
def IsComment(self, comment): |
|
400 |
return self.Comments.get(comment, False) |
|
401 |
||
402 |
def RemoveBlock(self, block): |
|
403 |
self.Blocks.pop(block) |
|
404 |
||
405 |
def RemoveWire(self, wire): |
|
406 |
self.Wires.pop(wire) |
|
407 |
||
408 |
def RemoveComment(self, comment): |
|
409 |
self.Comments.pop(comment) |
|
410 |
||
411 |
def GetElements(self, sort_blocks=False, sort_wires=False, sort_comments=False): |
|
412 |
blocks = self.Blocks.keys() |
|
413 |
wires = self.Wires.keys() |
|
414 |
comments = self.Comments.keys() |
|
415 |
if sort_blocks: |
|
416 |
blocks.sort(lambda x,y:self.Blocks[x].__cmp__(self.Blocks[y])) |
|
417 |
if sort_wires: |
|
418 |
wires.sort(lambda x,y:self.Wires[x].__cmp__(self.Wires[y])) |
|
419 |
if sort_comments: |
|
420 |
comments.sort(lambda x,y:self.Comments[x].__cmp__(self.Comments[y])) |
|
421 |
return blocks + wires + comments |
|
422 |
||
423 |
#------------------------------------------------------------------------------- |
|
0 | 424 |
# Reset functions |
425 |
#------------------------------------------------------------------------------- |
|
426 |
||
427 |
# Resets Viewer lists |
|
428 |
def ResetView(self): |
|
42 | 429 |
self.Blocks = {} |
430 |
self.Wires = {} |
|
431 |
self.Comments = {} |
|
0 | 432 |
self.SelectedElement = None |
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
433 |
self.HighlightedElement = None |
0 | 434 |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
435 |
# Remove all elements |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
436 |
def CleanView(self): |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
437 |
for block in self.Blocks.keys(): |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
438 |
block.Clean() |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
439 |
self.ResetView() |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
440 |
|
0 | 441 |
# Changes Viewer mode |
442 |
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
|
443 |
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
|
444 |
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
|
445 |
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
|
446 |
else: |
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
447 |
self.SavedMode = True |
0 | 448 |
# 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
|
449 |
if self.Mode != MODE_SELECTION and self.SelectedElement: |
0 | 450 |
self.SelectedElement.SetSelected(False) |
451 |
self.SelectedElement = None |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
452 |
|
27 | 453 |
# Return current drawing mode |
454 |
def GetDrawingMode(self): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
455 |
return self.ParentWindow.GetDrawingMode() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
456 |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
457 |
# Buffer the last model state |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
458 |
def RefreshBuffer(self): |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
459 |
self.Controler.BufferProject() |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
460 |
self.ParentWindow.RefreshTitle() |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
461 |
self.ParentWindow.RefreshEditMenu() |
27 | 462 |
|
145 | 463 |
# Refresh the current scaling |
464 |
def RefreshScaling(self, refresh=True): |
|
465 |
properties = self.Controler.GetProjectProperties() |
|
466 |
scaling = properties["scaling"][self.CurrentLanguage] |
|
467 |
if scaling != (0, 0): |
|
468 |
self.Scaling = scaling |
|
469 |
if self.DrawGrid: |
|
470 |
bitmap = wx.EmptyBitmap(*scaling) |
|
471 |
dc = wx.MemoryDC(bitmap) |
|
472 |
dc.SetBackground(wx.Brush(self.GetBackgroundColour())) |
|
473 |
dc.Clear() |
|
474 |
dc.SetPen(wx.Pen(wx.Colour(180, 180, 180))) |
|
475 |
dc.DrawPoint(0, 0) |
|
476 |
self.GridBrush = wx.BrushFromBitmap(bitmap) |
|
477 |
else: |
|
478 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
|
479 |
else: |
|
480 |
self.Scaling = None |
|
481 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
|
482 |
if refresh: |
|
155 | 483 |
self.Refresh(False) |
145 | 484 |
|
485 |
||
0 | 486 |
#------------------------------------------------------------------------------- |
487 |
# Refresh functions |
|
488 |
#------------------------------------------------------------------------------- |
|
489 |
||
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
490 |
def ResetBuffer(self): |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
491 |
pass |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
492 |
|
0 | 493 |
# Refresh Viewer elements |
494 |
def RefreshView(self): |
|
495 |
self.current_id = 0 |
|
496 |
# Start by reseting Viewer |
|
497 |
self.ResetView() |
|
498 |
instance = True |
|
499 |
# List of ids of already loaded blocks |
|
500 |
ids = [] |
|
501 |
# Load Blocks until they are all loaded |
|
502 |
while instance: |
|
121 | 503 |
instance = self.Controler.GetEditedElementInstanceInfos(self.TagName, exclude=ids) |
0 | 504 |
if instance: |
505 |
self.loadInstance(instance, ids) |
|
42 | 506 |
self.RefreshScrollBars() |
121 | 507 |
|
508 |
to_delete = [] |
|
509 |
for wire in self.Wires: |
|
510 |
if not wire.IsConnectedCompatible(): |
|
511 |
to_delete.append(wire) |
|
512 |
for wire in to_delete: |
|
513 |
wire.Delete() |
|
514 |
||
155 | 515 |
self.Refresh(False) |
0 | 516 |
|
42 | 517 |
def RefreshScrollBars(self): |
27 | 518 |
xstart, ystart = self.GetViewStart() |
519 |
window_size = self.GetClientSize() |
|
520 |
maxx = maxy = 0 |
|
42 | 521 |
for element in self.GetElements(): |
144 | 522 |
bbox = element.GetBoundingBox() |
523 |
maxx = max(maxx, bbox.x + bbox.width) |
|
524 |
maxy = max(maxy, bbox.y + bbox.height) |
|
27 | 525 |
maxx = max(maxx + WINDOW_BORDER, xstart * SCROLLBAR_UNIT + window_size[0]) |
526 |
maxy = max(maxy + WINDOW_BORDER, ystart * SCROLLBAR_UNIT + window_size[1]) |
|
527 |
if self.rubberBand.IsShown(): |
|
528 |
extent = self.rubberBand.GetCurrentExtent() |
|
529 |
maxx = max(maxx, extent.x + extent.width) |
|
530 |
maxy = max(maxy, extent.y + extent.height) |
|
531 |
self.SetScrollbars(SCROLLBAR_UNIT, SCROLLBAR_UNIT, |
|
95 | 532 |
maxx / SCROLLBAR_UNIT, maxy / SCROLLBAR_UNIT, xstart, ystart, True) |
533 |
||
0 | 534 |
# Load instance from given informations |
535 |
def loadInstance(self, instance, ids): |
|
536 |
ids.append(instance["id"]) |
|
537 |
self.current_id = max(self.current_id, instance["id"]) |
|
538 |
if instance["type"] == "input": |
|
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
539 |
variable = FBD_Variable(self, INPUT, instance["name"], instance["value_type"], instance["id"], instance["executionOrder"]) |
0 | 540 |
variable.SetPosition(instance["x"], instance["y"]) |
541 |
variable.SetSize(instance["width"], instance["height"]) |
|
42 | 542 |
self.AddBlock(variable) |
0 | 543 |
connectors = variable.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
544 |
connectors["output"].SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 545 |
if instance["connector"]["negated"]: |
546 |
connectors["output"].SetNegated(True) |
|
547 |
if instance["connector"]["edge"]: |
|
548 |
connectors["output"].SetEdge(instance["connector"]["edge"]) |
|
549 |
elif instance["type"] == "output": |
|
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
550 |
variable = FBD_Variable(self, OUTPUT, instance["name"], instance["value_type"], instance["id"], instance["executionOrder"]) |
0 | 551 |
variable.SetPosition(instance["x"], instance["y"]) |
552 |
variable.SetSize(instance["width"], instance["height"]) |
|
42 | 553 |
self.AddBlock(variable) |
0 | 554 |
connectors = variable.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
555 |
connectors["input"].SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 556 |
if instance["connector"]["negated"]: |
557 |
connectors["input"].SetNegated(True) |
|
558 |
if instance["connector"]["edge"]: |
|
559 |
connectors["input"].SetEdge(instance["connector"]["edge"]) |
|
560 |
self.CreateWires(connectors["input"], instance["connector"]["links"], ids) |
|
561 |
elif instance["type"] == "inout": |
|
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
562 |
variable = FBD_Variable(self, INOUT, instance["name"], instance["value_type"], instance["id"], instance["executionOrder"]) |
0 | 563 |
variable.SetPosition(instance["x"], instance["y"]) |
564 |
variable.SetSize(instance["width"], instance["height"]) |
|
42 | 565 |
self.AddBlock(variable) |
0 | 566 |
connectors = variable.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
567 |
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
|
568 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 569 |
if instance["connectors"]["output"]["negated"]: |
570 |
connectors["output"].SetNegated(True) |
|
571 |
if instance["connectors"]["output"]["edge"]: |
|
572 |
connectors["output"].SetEdge(instance["connectors"]["output"]["edge"]) |
|
573 |
if instance["connectors"]["input"]["negated"]: |
|
574 |
connectors["input"].SetNegated(True) |
|
575 |
if instance["connectors"]["input"]["edge"]: |
|
576 |
connectors["input"].SetEdge(instance["connectors"]["input"]["edge"]) |
|
577 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
|
578 |
elif instance["type"] == "continuation": |
|
579 |
connection = FBD_Connector(self, CONTINUATION, instance["name"], instance["id"]) |
|
580 |
connection.SetPosition(instance["x"], instance["y"]) |
|
581 |
connection.SetSize(instance["width"], instance["height"]) |
|
42 | 582 |
self.AddBlock(connection) |
0 | 583 |
connector = connection.GetConnector() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
584 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 585 |
elif instance["type"] == "connection": |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
586 |
connection = FBD_Connector(self, CONNECTOR, instance["name"], instance["id"]) |
0 | 587 |
connection.SetPosition(instance["x"], instance["y"]) |
588 |
connection.SetSize(instance["width"], instance["height"]) |
|
42 | 589 |
self.AddBlock(connection) |
0 | 590 |
connector = connection.GetConnector() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
591 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 592 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
593 |
elif instance["type"] == "comment": |
|
594 |
comment = Comment(self, instance["content"], instance["id"]) |
|
595 |
comment.SetPosition(instance["x"], instance["y"]) |
|
596 |
comment.SetSize(instance["width"], instance["height"]) |
|
42 | 597 |
self.AddComment(comment) |
0 | 598 |
elif instance["type"] == "leftPowerRail": |
599 |
leftpowerrail = LD_PowerRail(self, LEFTRAIL, instance["id"], [True for i in range(len(instance["connectors"]))]) |
|
600 |
leftpowerrail.SetPosition(instance["x"], instance["y"]) |
|
80 | 601 |
leftpowerrail.SetSize(instance["width"], instance["height"]) |
42 | 602 |
self.AddBlock(leftpowerrail) |
0 | 603 |
connectors = leftpowerrail.GetConnectors() |
604 |
for i, connector in enumerate(instance["connectors"]): |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
605 |
connectors[i].SetPosition(wx.Point(*connector["position"])) |
0 | 606 |
elif instance["type"] == "rightPowerRail": |
607 |
rightpowerrail = LD_PowerRail(self, RIGHTRAIL, instance["id"], [True for i in range(len(instance["connectors"]))]) |
|
608 |
rightpowerrail.SetPosition(instance["x"], instance["y"]) |
|
80 | 609 |
rightpowerrail.SetSize(instance["width"], instance["height"]) |
42 | 610 |
self.AddBlock(rightpowerrail) |
0 | 611 |
connectors = rightpowerrail.GetConnectors() |
612 |
for i, connector in enumerate(instance["connectors"]): |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
613 |
connectors[i].SetPosition(wx.Point(*connector["position"])) |
0 | 614 |
self.CreateWires(connectors[i], connector["links"], ids) |
615 |
elif instance["type"] == "contact": |
|
616 |
if instance["negated"]: |
|
617 |
negated = instance["negated"] |
|
618 |
else: |
|
619 |
negated = False |
|
620 |
if instance["edge"]: |
|
621 |
edge = instance["edge"] |
|
622 |
else: |
|
623 |
edge = "none" |
|
624 |
if negated and edge == "none": |
|
625 |
contact_type = CONTACT_REVERSE |
|
626 |
elif not negated and edge == "rising": |
|
627 |
contact_type = CONTACT_RISING |
|
628 |
elif not negated and edge == "falling": |
|
629 |
contact_type = CONTACT_FALLING |
|
630 |
else: |
|
631 |
contact_type = CONTACT_NORMAL |
|
632 |
contact = LD_Contact(self, contact_type, instance["name"], instance["id"]) |
|
633 |
contact.SetPosition(instance["x"], instance["y"]) |
|
145 | 634 |
contact.SetSize(instance["width"], instance["height"]) |
42 | 635 |
self.AddBlock(contact) |
0 | 636 |
connectors = contact.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
637 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 638 |
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
|
639 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
0 | 640 |
elif instance["type"] == "coil": |
641 |
if instance["negated"]: |
|
642 |
negated = instance["negated"] |
|
643 |
else: |
|
644 |
negated = False |
|
645 |
if instance["storage"]: |
|
646 |
storage = instance["storage"] |
|
647 |
else: |
|
648 |
storage = "none" |
|
649 |
if negated and storage == "none": |
|
650 |
coil_type = COIL_REVERSE |
|
651 |
elif not negated and storage == "set": |
|
652 |
coil_type = COIL_SET |
|
653 |
elif not negated and storage == "reset": |
|
654 |
coil_type = COIL_RESET |
|
655 |
else: |
|
656 |
coil_type = COIL_NORMAL |
|
657 |
coil = LD_Coil(self, coil_type, instance["name"], instance["id"]) |
|
658 |
coil.SetPosition(instance["x"], instance["y"]) |
|
145 | 659 |
coil.SetSize(instance["width"], instance["height"]) |
42 | 660 |
self.AddBlock(coil) |
0 | 661 |
connectors = coil.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
662 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 663 |
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
|
664 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
0 | 665 |
elif instance["type"] == "step": |
666 |
if instance["initial"]: |
|
667 |
initial = instance["initial"] |
|
668 |
else: |
|
669 |
initial = False |
|
670 |
step = SFC_Step(self, instance["name"], initial, instance["id"]) |
|
671 |
step.SetPosition(instance["x"], instance["y"]) |
|
672 |
step.SetSize(instance["width"], instance["height"]) |
|
42 | 673 |
self.AddBlock(step) |
0 | 674 |
if "output" in instance["connectors"]: |
675 |
step.AddOutput() |
|
676 |
if "action" in instance["connectors"]: |
|
677 |
step.AddAction() |
|
678 |
connectors = step.GetConnectors() |
|
679 |
if connectors["input"]: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
680 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 681 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
682 |
if connectors["output"]: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
683 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
0 | 684 |
if connectors["action"]: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
685 |
connectors["action"].SetPosition(wx.Point(*instance["connectors"]["action"]["position"])) |
0 | 686 |
elif instance["type"] == "transition": |
80 | 687 |
transition = SFC_Transition(self, instance["condition_type"], instance["condition"], instance["priority"], instance["id"]) |
0 | 688 |
transition.SetPosition(instance["x"], instance["y"]) |
145 | 689 |
transition.SetSize(instance["width"], instance["height"]) |
42 | 690 |
self.AddBlock(transition) |
0 | 691 |
connectors = transition.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
692 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 693 |
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
|
694 |
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
|
695 |
if instance["condition_type"] == "connection": |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
696 |
self.CreateWires(connectors["connection"], instance["connectors"]["connection"]["links"], ids) |
0 | 697 |
elif instance["type"] in ["selectionDivergence", "selectionConvergence", "simultaneousDivergence", "simultaneousConvergence"]: |
698 |
if instance["type"] == "selectionDivergence": |
|
699 |
divergence = SFC_Divergence(self, SELECTION_DIVERGENCE, |
|
700 |
len(instance["connectors"]["outputs"]), instance["id"]) |
|
701 |
elif instance["type"] == "selectionConvergence": |
|
702 |
divergence = SFC_Divergence(self, SELECTION_CONVERGENCE, |
|
703 |
len(instance["connectors"]["inputs"]), instance["id"]) |
|
704 |
elif instance["type"] == "simultaneousDivergence": |
|
705 |
divergence = SFC_Divergence(self, SIMULTANEOUS_DIVERGENCE, |
|
706 |
len(instance["connectors"]["outputs"]), instance["id"]) |
|
707 |
else: |
|
708 |
divergence = SFC_Divergence(self, SIMULTANEOUS_CONVERGENCE, |
|
709 |
len(instance["connectors"]["inputs"]), instance["id"]) |
|
710 |
divergence.SetPosition(instance["x"], instance["y"]) |
|
711 |
divergence.SetSize(instance["width"], instance["height"]) |
|
42 | 712 |
self.AddBlock(divergence) |
0 | 713 |
connectors = divergence.GetConnectors() |
714 |
for i, input_connector in enumerate(instance["connectors"]["inputs"]): |
|
715 |
connector = connectors["inputs"][i] |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
716 |
connector.SetPosition(wx.Point(*input_connector["position"])) |
0 | 717 |
self.CreateWires(connector, input_connector["links"], ids) |
718 |
for i, output_connector in enumerate(instance["connectors"]["outputs"]): |
|
719 |
connector = connectors["outputs"][i] |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
720 |
connector.SetPosition(wx.Point(*output_connector["position"])) |
0 | 721 |
elif instance["type"] == "jump": |
722 |
jump = SFC_Jump(self, instance["target"], instance["id"]) |
|
723 |
jump.SetPosition(instance["x"], instance["y"]) |
|
145 | 724 |
jump.SetSize(instance["width"], instance["height"]) |
42 | 725 |
self.AddBlock(jump) |
0 | 726 |
connector = jump.GetConnector() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
727 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 728 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
729 |
elif instance["type"] == "actionBlock": |
|
730 |
actionBlock = SFC_ActionBlock(self, instance["actions"], instance["id"]) |
|
731 |
actionBlock.SetPosition(instance["x"], instance["y"]) |
|
732 |
actionBlock.SetSize(instance["width"], instance["height"]) |
|
42 | 733 |
self.AddBlock(actionBlock) |
0 | 734 |
connector = actionBlock.GetConnector() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
735 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 736 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
737 |
else: |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
738 |
connectors = {"inputs" : [], "outputs" : []} |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
739 |
for input in instance["connectors"]["inputs"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
740 |
if input["negated"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
741 |
connectors["inputs"].append((input["name"], None, "negated")) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
742 |
elif input["edge"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
743 |
connectors["inputs"].append((input["name"], None, input["edge"])) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
744 |
else: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
745 |
connectors["inputs"].append((input["name"], None, "none")) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
746 |
for output in instance["connectors"]["outputs"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
747 |
if output["negated"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
748 |
connectors["outputs"].append((output["name"], None, "negated")) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
749 |
elif output["edge"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
750 |
connectors["outputs"].append((output["name"], None, output["edge"])) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
751 |
else: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
752 |
connectors["outputs"].append((output["name"], None, "none")) |
0 | 753 |
if instance["name"] != None: |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
754 |
block = FBD_Block(self, instance["type"], instance["name"], instance["id"], len(instance["connectors"]["inputs"]), connectors=connectors, executionOrder=instance["executionOrder"]) |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
755 |
else: |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
756 |
block = FBD_Block(self, instance["type"], "", instance["id"], len(instance["connectors"]["inputs"]), connectors=connectors, executionOrder=instance["executionOrder"]) |
0 | 757 |
block.SetPosition(instance["x"], instance["y"]) |
758 |
block.SetSize(instance["width"], instance["height"]) |
|
42 | 759 |
self.AddBlock(block) |
0 | 760 |
connectors = block.GetConnectors() |
761 |
for i, input_connector in enumerate(instance["connectors"]["inputs"]): |
|
762 |
connector = connectors["inputs"][i] |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
763 |
connector.SetPosition(wx.Point(*input_connector["position"])) |
0 | 764 |
if input_connector["negated"]: |
765 |
connector.SetNegated(True) |
|
766 |
if input_connector["edge"]: |
|
767 |
connector.SetEdge(input_connector["edge"]) |
|
768 |
self.CreateWires(connector, input_connector["links"], ids) |
|
769 |
for i, output_connector in enumerate(instance["connectors"]["outputs"]): |
|
770 |
connector = connectors["outputs"][i] |
|
771 |
if output_connector["negated"]: |
|
772 |
connector.SetNegated(True) |
|
773 |
if output_connector["edge"]: |
|
774 |
connector.SetEdge(output_connector["edge"]) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
775 |
connector.SetPosition(wx.Point(*output_connector["position"])) |
0 | 776 |
|
777 |
def CreateWires(self, start_connector, links, ids): |
|
778 |
for link in links: |
|
779 |
refLocalId = link["refLocalId"] |
|
780 |
if refLocalId != None: |
|
781 |
if refLocalId not in ids: |
|
121 | 782 |
new_instance = self.Controler.GetEditedElementInstanceInfos(self.TagName, refLocalId) |
0 | 783 |
if new_instance: |
784 |
self.loadInstance(new_instance, ids) |
|
785 |
connected = self.FindElementById(refLocalId) |
|
786 |
if connected: |
|
787 |
points = link["points"] |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
788 |
end_connector = connected.GetConnector(wx.Point(points[-1][0], points[-1][1]), link["formalParameter"]) |
0 | 789 |
if end_connector: |
790 |
wire = Wire(self) |
|
791 |
wire.SetPoints(points) |
|
792 |
start_connector.Connect((wire, 0), False) |
|
793 |
end_connector.Connect((wire, -1), False) |
|
794 |
wire.ConnectStartPoint(None, start_connector) |
|
795 |
wire.ConnectEndPoint(None, end_connector) |
|
42 | 796 |
self.AddWire(wire) |
0 | 797 |
|
798 |
#------------------------------------------------------------------------------- |
|
799 |
# Search Element functions |
|
800 |
#------------------------------------------------------------------------------- |
|
801 |
||
802 |
def FindBlock(self, pos): |
|
803 |
for block in self.Blocks: |
|
804 |
if block.HitTest(pos) or block.TestHandle(pos) != (0, 0): |
|
805 |
return block |
|
806 |
return None |
|
807 |
||
808 |
def FindWire(self, pos): |
|
809 |
for wire in self.Wires: |
|
810 |
if wire.HitTest(pos) or wire.TestHandle(pos) != (0, 0): |
|
811 |
return wire |
|
812 |
return None |
|
813 |
||
814 |
def FindElement(self, pos, exclude_group = False): |
|
815 |
if self.SelectedElement and not (exclude_group and isinstance(self.SelectedElement, Graphic_Group)): |
|
816 |
if self.SelectedElement.HitTest(pos) or self.SelectedElement.TestHandle(pos) != (0, 0): |
|
817 |
return self.SelectedElement |
|
42 | 818 |
for element in self.GetElements(): |
0 | 819 |
if element.HitTest(pos) or element.TestHandle(pos) != (0, 0): |
820 |
return element |
|
821 |
return None |
|
822 |
||
3
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
823 |
def FindBlockConnector(self, pos, exclude = True): |
0 | 824 |
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
|
825 |
result = block.TestConnector(pos, exclude) |
0 | 826 |
if result: |
827 |
return result |
|
828 |
return None |
|
829 |
||
830 |
def FindElementById(self, id): |
|
42 | 831 |
for element in self.Blocks: |
832 |
if element.GetId() == id: |
|
833 |
return element |
|
834 |
for element in self.Comments: |
|
0 | 835 |
if element.GetId() == id: |
836 |
return element |
|
837 |
return None |
|
838 |
||
839 |
def SearchElements(self, bbox): |
|
840 |
elements = [] |
|
42 | 841 |
for element in self.GetElements(): |
842 |
if element.IsInSelection(bbox): |
|
0 | 843 |
elements.append(element) |
844 |
return elements |
|
845 |
||
846 |
#------------------------------------------------------------------------------- |
|
847 |
# Popup menu functions |
|
848 |
#------------------------------------------------------------------------------- |
|
849 |
||
850 |
def PopupBlockMenu(self, connector = None): |
|
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
851 |
if connector is not None and connector.IsCompatible("BOOL"): |
121 | 852 |
type = self.Controler.GetEditedElementType(self.TagName) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
853 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
854 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
855 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, type != "function") |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
856 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, type != "function") |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
857 |
else: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
858 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
859 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
860 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
861 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
862 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
863 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
864 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
865 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
866 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
867 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, self.SelectedElement.GetType() in self.Controler.GetProjectPouNames()) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
868 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, True) |
0 | 869 |
if connector: |
870 |
if connector.IsNegated(): |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
871 |
self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS1, True) |
0 | 872 |
elif connector.GetEdge() == "rising": |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
873 |
self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS2, True) |
0 | 874 |
elif connector.GetEdge() == "falling": |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
875 |
self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS3, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
876 |
else: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
877 |
self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS0, True) |
0 | 878 |
self.PopupMenu(self.ContextualMenu) |
879 |
||
880 |
def PopupWireMenu(self): |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
881 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
882 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
883 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
884 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
885 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
886 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
887 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
888 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
889 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
890 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
891 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, True) |
0 | 892 |
self.PopupMenu(self.ContextualMenu) |
893 |
||
894 |
def PopupDivergenceMenu(self, connector): |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
895 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
896 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
897 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
898 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
899 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
900 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
901 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
902 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, connector) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
903 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
904 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
905 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, True) |
0 | 906 |
self.PopupMenu(self.ContextualMenu) |
907 |
||
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
908 |
def PopupGroupMenu(self): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
909 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
910 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
911 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
912 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
913 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
914 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
915 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
916 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
917 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
918 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
919 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
920 |
self.PopupMenu(self.ContextualMenu) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
921 |
|
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
922 |
def PopupDefaultMenu(self, block = True): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
923 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
924 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
925 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
926 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
927 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
928 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
929 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
930 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
931 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
932 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
933 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, block) |
0 | 934 |
self.PopupMenu(self.ContextualMenu) |
935 |
||
936 |
#------------------------------------------------------------------------------- |
|
937 |
# Menu items functions |
|
938 |
#------------------------------------------------------------------------------- |
|
939 |
||
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
940 |
def OnAlignLeftMenu(self, event): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
941 |
if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
942 |
self.SelectedElement.AlignElements(ALIGN_LEFT, None) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
943 |
self.RefreshBuffer() |
155 | 944 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
945 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
946 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
947 |
def OnAlignCenterMenu(self, event): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
948 |
if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
949 |
self.SelectedElement.AlignElements(ALIGN_CENTER, None) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
950 |
self.RefreshBuffer() |
155 | 951 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
952 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
953 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
954 |
def OnAlignRightMenu(self, event): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
955 |
if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
956 |
self.SelectedElement.AlignElements(ALIGN_RIGHT, None) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
957 |
self.RefreshBuffer() |
155 | 958 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
959 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
960 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
961 |
def OnAlignTopMenu(self, event): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
962 |
if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
963 |
self.SelectedElement.AlignElements(None, ALIGN_TOP) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
964 |
self.RefreshBuffer() |
155 | 965 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
966 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
967 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
968 |
def OnAlignMiddleMenu(self, event): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
969 |
if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
970 |
self.SelectedElement.AlignElements(None, ALIGN_MIDDLE) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
971 |
self.RefreshBuffer() |
155 | 972 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
973 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
974 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
975 |
def OnAlignBottomMenu(self, event): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
976 |
if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
977 |
self.SelectedElement.AlignElements(None, ALIGN_BOTTOM) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
978 |
self.RefreshBuffer() |
155 | 979 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
980 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
981 |
|
0 | 982 |
def OnNoModifierMenu(self, event): |
42 | 983 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
0 | 984 |
self.SelectedElement.SetConnectorNegated(False) |
80 | 985 |
self.RefreshBuffer() |
0 | 986 |
event.Skip() |
987 |
||
988 |
def OnNegatedMenu(self, event): |
|
42 | 989 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
0 | 990 |
self.SelectedElement.SetConnectorNegated(True) |
80 | 991 |
self.RefreshBuffer() |
0 | 992 |
event.Skip() |
993 |
||
994 |
def OnRisingEdgeMenu(self, event): |
|
42 | 995 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
0 | 996 |
self.SelectedElement.SetConnectorEdge("rising") |
80 | 997 |
self.RefreshBuffer() |
0 | 998 |
event.Skip() |
999 |
||
1000 |
def OnFallingEdgeMenu(self, event): |
|
42 | 1001 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
0 | 1002 |
self.SelectedElement.SetConnectorEdge("falling") |
80 | 1003 |
self.RefreshBuffer() |
0 | 1004 |
event.Skip() |
1005 |
||
1006 |
def OnAddSegmentMenu(self, event): |
|
80 | 1007 |
if self.SelectedElement and self.IsWire(self.SelectedElement): |
0 | 1008 |
self.SelectedElement.AddSegment() |
1009 |
event.Skip() |
|
1010 |
||
1011 |
def OnDeleteSegmentMenu(self, event): |
|
80 | 1012 |
if self.SelectedElement and self.IsWire(self.SelectedElement): |
0 | 1013 |
self.SelectedElement.DeleteSegment() |
1014 |
event.Skip() |
|
1015 |
||
1016 |
def OnAddBranchMenu(self, event): |
|
42 | 1017 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
0 | 1018 |
self.AddDivergenceBranch(self.SelectedElement) |
80 | 1019 |
self.RefreshBuffer() |
0 | 1020 |
event.Skip() |
1021 |
||
1022 |
def OnDeleteBranchMenu(self, event): |
|
42 | 1023 |
if self.SelectedElement and self.IsBlock(self.SelectedElement): |
0 | 1024 |
self.RemoveDivergenceBranch(self.SelectedElement) |
80 | 1025 |
self.RefreshBuffer() |
0 | 1026 |
event.Skip() |
1027 |
||
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1028 |
def OnEditBlockMenu(self, event): |
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1029 |
if self.SelectedElement: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1030 |
self.ParentWindow.EditProjectElement(ITEM_POU, "P::%s"%self.SelectedElement.GetType()) |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1031 |
event.Skip() |
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1032 |
|
0 | 1033 |
def OnDeleteMenu(self, event): |
1034 |
if self.SelectedElement: |
|
1035 |
self.SelectedElement.Delete() |
|
1036 |
self.SelectedElement = None |
|
80 | 1037 |
self.RefreshBuffer() |
0 | 1038 |
event.Skip() |
1039 |
||
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1040 |
def OnClearExecutionOrderMenu(self, event): |
121 | 1041 |
self.Controler.ClearEditedElementExecutionOrder(self.TagName) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1042 |
self.RefreshBuffer() |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1043 |
self.RefreshView() |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1044 |
|
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1045 |
def OnResetExecutionOrderMenu(self, event): |
121 | 1046 |
self.Controler.ResetEditedElementExecutionOrder(self.TagName) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1047 |
self.RefreshBuffer() |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1048 |
self.RefreshView() |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1049 |
|
0 | 1050 |
#------------------------------------------------------------------------------- |
1051 |
# Mouse event functions |
|
1052 |
#------------------------------------------------------------------------------- |
|
1053 |
||
1054 |
def OnViewerLeftDown(self, event): |
|
27 | 1055 |
if self.Mode == MODE_SELECTION: |
1056 |
dc = self.GetLogicalDC() |
|
1057 |
pos = event.GetLogicalPosition(dc) |
|
1058 |
if event.ControlDown() and self.SelectedElement: |
|
1059 |
element = self.FindElement(pos, True) |
|
1060 |
if element: |
|
1061 |
if isinstance(self.SelectedElement, Graphic_Group): |
|
1062 |
self.SelectedElement.SetSelected(False) |
|
1063 |
self.SelectedElement.SelectElement(element) |
|
1064 |
elif self.SelectedElement: |
|
1065 |
group = Graphic_Group(self) |
|
1066 |
group.SelectElement(self.SelectedElement) |
|
1067 |
group.SelectElement(element) |
|
1068 |
self.SelectedElement = group |
|
1069 |
elements = self.SelectedElement.GetElements() |
|
1070 |
if len(elements) == 0: |
|
1071 |
self.SelectedElement = element |
|
1072 |
elif len(elements) == 1: |
|
1073 |
self.SelectedElement = elements[0] |
|
1074 |
self.SelectedElement.SetSelected(True) |
|
1075 |
else: |
|
1076 |
element = self.FindElement(pos) |
|
145 | 1077 |
if element is None or element.TestHandle(pos) == (0, 0): |
1078 |
connector = self.FindBlockConnector(pos) |
|
1079 |
else: |
|
1080 |
connector = None |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1081 |
if self.DrawingWire: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1082 |
self.DrawingWire = False |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1083 |
if connector: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1084 |
event.Dragging = lambda : True |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1085 |
self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1086 |
if self.SelectedElement.EndConnected is not None: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1087 |
self.SelectedElement.ResetPoints() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1088 |
self.SelectedElement.GeneratePoints() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1089 |
self.SelectedElement.RefreshModel() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1090 |
self.SelectedElement.SetSelected(True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1091 |
element = self.SelectedElement |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1092 |
self.RefreshBuffer() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1093 |
else: |
144 | 1094 |
rect = self.SelectedElement.GetRedrawRect() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1095 |
self.SelectedElement.Delete() |
145 | 1096 |
self.SelectedElement = None |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1097 |
element = None |
155 | 1098 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1099 |
elif connector: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1100 |
self.DrawingWire = True |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1101 |
pos = GetScaledEventPosition(event, self.GetLogicalDC(), self.Scaling) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1102 |
if (connector.GetDirection() == EAST): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1103 |
wire = Wire(self, [wx.Point(pos.x, pos.y), EAST], [wx.Point(pos.x, pos.y), WEST]) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1104 |
else: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1105 |
wire = Wire(self, [wx.Point(pos.x, pos.y), WEST], [wx.Point(pos.x, pos.y), EAST]) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1106 |
wire.oldPos = pos |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1107 |
wire.Handle = (HANDLE_POINT, 0) |
145 | 1108 |
wire.ProcessDragging(0, 0, self.Scaling) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1109 |
wire.Handle = (HANDLE_POINT, 1) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1110 |
self.AddWire(wire) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1111 |
if self.SelectedElement: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1112 |
self.SelectedElement.SetSelected(False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1113 |
self.SelectedElement = wire |
144 | 1114 |
self.SelectedElement.Refresh() |
27 | 1115 |
else: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1116 |
if self.SelectedElement and self.SelectedElement != element: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1117 |
self.SelectedElement.SetSelected(False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1118 |
self.SelectedElement = None |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1119 |
if element: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1120 |
self.SelectedElement = element |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1121 |
self.SelectedElement.OnLeftDown(event, dc, self.Scaling) |
144 | 1122 |
self.SelectedElement.Refresh() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1123 |
else: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1124 |
self.rubberBand.Reset() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1125 |
self.rubberBand.OnLeftDown(event, dc, self.Scaling) |
27 | 1126 |
elif self.Mode in [MODE_BLOCK, MODE_VARIABLE, MODE_CONNECTION, MODE_COMMENT, |
1127 |
MODE_CONTACT, MODE_COIL, MODE_POWERRAIL, MODE_INITIALSTEP, |
|
1128 |
MODE_STEP, MODE_TRANSITION, MODE_DIVERGENCE, MODE_JUMP, MODE_ACTION]: |
|
1129 |
self.rubberBand.Reset() |
|
1130 |
self.rubberBand.OnLeftDown(event, self.GetLogicalDC(), self.Scaling) |
|
0 | 1131 |
event.Skip() |
1132 |
||
1133 |
def OnViewerLeftUp(self, event): |
|
27 | 1134 |
if self.rubberBand.IsShown(): |
1135 |
if self.Mode == MODE_SELECTION: |
|
1136 |
elements = self.SearchElements(self.rubberBand.GetCurrentExtent()) |
|
1137 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
80 | 1138 |
if len(elements) == 1: |
1139 |
self.SelectedElement = elements[0] |
|
1140 |
self.SelectedElement.SetSelected(True) |
|
1141 |
elif len(elements) > 1: |
|
27 | 1142 |
self.SelectedElement = Graphic_Group(self) |
1143 |
self.SelectedElement.SetElements(elements) |
|
1144 |
self.SelectedElement.SetSelected(True) |
|
1145 |
else: |
|
1146 |
bbox = self.rubberBand.GetCurrentExtent() |
|
1147 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
1148 |
if self.Mode == MODE_BLOCK: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1149 |
wx.CallAfter(self.AddNewBlock, bbox) |
27 | 1150 |
elif self.Mode == MODE_VARIABLE: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1151 |
wx.CallAfter(self.AddNewVariable, bbox) |
27 | 1152 |
elif self.Mode == MODE_CONNECTION: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1153 |
wx.CallAfter(self.AddNewConnection, bbox) |
27 | 1154 |
elif self.Mode == MODE_COMMENT: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1155 |
wx.CallAfter(self.AddNewComment, bbox) |
27 | 1156 |
elif self.Mode == MODE_CONTACT: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1157 |
wx.CallAfter(self.AddNewContact, bbox) |
27 | 1158 |
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
|
1159 |
wx.CallAfter(self.AddNewCoil, bbox) |
27 | 1160 |
elif self.Mode == MODE_POWERRAIL: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1161 |
wx.CallAfter(self.AddNewPowerRail, bbox) |
27 | 1162 |
elif self.Mode == MODE_INITIALSTEP: |
71 | 1163 |
wx.CallAfter(self.AddNewStep, bbox, True) |
27 | 1164 |
elif self.Mode == MODE_STEP: |
71 | 1165 |
wx.CallAfter(self.AddNewStep, bbox, False) |
27 | 1166 |
elif self.Mode == MODE_TRANSITION: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1167 |
wx.CallAfter(self.AddNewTransition, bbox) |
27 | 1168 |
elif self.Mode == MODE_DIVERGENCE: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1169 |
wx.CallAfter(self.AddNewDivergence, bbox) |
27 | 1170 |
elif self.Mode == MODE_JUMP: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1171 |
wx.CallAfter(self.AddNewJump, bbox) |
27 | 1172 |
elif self.Mode == MODE_ACTION: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1173 |
wx.CallAfter(self.AddNewActionBlock, bbox) |
27 | 1174 |
elif self.Mode == MODE_SELECTION and self.SelectedElement: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1175 |
dc = self.GetLogicalDC() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1176 |
if self.DrawingWire: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1177 |
pos = event.GetLogicalPosition(dc) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1178 |
connector = self.FindBlockConnector(pos) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1179 |
if self.SelectedElement.EndConnected is not None: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1180 |
self.DrawingWire = False |
145 | 1181 |
self.SelectedElement.StartConnected.HighlightParentBlock(False) |
1182 |
self.SelectedElement.EndConnected.HighlightParentBlock(False) |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1183 |
self.SelectedElement.ResetPoints() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1184 |
self.SelectedElement.OnMotion(event, dc, self.Scaling) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1185 |
self.SelectedElement.GeneratePoints() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1186 |
self.SelectedElement.RefreshModel() |
145 | 1187 |
if self.HighlightedElement is not None: |
1188 |
self.HighlightedElement.SetHighlighted(False) |
|
1189 |
self.HighlightedElement = None |
|
1190 |
self.SelectedElement.SetHighlighted(True) |
|
1191 |
self.HighlightedElement = self.SelectedElement |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1192 |
self.SelectedElement.SetSelected(True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1193 |
self.RefreshBuffer() |
144 | 1194 |
elif connector is None or self.SelectedElement.GetDragging(): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1195 |
self.DrawingWire = False |
144 | 1196 |
rect = self.SelectedElement.GetRedrawRect() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1197 |
self.SelectedElement.Delete() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1198 |
self.SelectedElement = None |
155 | 1199 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1200 |
else: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1201 |
self.SelectedElement.OnLeftUp(event, dc, self.Scaling) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1202 |
wx.CallAfter(self.SetCursor, wx.NullCursor) |
144 | 1203 |
self.SelectedElement.Refresh() |
106
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
1204 |
if self.Mode != MODE_SELECTION and not self.SavedMode: |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1205 |
wx.CallAfter(self.ParentWindow.ResetCurrentMode) |
0 | 1206 |
event.Skip() |
1207 |
||
145 | 1208 |
def OnViewerRightDown(self, event): |
1209 |
if self.Mode == MODE_SELECTION: |
|
1210 |
dc = self.GetLogicalDC() |
|
1211 |
pos = event.GetLogicalPosition(dc) |
|
1212 |
element = self.FindElement(pos) |
|
1213 |
if self.SelectedElement and self.SelectedElement != element: |
|
1214 |
self.SelectedElement.SetSelected(False) |
|
1215 |
self.SelectedElement = None |
|
1216 |
if element: |
|
1217 |
self.SelectedElement = element |
|
1218 |
self.SelectedElement.OnRightDown(event, dc, self.Scaling) |
|
1219 |
self.SelectedElement.Refresh() |
|
1220 |
event.Skip() |
|
1221 |
||
0 | 1222 |
def OnViewerRightUp(self, event): |
80 | 1223 |
dc = self.GetLogicalDC() |
145 | 1224 |
if self.SelectedElement: |
1225 |
self.SelectedElement.OnRightUp(event, dc, self.Scaling) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1226 |
wx.CallAfter(self.SetCursor, wx.NullCursor) |
145 | 1227 |
self.SelectedElement.Refresh() |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1228 |
else: |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1229 |
self.PopupDefaultMenu(False) |
0 | 1230 |
event.Skip() |
1231 |
||
1232 |
def OnViewerLeftDClick(self, event): |
|
27 | 1233 |
if self.Mode == MODE_SELECTION and self.SelectedElement: |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1234 |
if event.ControlDown() and self.IsBlock(self.SelectedElement) and self.SelectedElement.GetType() in self.Controler.GetProjectPouNames(): |
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1235 |
self.ParentWindow.EditProjectElement(ITEM_POU, self.SelectedElement.GetType()) |
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1236 |
else: |
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1237 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
0 | 1238 |
event.Skip() |
1239 |
||
1240 |
def OnViewerMotion(self, event): |
|
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1241 |
refresh = False |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1242 |
dc = self.GetLogicalDC() |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1243 |
pos = GetScaledEventPosition(event, dc, self.Scaling) |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1244 |
if not event.Dragging(): |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1245 |
highlighted = self.FindElement(pos) |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1246 |
if self.HighlightedElement is not None and self.HighlightedElement != highlighted: |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1247 |
self.HighlightedElement.SetHighlighted(False) |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1248 |
self.HighlightedElement = None |
144 | 1249 |
if highlighted is not None and self.HighlightedElement != highlighted: |
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1250 |
highlighted.SetHighlighted(True) |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1251 |
self.HighlightedElement = highlighted |
27 | 1252 |
if self.rubberBand.IsShown(): |
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1253 |
self.rubberBand.OnMotion(event, dc, self.Scaling) |
27 | 1254 |
elif self.Mode == MODE_SELECTION and self.SelectedElement: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1255 |
if self.DrawingWire: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1256 |
connector = self.FindBlockConnector(pos, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1257 |
if not connector or self.SelectedElement.EndConnected == None: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1258 |
self.SelectedElement.ResetPoints() |
144 | 1259 |
movex, movey = self.SelectedElement.OnMotion(event, dc, self.Scaling) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1260 |
self.SelectedElement.GeneratePoints() |
144 | 1261 |
if movex != 0 or movey != 0: |
155 | 1262 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
144 | 1263 |
else: |
1264 |
movex, movey = self.SelectedElement.OnMotion(event, dc, self.Scaling) |
|
1265 |
if movex != 0 or movey != 0: |
|
155 | 1266 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
95 | 1267 |
self.UpdateScrollPos(event) |
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1268 |
event.Skip() |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1269 |
|
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1270 |
def OnLeaveViewer(self, event): |
144 | 1271 |
if self.SelectedElement and self.SelectedElement.GetDragging(): |
1272 |
event.Skip() |
|
1273 |
elif self.HighlightedElement is not None: |
|
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1274 |
self.HighlightedElement.SetHighlighted(False) |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1275 |
self.HighlightedElement = None |
71 | 1276 |
event.Skip() |
1277 |
||
1278 |
def UpdateScrollPos(self, event): |
|
27 | 1279 |
if (event.Dragging() and self.SelectedElement) or self.rubberBand.IsShown(): |
1280 |
position = event.GetPosition() |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1281 |
move_window = wx.Point() |
27 | 1282 |
window_size = self.GetClientSize() |
1283 |
xstart, ystart = self.GetViewStart() |
|
1284 |
if position.x < SCROLL_ZONE and xstart > 0: |
|
1285 |
move_window.x = -1 |
|
1286 |
elif position.x > window_size[0] - SCROLL_ZONE: |
|
1287 |
move_window.x = 1 |
|
1288 |
if position.y < SCROLL_ZONE and ystart > 0: |
|
1289 |
move_window.y = -1 |
|
1290 |
elif position.y > window_size[1] - SCROLL_ZONE: |
|
1291 |
move_window.y = 1 |
|
1292 |
if move_window.x != 0 or move_window.y != 0: |
|
1293 |
self.Scroll(xstart + move_window.x, ystart + move_window.y) |
|
42 | 1294 |
self.RefreshScrollBars() |
0 | 1295 |
|
1296 |
#------------------------------------------------------------------------------- |
|
1297 |
# Keyboard event functions |
|
1298 |
#------------------------------------------------------------------------------- |
|
1299 |
||
1300 |
def OnChar(self, event): |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1301 |
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
|
1302 |
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
|
1303 |
ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL) |
27 | 1304 |
keycode = event.GetKeyCode() |
1305 |
if self.Scaling: |
|
1306 |
scaling = self.Scaling |
|
1307 |
else: |
|
1308 |
scaling = (8, 8) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1309 |
if keycode == wx.WXK_DELETE and self.SelectedElement: |
144 | 1310 |
rect = self.SelectedElement.GetRedrawRect(1, 1) |
27 | 1311 |
self.SelectedElement.Delete() |
1312 |
self.SelectedElement = None |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1313 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1314 |
self.RefreshScrollBars() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1315 |
self.SetCursor(wx.NullCursor) |
155 | 1316 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1317 |
elif keycode == wx.WXK_RETURN and self.SelectedElement: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1318 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1319 |
elif keycode == wx.WXK_LEFT: |
42 | 1320 |
if event.ControlDown() and event.ShiftDown(): |
1321 |
self.Scroll(0, ypos) |
|
1322 |
elif event.ControlDown(): |
|
97 | 1323 |
event.Skip() |
42 | 1324 |
elif self.SelectedElement: |
1325 |
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
|
1326 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1327 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1328 |
self.RefreshScrollBars() |
155 | 1329 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(-scaling[0], 0)), False) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1330 |
elif keycode == wx.WXK_RIGHT: |
42 | 1331 |
if event.ControlDown() and event.ShiftDown(): |
1332 |
self.Scroll(xmax, ypos) |
|
1333 |
elif event.ControlDown(): |
|
97 | 1334 |
event.Skip() |
42 | 1335 |
elif self.SelectedElement: |
1336 |
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
|
1337 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1338 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1339 |
self.RefreshScrollBars() |
155 | 1340 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(scaling[0], 0)), False) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1341 |
elif keycode == wx.WXK_UP: |
42 | 1342 |
if event.ControlDown() and event.ShiftDown(): |
1343 |
self.Scroll(xpos, 0) |
|
1344 |
elif event.ControlDown(): |
|
97 | 1345 |
event.Skip() |
42 | 1346 |
elif self.SelectedElement: |
1347 |
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
|
1348 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1349 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1350 |
self.RefreshScrollBars() |
155 | 1351 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(0, -scaling[1])), False) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1352 |
elif keycode == wx.WXK_DOWN: |
42 | 1353 |
if event.ControlDown() and event.ShiftDown(): |
1354 |
self.Scroll(xpos, ymax) |
|
1355 |
elif event.ControlDown(): |
|
97 | 1356 |
event.Skip() |
42 | 1357 |
elif self.SelectedElement: |
1358 |
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
|
1359 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1360 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1361 |
self.RefreshScrollBars() |
155 | 1362 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(0, scaling[1])), False) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1363 |
elif keycode == wx.WXK_SPACE and self.SelectedElement is not None and self.SelectedElement.Dragging: |
144 | 1364 |
self.CopyBlock(self.SelectedElement, wx.Point(*self.SelectedElement.GetPosition())) |
1365 |
self.RefreshBuffer() |
|
1366 |
self.RefreshScrollBars() |
|
1367 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
|
1368 |
self.SelectedElement.Refresh() |
|
97 | 1369 |
else: |
1370 |
event.Skip() |
|
27 | 1371 |
|
1372 |
#------------------------------------------------------------------------------- |
|
1373 |
# Model adding functions |
|
1374 |
#------------------------------------------------------------------------------- |
|
1375 |
||
145 | 1376 |
def GetScaledSize(self, width, height): |
1377 |
if self.Scaling is not None: |
|
1378 |
width = round(float(width) / float(self.Scaling[0]) + 0.4) * self.Scaling[0] |
|
1379 |
height = round(float(height) / float(self.Scaling[1]) + 0.4) * self.Scaling[1] |
|
1380 |
return width, height |
|
1381 |
||
27 | 1382 |
def AddNewBlock(self, bbox): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1383 |
dialog = BlockPropertiesDialog(self.ParentWindow) |
121 | 1384 |
dialog.SetBlockList(self.Controler.GetBlockTypes(self.TagName)) |
70 | 1385 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
121 | 1386 |
dialog.SetPouElementNames(self.Controler.GetEditedElementVariables(self.TagName)) |
27 | 1387 |
dialog.SetMinBlockSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1388 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1389 |
id = self.GetNewId() |
1390 |
values = dialog.GetValues() |
|
1391 |
if "name" in values: |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1392 |
block = FBD_Block(self, values["type"], values["name"], id, values["extension"], values["inputs"]) |
27 | 1393 |
else: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1394 |
block = FBD_Block(self, values["type"], "", id, values["extension"], values["inputs"]) |
27 | 1395 |
block.SetPosition(bbox.x, bbox.y) |
145 | 1396 |
block.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1397 |
self.AddBlock(block) |
121 | 1398 |
self.Controler.AddEditedElementBlock(self.TagName, id, values["type"], values.get("name", None)) |
27 | 1399 |
self.RefreshBlockModel(block) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1400 |
self.RefreshBuffer() |
42 | 1401 |
self.RefreshScrollBars() |
144 | 1402 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
1403 |
block.Refresh() |
|
27 | 1404 |
dialog.Destroy() |
1405 |
||
1406 |
def AddNewVariable(self, bbox): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1407 |
dialog = VariablePropertiesDialog(self.ParentWindow) |
27 | 1408 |
dialog.SetMinVariableSize((bbox.width, bbox.height)) |
1409 |
varlist = [] |
|
121 | 1410 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) |
27 | 1411 |
if vars: |
1412 |
for var in vars: |
|
70 | 1413 |
if var["Edit"]: |
1414 |
varlist.append((var["Name"], var["Class"], var["Type"])) |
|
121 | 1415 |
returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName) |
27 | 1416 |
if returntype: |
121 | 1417 |
varlist.append((self.Controler.GetEditedElementName(self.TagName), "Output", returntype)) |
27 | 1418 |
dialog.SetVariables(varlist) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1419 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1420 |
id = self.GetNewId() |
1421 |
values = dialog.GetValues() |
|
1422 |
variable = FBD_Variable(self, values["type"], values["name"], values["value_type"], id) |
|
1423 |
variable.SetPosition(bbox.x, bbox.y) |
|
145 | 1424 |
variable.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1425 |
self.AddBlock(variable) |
121 | 1426 |
self.Controler.AddEditedElementVariable(self.TagName, id, values["type"]) |
27 | 1427 |
self.RefreshVariableModel(variable) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1428 |
self.RefreshBuffer() |
42 | 1429 |
self.RefreshScrollBars() |
144 | 1430 |
variable.Refresh() |
27 | 1431 |
dialog.Destroy() |
1432 |
||
1433 |
def AddNewConnection(self, bbox): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1434 |
dialog = ConnectionPropertiesDialog(self.ParentWindow) |
27 | 1435 |
dialog.SetMinConnectionSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1436 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1437 |
id = self.GetNewId() |
1438 |
values = dialog.GetValues() |
|
1439 |
connection = FBD_Connector(self, values["type"], values["name"], id) |
|
1440 |
connection.SetPosition(bbox.x, bbox.y) |
|
145 | 1441 |
connection.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1442 |
self.AddBlock(connection) |
121 | 1443 |
self.Controler.AddEditedElementConnection(self.TagName, id, values["type"]) |
27 | 1444 |
self.RefreshConnectionModel(connection) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1445 |
self.RefreshBuffer() |
42 | 1446 |
self.RefreshScrollBars() |
144 | 1447 |
connection.Refresh() |
27 | 1448 |
dialog.Destroy() |
1449 |
||
1450 |
def AddNewComment(self, bbox): |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1451 |
if wx.VERSION >= (2, 5, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1452 |
dialog = wx.TextEntryDialog(self.ParentWindow, "Edit comment", "Please enter comment text", "", wx.OK|wx.CANCEL|wx.TE_MULTILINE) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1453 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1454 |
dialog = wx.TextEntryDialog(self.ParentWindow, "Edit comment", "Please enter comment text", "", wx.OK|wx.CANCEL) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1455 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1456 |
value = dialog.GetValue() |
1457 |
id = self.GetNewId() |
|
1458 |
comment = Comment(self, value, id) |
|
1459 |
comment.SetPosition(bbox.x, bbox.y) |
|
1460 |
min_width, min_height = comment.GetMinSize() |
|
145 | 1461 |
comment.SetSize(*self.GetScaledSize(max(min_width,bbox.width),max(min_height,bbox.height))) |
42 | 1462 |
self.AddComment(comment) |
121 | 1463 |
self.Controler.AddEditedElementComment(self.TagName, id) |
27 | 1464 |
self.RefreshCommentModel(comment) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1465 |
self.RefreshBuffer() |
42 | 1466 |
self.RefreshScrollBars() |
144 | 1467 |
comment.Refresh() |
27 | 1468 |
dialog.Destroy() |
1469 |
||
1470 |
def AddNewContact(self, bbox): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1471 |
dialog = LDElementDialog(self.ParentWindow, "contact") |
27 | 1472 |
varlist = [] |
121 | 1473 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) |
27 | 1474 |
if vars: |
1475 |
for var in vars: |
|
1476 |
if var["Class"] != "Output" and var["Type"] == "BOOL": |
|
1477 |
varlist.append(var["Name"]) |
|
1478 |
dialog.SetVariables(varlist) |
|
1479 |
dialog.SetValues({"name":"","type":CONTACT_NORMAL}) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1480 |
dialog.SetElementSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1481 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1482 |
id = self.GetNewId() |
1483 |
values = dialog.GetValues() |
|
1484 |
contact = LD_Contact(self, values["type"], values["name"], id) |
|
1485 |
contact.SetPosition(bbox.x, bbox.y) |
|
145 | 1486 |
contact.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1487 |
self.AddBlock(contact) |
121 | 1488 |
self.Controler.AddEditedElementContact(self.TagName, id) |
27 | 1489 |
self.RefreshContactModel(contact) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1490 |
self.RefreshBuffer() |
42 | 1491 |
self.RefreshScrollBars() |
144 | 1492 |
contact.Refresh() |
27 | 1493 |
dialog.Destroy() |
1494 |
||
1495 |
def AddNewCoil(self, bbox): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1496 |
dialog = LDElementDialog(self.ParentWindow, "coil") |
27 | 1497 |
varlist = [] |
121 | 1498 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) |
27 | 1499 |
if vars: |
1500 |
for var in vars: |
|
1501 |
if var["Class"] != "Input" and var["Type"] == "BOOL": |
|
1502 |
varlist.append(var["Name"]) |
|
121 | 1503 |
returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName) |
27 | 1504 |
if returntype == "BOOL": |
121 | 1505 |
varlist.append(self.Controler.GetEditedElementName(self.TagName)) |
27 | 1506 |
dialog.SetVariables(varlist) |
1507 |
dialog.SetValues({"name":"","type":COIL_NORMAL}) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1508 |
dialog.SetElementSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1509 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1510 |
id = self.GetNewId() |
1511 |
values = dialog.GetValues() |
|
1512 |
coil = LD_Coil(self, values["type"], values["name"], id) |
|
1513 |
coil.SetPosition(bbox.x, bbox.y) |
|
145 | 1514 |
coil.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1515 |
self.AddBlock(coil) |
121 | 1516 |
self.Controler.AddEditedElementCoil(self.TagName, id) |
67
3a1b0afdaf84
Adding support for automatically generate function blocks in interface when a block is added
lbessard
parents:
64
diff
changeset
|
1517 |
self.RefreshCoilModel(coil) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1518 |
self.RefreshBuffer() |
42 | 1519 |
self.RefreshScrollBars() |
144 | 1520 |
coil.Refresh() |
27 | 1521 |
dialog.Destroy() |
1522 |
||
1523 |
def AddNewPowerRail(self, bbox): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1524 |
dialog = LDPowerRailDialog(self.ParentWindow) |
27 | 1525 |
dialog.SetMinSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1526 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1527 |
id = self.GetNewId() |
1528 |
values = dialog.GetValues() |
|
1529 |
powerrail = LD_PowerRail(self, values["type"], id, [True for i in xrange(values["number"])]) |
|
1530 |
powerrail.SetPosition(bbox.x, bbox.y) |
|
145 | 1531 |
powerrail.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1532 |
self.AddBlock(powerrail) |
121 | 1533 |
self.Controler.AddEditedElementPowerRail(self.TagName, id, values["type"]) |
27 | 1534 |
self.RefreshPowerRailModel(powerrail) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1535 |
self.RefreshBuffer() |
42 | 1536 |
self.RefreshScrollBars() |
144 | 1537 |
powerrail.Refresh() |
27 | 1538 |
dialog.Destroy() |
1539 |
||
71 | 1540 |
def AddNewStep(self, bbox, initial = False): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1541 |
dialog = StepContentDialog(self.ParentWindow, initial) |
71 | 1542 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
121 | 1543 |
dialog.SetVariables(self.Controler.GetEditedElementInterfaceVars(self.TagName)) |
71 | 1544 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step)]) |
1545 |
dialog.SetMinStepSize((bbox.width, bbox.height)) |
|
1546 |
if dialog.ShowModal() == wx.ID_OK: |
|
1547 |
id = self.GetNewId() |
|
1548 |
values = dialog.GetValues() |
|
1549 |
step = SFC_Step(self, values["name"], initial, id) |
|
1550 |
if values["input"]: |
|
1551 |
step.AddInput() |
|
1552 |
else: |
|
1553 |
step.RemoveInput() |
|
1554 |
if values["output"]: |
|
1555 |
step.AddOutput() |
|
1556 |
else: |
|
1557 |
step.RemoveOutput() |
|
1558 |
if values["action"]: |
|
1559 |
step.AddAction() |
|
1560 |
else: |
|
1561 |
step.RemoveAction() |
|
1562 |
step.SetPosition(bbox.x, bbox.y) |
|
1563 |
min_width, min_height = step.GetMinSize() |
|
145 | 1564 |
step.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
71 | 1565 |
self.AddBlock(step) |
121 | 1566 |
self.Controler.AddEditedElementStep(self.TagName, id) |
71 | 1567 |
self.RefreshStepModel(step) |
1568 |
self.RefreshBuffer() |
|
1569 |
self.RefreshScrollBars() |
|
144 | 1570 |
step.Refresh() |
71 | 1571 |
dialog.Destroy() |
1572 |
||
27 | 1573 |
def AddNewTransition(self, bbox): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1574 |
dialog = TransitionContentDialog(self.ParentWindow, self.GetDrawingMode() == FREEDRAWING_MODE) |
121 | 1575 |
dialog.SetTransitions(self.Controler.GetEditedElementTransitions(self.TagName)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1576 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1577 |
id = self.GetNewId() |
1578 |
values = dialog.GetValues() |
|
80 | 1579 |
transition = SFC_Transition(self, values["type"], values["value"], values["priority"], id) |
27 | 1580 |
transition.SetPosition(bbox.x, bbox.y) |
1581 |
min_width, min_height = transition.GetMinSize() |
|
145 | 1582 |
transition.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
42 | 1583 |
self.AddBlock(transition) |
121 | 1584 |
self.Controler.AddEditedElementTransition(self.TagName, id) |
27 | 1585 |
self.RefreshTransitionModel(transition) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1586 |
self.RefreshBuffer() |
42 | 1587 |
self.RefreshScrollBars() |
144 | 1588 |
transition.Refresh() |
27 | 1589 |
dialog.Destroy() |
1590 |
||
1591 |
def AddNewDivergence(self, bbox): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1592 |
dialog = DivergenceCreateDialog(self.ParentWindow) |
27 | 1593 |
dialog.SetMinSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1594 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1595 |
id = self.GetNewId() |
1596 |
values = dialog.GetValues() |
|
1597 |
divergence = SFC_Divergence(self, values["type"], values["number"], id) |
|
1598 |
divergence.SetPosition(bbox.x, bbox.y) |
|
111 | 1599 |
min_width, min_height = divergence.GetMinSize(True) |
145 | 1600 |
divergence.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
42 | 1601 |
self.AddBlock(divergence) |
121 | 1602 |
self.Controler.AddEditedElementDivergence(self.TagName, id, values["type"]) |
27 | 1603 |
self.RefreshDivergenceModel(divergence) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1604 |
self.RefreshBuffer() |
42 | 1605 |
self.RefreshScrollBars() |
144 | 1606 |
divergence.Refresh() |
27 | 1607 |
dialog.Destroy() |
0 | 1608 |
|
108 | 1609 |
def AddNewJump(self, bbox): |
1610 |
choices = [] |
|
1611 |
for block in self.Blocks: |
|
1612 |
if isinstance(block, SFC_Step): |
|
1613 |
choices.append(block.GetName()) |
|
1614 |
dialog = wx.SingleChoiceDialog(self.ParentWindow, "Add a new jump", "Please choose a target", choices, wx.OK|wx.CANCEL) |
|
1615 |
if dialog.ShowModal() == wx.ID_OK: |
|
1616 |
id = self.GetNewId() |
|
1617 |
value = dialog.GetStringSelection() |
|
1618 |
jump = SFC_Jump(self, value, id) |
|
1619 |
jump.SetPosition(bbox.x, bbox.y) |
|
1620 |
min_width, min_height = jump.GetMinSize() |
|
145 | 1621 |
jump.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
108 | 1622 |
self.AddBlock(jump) |
121 | 1623 |
self.Controler.AddEditedElementJump(self.TagName, id) |
108 | 1624 |
self.RefreshJumpModel(jump) |
1625 |
self.RefreshBuffer() |
|
1626 |
self.RefreshScrollBars() |
|
144 | 1627 |
jump.Refresh() |
108 | 1628 |
dialog.Destroy() |
1629 |
||
1630 |
def AddNewActionBlock(self, bbox): |
|
1631 |
dialog = ActionBlockDialog(self.ParentWindow) |
|
1632 |
dialog.SetQualifierList(self.Controler.GetQualifierTypes()) |
|
121 | 1633 |
dialog.SetActionList(self.Controler.GetEditedElementActions(self.TagName)) |
1634 |
dialog.SetVariableList(self.Controler.GetEditedElementInterfaceVars(self.TagName)) |
|
108 | 1635 |
if dialog.ShowModal() == wx.ID_OK: |
1636 |
actions = dialog.GetValues() |
|
1637 |
id = self.GetNewId() |
|
1638 |
actionblock = SFC_ActionBlock(self, actions, id) |
|
1639 |
actionblock.SetPosition(bbox.x, bbox.y) |
|
1640 |
min_width, min_height = actionblock.GetMinSize() |
|
145 | 1641 |
actionblock.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
108 | 1642 |
self.AddBlock(actionblock) |
121 | 1643 |
self.Controler.AddEditedElementActionBlock(self.TagName, id) |
108 | 1644 |
self.RefreshActionBlockModel(actionblock) |
1645 |
self.RefreshBuffer() |
|
1646 |
self.RefreshScrollBars() |
|
144 | 1647 |
actionblock.Refresh() |
108 | 1648 |
dialog.Destroy() |
27 | 1649 |
|
1650 |
#------------------------------------------------------------------------------- |
|
1651 |
# Edit element content functions |
|
1652 |
#------------------------------------------------------------------------------- |
|
1653 |
||
1654 |
def EditBlockContent(self, block): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1655 |
dialog = BlockPropertiesDialog(self.ParentWindow) |
121 | 1656 |
dialog.SetBlockList(self.Controler.GetBlockTypes(self.TagName)) |
70 | 1657 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
121 | 1658 |
variable_names = self.Controler.GetEditedElementVariables(self.TagName) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1659 |
if block.GetName() != "": |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1660 |
variable_names.remove(block.GetName()) |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1661 |
dialog.SetPouElementNames(variable_names) |
27 | 1662 |
dialog.SetMinBlockSize(block.GetSize()) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1663 |
old_values = {"name" : block.GetName(), "type" : block.GetType(), "inputs" : block.GetInputTypes(), |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1664 |
"executionOrder" : block.GetExecutionOrder(), "extension" : block.GetExtension()} |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1665 |
dialog.SetValues(old_values) |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1666 |
if dialog.ShowModal() == wx.ID_OK: |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1667 |
new_values = dialog.GetValues() |
154 | 1668 |
rect = block.GetRedrawRect(1, 1) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1669 |
if "name" in new_values: |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1670 |
block.SetName(new_values["name"]) |
154 | 1671 |
else: |
1672 |
block.SetName("") |
|
145 | 1673 |
block.SetSize(*self.GetScaledSize(new_values["width"], new_values["height"])) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1674 |
block.SetType(new_values["type"], new_values["extension"]) |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1675 |
block.SetExecutionOrder(new_values["executionOrder"]) |
154 | 1676 |
rect = rect.Union(block.GetRedrawRect()) |
27 | 1677 |
self.RefreshBlockModel(block) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1678 |
if old_values["executionOrder"] != new_values["executionOrder"]: |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1679 |
self.RefreshView() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1680 |
self.RefreshBuffer() |
42 | 1681 |
self.RefreshScrollBars() |
144 | 1682 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
154 | 1683 |
block.Refresh(rect) |
27 | 1684 |
dialog.Destroy() |
1685 |
||
1686 |
def EditVariableContent(self, variable): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1687 |
dialog = VariablePropertiesDialog(self.ParentWindow) |
27 | 1688 |
dialog.SetMinVariableSize(variable.GetSize()) |
1689 |
varlist = [] |
|
121 | 1690 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) |
27 | 1691 |
if vars: |
1692 |
for var in vars: |
|
70 | 1693 |
if var["Edit"]: |
1694 |
varlist.append((var["Name"], var["Class"], var["Type"])) |
|
121 | 1695 |
returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName) |
27 | 1696 |
if returntype: |
121 | 1697 |
varlist.append((self.Controler.GetEditedElementName(self.TagName), "Output", returntype)) |
27 | 1698 |
dialog.SetVariables(varlist) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1699 |
old_values = {"name" : variable.GetName(), "type" : variable.GetType(), |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1700 |
"executionOrder" : variable.GetExecutionOrder()} |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1701 |
dialog.SetValues(old_values) |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1702 |
if dialog.ShowModal() == wx.ID_OK: |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1703 |
new_values = dialog.GetValues() |
154 | 1704 |
rect = variable.GetRedrawRect(1, 1) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1705 |
variable.SetName(new_values["name"]) |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1706 |
variable.SetType(new_values["type"], new_values["value_type"]) |
145 | 1707 |
variable.SetSize(*self.GetScaledSize(new_values["width"], new_values["height"])) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1708 |
variable.SetExecutionOrder(new_values["executionOrder"]) |
154 | 1709 |
rect = rect.Union(variable.GetRedrawRect()) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1710 |
if old_values["type"] != new_values["type"]: |
27 | 1711 |
id = variable.GetId() |
121 | 1712 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
1713 |
self.Controler.AddEditedElementVariable(self.TagName, id, new_values["type"]) |
|
27 | 1714 |
self.RefreshVariableModel(variable) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1715 |
if old_values["executionOrder"] != new_values["executionOrder"]: |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1716 |
self.RefreshView() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1717 |
self.RefreshBuffer() |
42 | 1718 |
self.RefreshScrollBars() |
154 | 1719 |
variable.Refresh(rect) |
27 | 1720 |
dialog.Destroy() |
1721 |
||
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1722 |
def EditConnectionContent(self, connection): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1723 |
dialog = ConnectionPropertiesDialog(self.ParentWindow) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1724 |
dialog.SetMinConnectionSize(connection.GetSize()) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1725 |
values = {"name" : connection.GetName(), "type" : connection.GetType()} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1726 |
dialog.SetValues(values) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1727 |
if dialog.ShowModal() == wx.ID_OK: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1728 |
old_type = connection.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1729 |
values = dialog.GetValues() |
154 | 1730 |
rect = connection.GetRedrawRect(1, 1) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1731 |
connection.SetName(values["name"]) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1732 |
connection.SetType(values["type"]) |
145 | 1733 |
connection.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 1734 |
rect = rect.Union(connection.GetRedrawRect()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1735 |
if old_type != values["type"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1736 |
id = connection.GetId() |
121 | 1737 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
1738 |
self.Controler.AddEditedElementConnection(self.TagName, id, values["type"]) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1739 |
self.RefreshConnectionModel(connection) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1740 |
self.RefreshBuffer() |
42 | 1741 |
self.RefreshScrollBars() |
154 | 1742 |
connection.Refresh(rect) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1743 |
dialog.Destroy() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1744 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1745 |
def EditContactContent(self, contact): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1746 |
dialog = LDElementDialog(self.ParentWindow, "contact") |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1747 |
varlist = [] |
121 | 1748 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1749 |
if vars: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1750 |
for var in vars: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1751 |
if var["Class"] != "Output" and var["Type"] == "BOOL": |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1752 |
varlist.append(var["Name"]) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1753 |
dialog.SetVariables(varlist) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1754 |
values = {"name" : contact.GetName(), "type" : contact.GetType()} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1755 |
dialog.SetValues(values) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1756 |
dialog.SetElementSize(contact.GetSize()) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1757 |
if dialog.ShowModal() == wx.ID_OK: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1758 |
values = dialog.GetValues() |
154 | 1759 |
rect = contact.GetRedrawRect(1, 1) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1760 |
contact.SetName(values["name"]) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1761 |
contact.SetType(values["type"]) |
145 | 1762 |
contact.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 1763 |
rect = rect.Union(contact.GetRedrawRect()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1764 |
self.RefreshContactModel(contact) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1765 |
self.RefreshBuffer() |
42 | 1766 |
self.RefreshScrollBars() |
154 | 1767 |
contact.Refresh(rect) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1768 |
dialog.Destroy() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1769 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1770 |
def EditCoilContent(self, coil): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1771 |
dialog = LDElementDialog(self.ParentWindow, "coil") |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1772 |
varlist = [] |
121 | 1773 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1774 |
if vars: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1775 |
for var in vars: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1776 |
if var["Class"] != "Input" and var["Type"] == "BOOL": |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1777 |
varlist.append(var["Name"]) |
121 | 1778 |
returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1779 |
if returntype == "BOOL": |
121 | 1780 |
varlist.append(self.Controler.GetEditedElementName(self.TagName)) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1781 |
dialog.SetVariables(varlist) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1782 |
values = {"name" : coil.GetName(), "type" : coil.GetType()} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1783 |
dialog.SetValues(values) |
61
dc7142ae9438
Adding possibility to change Type and Pin number of power rails
lbessard
parents:
58
diff
changeset
|
1784 |
dialog.SetElementSize(coil.GetSize()) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1785 |
if dialog.ShowModal() == wx.ID_OK: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1786 |
values = dialog.GetValues() |
154 | 1787 |
rect = coil.GetRedrawRect(1, 1) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1788 |
coil.SetName(values["name"]) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1789 |
coil.SetType(values["type"]) |
145 | 1790 |
coil.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 1791 |
rect = rect.Union(coil.GetRedrawRect()) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1792 |
self.RefreshCoilModel(coil) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1793 |
self.RefreshBuffer() |
42 | 1794 |
self.RefreshScrollBars() |
154 | 1795 |
coil.Refresh(rect) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1796 |
dialog.Destroy() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1797 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1798 |
def EditPowerRailContent(self, powerrail): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1799 |
dialog = LDPowerRailDialog(self.ParentWindow, powerrail.GetType(), len(powerrail.GetConnectors())) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1800 |
dialog.SetMinSize(powerrail.GetSize()) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1801 |
if dialog.ShowModal() == wx.ID_OK: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1802 |
old_type = powerrail.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1803 |
values = dialog.GetValues() |
154 | 1804 |
rect = powerrail.GetRedrawRect(1, 1) |
61
dc7142ae9438
Adding possibility to change Type and Pin number of power rails
lbessard
parents:
58
diff
changeset
|
1805 |
powerrail.SetType(values["type"], [True for i in xrange(values["number"])]) |
145 | 1806 |
powerrail.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 1807 |
rect = rect.Union(powerrail.GetRedrawRect()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1808 |
if old_type != values["type"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1809 |
id = powerrail.GetId() |
121 | 1810 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
1811 |
self.Controler.AddEditedElementPowerRail(self.TagName, id, values["type"]) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1812 |
self.RefreshPowerRailModel(powerrail) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1813 |
self.RefreshBuffer() |
42 | 1814 |
self.RefreshScrollBars() |
154 | 1815 |
powerrail.Refresh(rect) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1816 |
dialog.Destroy() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1817 |
|
71 | 1818 |
def EditStepContent(self, step): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1819 |
dialog = StepContentDialog(self.ParentWindow, step.GetInitial()) |
71 | 1820 |
dialog.SetPouNames(self.Controler.GetProjectPouNames()) |
121 | 1821 |
dialog.SetVariables(self.Controler.GetEditedElementInterfaceVars(self.TagName)) |
71 | 1822 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step) and block.GetName() != step.GetName()]) |
1823 |
dialog.SetMinStepSize(step.GetSize()) |
|
1824 |
values = {"name" : step.GetName()} |
|
1825 |
connectors = step.GetConnectors() |
|
1826 |
values["input"] = connectors["input"] != None |
|
1827 |
values["output"] = connectors["output"] != None |
|
1828 |
values["action"] = connectors["action"] != None |
|
1829 |
dialog.SetValues(values) |
|
1830 |
if dialog.ShowModal() == wx.ID_OK: |
|
1831 |
values = dialog.GetValues() |
|
154 | 1832 |
rect = step.GetRedrawRect(1, 1) |
71 | 1833 |
step.SetName(values["name"]) |
1834 |
if values["input"]: |
|
1835 |
step.AddInput() |
|
1836 |
else: |
|
1837 |
step.RemoveInput() |
|
1838 |
if values["output"]: |
|
1839 |
step.AddOutput() |
|
1840 |
else: |
|
1841 |
step.RemoveOutput() |
|
1842 |
if values["action"]: |
|
1843 |
step.AddAction() |
|
1844 |
else: |
|
1845 |
step.RemoveAction() |
|
145 | 1846 |
step.UpdateSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 1847 |
rect = rect.Union(step.GetRedrawRect()) |
1848 |
self.RefreshStepModel(step) |
|
1849 |
self.RefreshBuffer() |
|
1850 |
self.RefreshScrollBars() |
|
1851 |
step.Refresh(rect) |
|
71 | 1852 |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1853 |
def EditTransitionContent(self, transition): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1854 |
dialog = TransitionContentDialog(self.ParentWindow, self.GetDrawingMode() == FREEDRAWING_MODE) |
121 | 1855 |
dialog.SetTransitions(self.Controler.GetEditedElementTransitions(self.TagName)) |
80 | 1856 |
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
|
1857 |
dialog.SetElementSize(transition.GetSize()) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1858 |
if dialog.ShowModal() == wx.ID_OK: |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1859 |
values = dialog.GetValues() |
154 | 1860 |
rect = transition.GetRedrawRect(1, 1) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1861 |
transition.SetType(values["type"],values["value"]) |
80 | 1862 |
transition.SetPriority(values["priority"]) |
154 | 1863 |
rect = rect.Union(transition.GetRedrawRect()) |
1864 |
self.RefreshTransitionModel(transition) |
|
1865 |
self.RefreshBuffer() |
|
1866 |
self.RefreshScrollBars() |
|
1867 |
transition.Refresh(rect) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1868 |
dialog.Destroy() |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1869 |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1870 |
def EditJumpContent(self, jump): |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1871 |
choices = [] |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1872 |
for block in self.Blocks: |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1873 |
if isinstance(block, SFC_Step): |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1874 |
choices.append(block.GetName()) |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1875 |
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
|
1876 |
dialog.SetSelection(choices.index(jump.GetTarget())) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1877 |
if dialog.ShowModal() == wx.ID_OK: |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1878 |
value = dialog.GetStringSelection() |
154 | 1879 |
rect = jump.GetRedrawRect(1, 1) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1880 |
jump.SetTarget(value) |
154 | 1881 |
rect = rect.Union(jump.GetRedrawRect()) |
1882 |
self.RefreshJumpModel(jump) |
|
1883 |
self.RefreshBuffer() |
|
1884 |
self.RefreshScrollBars() |
|
1885 |
jump.Refresh(rect) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1886 |
dialog.Destroy() |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1887 |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1888 |
def EditActionBlockContent(self, actionblock): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1889 |
dialog = ActionBlockDialog(self.ParentWindow) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1890 |
dialog.SetQualifierList(self.Controler.GetQualifierTypes()) |
121 | 1891 |
dialog.SetActionList(self.Controler.GetEditedElementActions(self.TagName)) |
1892 |
dialog.SetVariableList(self.Controler.GetEditedElementInterfaceVars(self.TagName)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1893 |
dialog.SetValues(actionblock.GetActions()) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1894 |
if dialog.ShowModal() == wx.ID_OK: |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1895 |
actions = dialog.GetValues() |
154 | 1896 |
rect = actionblock.GetRedrawRect(1, 1) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1897 |
actionblock.SetActions(actions) |
145 | 1898 |
actionblock.SetSize(*self.GetScaledSize(*actionblock.GetSize())) |
154 | 1899 |
rect = rect.Union(actionblock.GetRedrawRect()) |
1900 |
self.RefreshActionBlockModel(actionblock) |
|
1901 |
self.RefreshBuffer() |
|
1902 |
self.RefreshScrollBars() |
|
1903 |
actionblock.Refresh(rect) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1904 |
dialog.Destroy() |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1905 |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1906 |
def EditCommentContent(self, comment): |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1907 |
if wx.VERSION >= (2, 5, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1908 |
dialog = wx.TextEntryDialog(self.ParentWindow, "Edit comment", "Please enter comment text", comment.GetContent(), wx.OK|wx.CANCEL|wx.TE_MULTILINE) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1909 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1910 |
dialog = wx.TextEntryDialog(self.ParentWindow, "Edit comment", "Please enter comment text", comment.GetContent(), wx.OK|wx.CANCEL) |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1911 |
if dialog.ShowModal() == wx.ID_OK: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1912 |
value = dialog.GetValue() |
154 | 1913 |
rect = comment.GetRedrawRect(1, 1) |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1914 |
comment.SetContent(value) |
145 | 1915 |
comment.SetSize(*self.GetScaledSize(*comment.GetSize())) |
154 | 1916 |
rect = rect.Union(comment.GetRedrawRect()) |
1917 |
self.RefreshCommentModel(comment) |
|
1918 |
self.RefreshBuffer() |
|
1919 |
self.RefreshScrollBars() |
|
1920 |
comment.Refresh(rect) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1921 |
dialog.Destroy() |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1922 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1923 |
#------------------------------------------------------------------------------- |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1924 |
# Model update functions |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1925 |
#------------------------------------------------------------------------------- |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1926 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1927 |
def RefreshBlockModel(self, block): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1928 |
blockid = block.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1929 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1930 |
infos["type"] = block.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1931 |
infos["name"] = block.GetName() |
145 | 1932 |
if self.CurrentLanguage == "FBD": |
1933 |
infos["executionOrder"] = block.GetExecutionOrder() |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1934 |
infos["x"], infos["y"] = block.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1935 |
infos["width"], infos["height"] = block.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1936 |
infos["connectors"] = block.GetConnectors() |
121 | 1937 |
self.Controler.SetEditedElementBlockInfos(self.TagName, blockid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1938 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1939 |
def RefreshVariableModel(self, variable): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1940 |
variableid = variable.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1941 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1942 |
infos["name"] = variable.GetName() |
145 | 1943 |
if self.CurrentLanguage == "FBD": |
1944 |
infos["executionOrder"] = variable.GetExecutionOrder() |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1945 |
infos["x"], infos["y"] = variable.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1946 |
infos["width"], infos["height"] = variable.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1947 |
infos["connectors"] = variable.GetConnectors() |
121 | 1948 |
self.Controler.SetEditedElementVariableInfos(self.TagName, variableid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1949 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1950 |
def RefreshConnectionModel(self, connection): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1951 |
connectionid = connection.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1952 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1953 |
infos["name"] = connection.GetName() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1954 |
infos["x"], infos["y"] = connection.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1955 |
infos["width"], infos["height"] = connection.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1956 |
infos["connector"] = connection.GetConnector() |
121 | 1957 |
self.Controler.SetEditedElementConnectionInfos(self.TagName, connectionid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1958 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1959 |
def RefreshCommentModel(self, comment): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1960 |
commentid = comment.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1961 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1962 |
infos["content"] = comment.GetContent() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1963 |
infos["x"], infos["y"] = comment.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1964 |
infos["width"], infos["height"] = comment.GetSize() |
121 | 1965 |
self.Controler.SetEditedElementCommentInfos(self.TagName, commentid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1966 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1967 |
def RefreshPowerRailModel(self, powerrail): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1968 |
powerrailid = powerrail.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1969 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1970 |
infos["x"], infos["y"] = powerrail.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1971 |
infos["width"], infos["height"] = powerrail.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1972 |
infos["connectors"] = powerrail.GetConnectors() |
121 | 1973 |
self.Controler.SetEditedElementPowerRailInfos(self.TagName, powerrailid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1974 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1975 |
def RefreshContactModel(self, contact): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1976 |
contactid = contact.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1977 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1978 |
infos["name"] = contact.GetName() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1979 |
infos["type"] = contact.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1980 |
infos["x"], infos["y"] = contact.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1981 |
infos["width"], infos["height"] = contact.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1982 |
infos["connectors"] = contact.GetConnectors() |
121 | 1983 |
self.Controler.SetEditedElementContactInfos(self.TagName, contactid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1984 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1985 |
def RefreshCoilModel(self, coil): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1986 |
coilid = coil.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1987 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1988 |
infos["name"] = coil.GetName() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1989 |
infos["type"] = coil.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1990 |
infos["x"], infos["y"] = coil.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1991 |
infos["width"], infos["height"] = coil.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1992 |
infos["connectors"] = coil.GetConnectors() |
121 | 1993 |
self.Controler.SetEditedElementCoilInfos(self.TagName, coilid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1994 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1995 |
def RefreshStepModel(self, step): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1996 |
stepid = step.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1997 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1998 |
infos["name"] = step.GetName() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1999 |
infos["initial"] = step.GetInitial() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2000 |
infos["x"], infos["y"] = step.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2001 |
infos["width"], infos["height"] = step.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2002 |
infos["connectors"] = step.GetConnectors() |
121 | 2003 |
self.Controler.SetEditedElementStepInfos(self.TagName, stepid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2004 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2005 |
def RefreshTransitionModel(self, transition): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2006 |
transitionid = transition.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2007 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2008 |
infos["type"] = transition.GetType() |
80 | 2009 |
infos["priority"] = transition.GetPriority() |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2010 |
infos["condition"] = transition.GetCondition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2011 |
infos["x"], infos["y"] = transition.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2012 |
infos["width"], infos["height"] = transition.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2013 |
infos["connectors"] = transition.GetConnectors() |
121 | 2014 |
self.Controler.SetEditedElementTransitionInfos(self.TagName, transitionid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2015 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2016 |
def RefreshDivergenceModel(self, divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2017 |
divergenceid = divergence.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2018 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2019 |
infos["x"], infos["y"] = divergence.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2020 |
infos["width"], infos["height"] = divergence.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2021 |
infos["connectors"] = divergence.GetConnectors() |
121 | 2022 |
self.Controler.SetEditedElementDivergenceInfos(self.TagName, divergenceid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2023 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2024 |
def RefreshJumpModel(self, jump): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2025 |
jumpid = jump.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2026 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2027 |
infos["target"] = jump.GetTarget() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2028 |
infos["x"], infos["y"] = jump.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2029 |
infos["width"], infos["height"] = jump.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2030 |
infos["connector"] = jump.GetConnector() |
121 | 2031 |
self.Controler.SetEditedElementJumpInfos(self.TagName, jumpid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2032 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2033 |
def RefreshActionBlockModel(self, actionblock): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2034 |
actionblockid = actionblock.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2035 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2036 |
infos["actions"] = actionblock.GetActions() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2037 |
infos["x"], infos["y"] = actionblock.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2038 |
infos["width"], infos["height"] = actionblock.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2039 |
infos["connector"] = actionblock.GetConnector() |
121 | 2040 |
self.Controler.SetEditedElementActionBlockInfos(self.TagName, actionblockid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2041 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2042 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2043 |
#------------------------------------------------------------------------------- |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2044 |
# Model delete functions |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2045 |
#------------------------------------------------------------------------------- |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2046 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2047 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2048 |
def DeleteBlock(self, block): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2049 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2050 |
for output in block.GetConnectors()["outputs"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2051 |
for element in output.GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2052 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2053 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2054 |
block.Clean() |
42 | 2055 |
self.RemoveBlock(block) |
121 | 2056 |
self.Controler.RemoveEditedElementInstance(self.TagName, block.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2057 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2058 |
element.RefreshModel() |
144 | 2059 |
wx.CallAfter(self.ParentWindow.RefreshVariablePanel, self.TagName) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2060 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2061 |
def DeleteVariable(self, variable): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2062 |
connectors = variable.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2063 |
if connectors["output"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2064 |
elements = connectors["output"].GetConnectedBlocks() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2065 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2066 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2067 |
variable.Clean() |
42 | 2068 |
self.RemoveBlock(variable) |
121 | 2069 |
self.Controler.RemoveEditedElementInstance(self.TagName, variable.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2070 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2071 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2072 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2073 |
def DeleteConnection(self, connection): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2074 |
if connection.GetType() == CONTINUATION: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2075 |
elements = connection.GetConnector().GetConnectedBlocks() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2076 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2077 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2078 |
connection.Clean() |
42 | 2079 |
self.RemoveBlock(connection) |
121 | 2080 |
self.Controler.RemoveEditedElementInstance(self.TagName, connection.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2081 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2082 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2083 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2084 |
def DeleteComment(self, comment): |
42 | 2085 |
self.RemoveComment(comment) |
121 | 2086 |
self.Controler.RemoveEditedElementInstance(self.TagName, comment.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2087 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2088 |
def DeleteWire(self, wire): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2089 |
if wire in self.Wires: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2090 |
connected = wire.GetConnected() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2091 |
wire.Clean() |
42 | 2092 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2093 |
for connector in connected: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2094 |
connector.RefreshParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2095 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2096 |
def DeleteContact(self, contact): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2097 |
connectors = contact.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2098 |
elements = connectors["output"].GetConnectedBlocks() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2099 |
contact.Clean() |
42 | 2100 |
self.RemoveBlock(contact) |
121 | 2101 |
self.Controler.RemoveEditedElementInstance(self.TagName, contact.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2102 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2103 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2104 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2105 |
def DeleteCoil(self, coil): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2106 |
connectors = coil.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2107 |
elements = connectors["output"].GetConnectedBlocks() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2108 |
coil.Clean() |
42 | 2109 |
self.RemoveBlock(coil) |
121 | 2110 |
self.Controler.RemoveEditedElementInstance(self.TagName, coil.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2111 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2112 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2113 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2114 |
def DeletePowerRail(self, powerrail): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2115 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2116 |
if powerrail.GetType() == LEFTRAIL: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2117 |
for connector in powerrail.GetConnectors(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2118 |
for element in connector.GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2119 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2120 |
elements.append(element) |
108 | 2121 |
powerrail.Clean() |
2122 |
self.RemoveBlock(powerrail) |
|
121 | 2123 |
self.Controler.RemoveEditedElementInstance(self.TagName, powerrail.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2124 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2125 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2126 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2127 |
def DeleteStep(self, step): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2128 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2129 |
connectors = step.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2130 |
if connectors["output"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2131 |
for element in connectors["output"].GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2132 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2133 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2134 |
if connectors["action"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2135 |
for element in connectors["action"].GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2136 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2137 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2138 |
step.Clean() |
42 | 2139 |
self.RemoveBlock(step) |
121 | 2140 |
self.Controler.RemoveEditedElementInstance(self.TagName, step.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2141 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2142 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2143 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2144 |
def DeleteTransition(self, transition): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2145 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2146 |
connectors = transition.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2147 |
if connectors["output"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2148 |
for element in connectors["output"].GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2149 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2150 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2151 |
transition.Clean() |
42 | 2152 |
self.RemoveBlock(transition) |
121 | 2153 |
self.Controler.RemoveEditedElementInstance(self.TagName, transition.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2154 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2155 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2156 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2157 |
def DeleteDivergence(self, divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2158 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2159 |
connectors = divergence.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2160 |
for output in connectors["outputs"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2161 |
for element in output.GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2162 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2163 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2164 |
divergence.Clean() |
42 | 2165 |
self.RemoveBlock(divergence) |
121 | 2166 |
self.Controler.RemoveEditedElementInstance(self.TagName, divergence.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2167 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2168 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2169 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2170 |
def DeleteJump(self, jump): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2171 |
jump.Clean() |
42 | 2172 |
self.RemoveBlock(jump) |
121 | 2173 |
self.Controler.RemoveEditedElementInstance(self.TagName, jump.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2174 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2175 |
def DeleteActionBlock(self, actionblock): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2176 |
actionblock.Clean() |
42 | 2177 |
self.RemoveBlock(actionblock) |
121 | 2178 |
self.Controler.RemoveEditedElementInstance(self.TagName, actionblock.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2179 |
|
27 | 2180 |
|
0 | 2181 |
#------------------------------------------------------------------------------- |
2182 |
# Editing functions |
|
2183 |
#------------------------------------------------------------------------------- |
|
2184 |
||
2185 |
def Cut(self): |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2186 |
if self.IsBlock(self.SelectedElement): |
162 | 2187 |
self.ParentWindow.SetCopyBuffer(self.SelectedElement.Clone(self)) |
144 | 2188 |
rect = self.SelectedElement.GetRedrawRect(1, 1) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2189 |
self.SelectedElement.Delete() |
144 | 2190 |
self.SelectedElement = None |
2191 |
self.RefreshBuffer() |
|
2192 |
self.RefreshScrollBars() |
|
155 | 2193 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
0 | 2194 |
|
2195 |
def Copy(self): |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2196 |
if self.IsBlock(self.SelectedElement): |
162 | 2197 |
self.ParentWindow.SetCopyBuffer(self.SelectedElement.Clone(self)) |
144 | 2198 |
|
0 | 2199 |
def Paste(self): |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2200 |
element = self.ParentWindow.GetCopyBuffer() |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2201 |
if element is not None and self.CanAddBlock(element): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2202 |
block = self.CopyBlock(element, wx.Point(*self.CalcUnscrolledPosition(30, 30))) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2203 |
if self.SelectedElement is not None: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2204 |
self.SelectedElement.SetSelected(False) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2205 |
self.SelectedElement = block |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2206 |
self.SelectedElement.SetSelected(True) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2207 |
self.RefreshBuffer() |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2208 |
self.RefreshScrollBars() |
144 | 2209 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2210 |
|
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2211 |
def CanAddBlock(self, block): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2212 |
if self.CurrentLanguage == "SFC": |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2213 |
return True |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2214 |
elif self.CurrentLanguage == "LD" and not isinstance(block, (SFC_Step, SFC_Transition, SFC_Divergence, SFC_Jump, SFC_ActionBlock)): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2215 |
return True |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2216 |
elif self.CurrentLanguage == "FBD" and isinstance(block, (FBD_Block, FBD_Variable, FBD_Connector, Comment)): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2217 |
return True |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2218 |
return False |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2219 |
|
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2220 |
def CopyBlock(self, element, pos): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2221 |
id = self.GetNewId() |
144 | 2222 |
if isinstance(element, FBD_Block) and element.GetName() != "" or isinstance(element, SFC_Step): |
2223 |
if isinstance(element, FBD_Block): |
|
2224 |
names = [varname.upper() for varname in self.Controler.GetEditedElementVariables(self.TagName)] |
|
2225 |
format = "Block%d" |
|
2226 |
elif isinstance(element, SFC_Step): |
|
2227 |
names = [block.GetName().upper() for block in self.Blocks if isinstance(block, SFC_Step)] |
|
2228 |
format = "Step%d" |
|
2229 |
i = 1 |
|
2230 |
while (format%i).upper() in names: |
|
2231 |
i += 1 |
|
2232 |
name = format%i |
|
162 | 2233 |
block = element.Clone(self, id, name, pos) |
144 | 2234 |
else: |
2235 |
name = None |
|
162 | 2236 |
block = element.Clone(self, id, pos=pos) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2237 |
self.AddBlock(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2238 |
if isinstance(block, Comment): |
121 | 2239 |
self.Controler.AddEditedElementComment(self.TagName, id) |
144 | 2240 |
self.RefreshCommentModel(block) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2241 |
elif isinstance(block, FBD_Block): |
144 | 2242 |
self.Controler.AddEditedElementBlock(self.TagName, id, block.GetType(), name) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2243 |
self.RefreshBlockModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2244 |
elif isinstance(block, FBD_Variable): |
121 | 2245 |
self.Controler.AddEditedElementVariable(self.TagName, id, block.GetType()) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2246 |
self.RefreshVariableModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2247 |
elif isinstance(block, FBD_Connector): |
121 | 2248 |
self.Controler.AddEditedElementConnection(self.TagName, id, block.GetType()) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2249 |
self.RefreshConnectionModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2250 |
elif isinstance(block, LD_Contact): |
121 | 2251 |
self.Controler.AddEditedElementContact(self.TagName, id) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2252 |
self.RefreshContactModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2253 |
elif isinstance(block, LD_Coil): |
121 | 2254 |
self.Controler.AddEditedElementCoil(self.TagName, id) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2255 |
self.RefreshCoilModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2256 |
elif isinstance(block, LD_PowerRail): |
121 | 2257 |
self.Controler.AddEditedElementPowerRail(self.TagName, id, block.GetType()) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2258 |
self.RefreshPowerRailModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2259 |
elif isinstance(block, SFC_Step): |
121 | 2260 |
self.Controler.AddEditedElementStep(self.TagName, id) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2261 |
self.RefreshStepModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2262 |
elif isinstance(block, SFC_Transition): |
121 | 2263 |
self.Controler.AddEditedElementTransition(self.TagName, id) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2264 |
self.RefreshTransitionModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2265 |
elif isinstance(block, SFC_Divergence): |
121 | 2266 |
self.Controler.AddEditedElementDivergence(self.TagName, id, block.GetType()) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2267 |
self.RefreshActionDivergenceModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2268 |
elif isinstance(block, SFC_Jump): |
121 | 2269 |
self.Controler.AddEditedElementJump(self.TagName, id) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2270 |
self.RefreshJumpModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2271 |
elif isinstance(block, SFC_ActionBlock): |
121 | 2272 |
self.Controler.AddEditedElementActionBlock(self.TagName, id) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2273 |
self.RefreshActionBlockModel(block) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2274 |
return block |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2275 |
|
0 | 2276 |
|
2277 |
#------------------------------------------------------------------------------- |
|
2278 |
# Drawing functions |
|
2279 |
#------------------------------------------------------------------------------- |
|
2280 |
||
27 | 2281 |
def OnMoveWindow(self, event): |
80 | 2282 |
self.GetBestSize() |
42 | 2283 |
self.RefreshScrollBars() |
27 | 2284 |
event.Skip() |
2285 |
||
0 | 2286 |
def OnPaint(self, event): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2287 |
dc = self.GetLogicalDC(True) |
145 | 2288 |
dc.SetBackground(wx.Brush(self.GetBackgroundColour())) |
0 | 2289 |
dc.Clear() |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2290 |
dc.BeginDrawing() |
0 | 2291 |
if self.Scaling and self.DrawGrid: |
145 | 2292 |
dc.SetPen(wx.TRANSPARENT_PEN) |
2293 |
dc.SetBrush(self.GridBrush) |
|
2294 |
width, height = self.GetVirtualSize() |
|
2295 |
dc.DrawRectangle(0, 0, width, height) |
|
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
2296 |
|
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
2297 |
# Draw all elements |
42 | 2298 |
for comment in self.Comments: |
2299 |
if comment != self.SelectedElement: |
|
2300 |
comment.Draw(dc) |
|
0 | 2301 |
for wire in self.Wires: |
2302 |
if wire != self.SelectedElement: |
|
2303 |
wire.Draw(dc) |
|
42 | 2304 |
for block in self.Blocks: |
2305 |
if block != self.SelectedElement: |
|
2306 |
block.Draw(dc) |
|
144 | 2307 |
|
0 | 2308 |
if self.SelectedElement: |
2309 |
self.SelectedElement.Draw(dc) |
|
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
2310 |
|
27 | 2311 |
if self.rubberBand.IsShown(): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2312 |
self.rubberBand.Draw(dc) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2313 |
dc.EndDrawing() |
27 | 2314 |
event.Skip() |
2315 |
||
2316 |