author | greg |
Sat, 30 May 2009 17:16:11 +0200 | |
changeset 362 | f56181aa99ea |
parent 361 | 62570186dad4 |
child 363 | 5eb9c5536334 |
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 |
||
332 | 25 |
import math |
26 |
||
0 | 27 |
import wx |
292 | 28 |
if wx.VERSION >= (2, 8, 0): |
29 |
USE_AUI = True |
|
30 |
else: |
|
31 |
USE_AUI = False |
|
0 | 32 |
|
33 |
from plcopen.structures import * |
|
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
34 |
from PLCControler import ITEM_POU |
27 | 35 |
|
36 |
from Dialogs import * |
|
37 |
||
218 | 38 |
from types import TupleType |
39 |
||
27 | 40 |
SCROLLBAR_UNIT = 10 |
41 |
WINDOW_BORDER = 10 |
|
42 |
SCROLL_ZONE = 10 |
|
0 | 43 |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
44 |
def AppendMenu(parent, help, id, kind, text): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
45 |
if wx.VERSION >= (2, 6, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
46 |
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
|
47 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
48 |
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
|
49 |
|
157 | 50 |
if wx.Platform == '__WXMSW__': |
51 |
faces = { 'times': 'Times New Roman', |
|
52 |
'mono' : 'Courier New', |
|
53 |
'helv' : 'Arial', |
|
54 |
'other': 'Comic Sans MS', |
|
158 | 55 |
'size' : 20, |
157 | 56 |
} |
57 |
else: |
|
58 |
faces = { 'times': 'Times', |
|
59 |
'mono' : 'Courier', |
|
60 |
'helv' : 'Helvetica', |
|
61 |
'other': 'new century schoolbook', |
|
158 | 62 |
'size' : 20, |
157 | 63 |
} |
64 |
||
332 | 65 |
ZOOM_FACTORS = [math.sqrt(2) ** x for x in xrange(-6, 7)] |
66 |
||
0 | 67 |
#------------------------------------------------------------------------------- |
68 |
# Graphic elements Viewer base class |
|
69 |
#------------------------------------------------------------------------------- |
|
70 |
||
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
71 |
# ID Constants for alignment menu items |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
72 |
[ID_VIEWERALIGNMENTMENUITEMS0, ID_VIEWERALIGNMENTMENUITEMS1, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
73 |
ID_VIEWERALIGNMENTMENUITEMS2, ID_VIEWERALIGNMENTMENUITEMS4, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
74 |
ID_VIEWERALIGNMENTMENUITEMS5, ID_VIEWERALIGNMENTMENUITEMS6, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
75 |
] = [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
|
76 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
77 |
# ID Constants for contextual menu items |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
78 |
[ID_VIEWERCONTEXTUALMENUITEMS0, ID_VIEWERCONTEXTUALMENUITEMS1, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
79 |
ID_VIEWERCONTEXTUALMENUITEMS2, ID_VIEWERCONTEXTUALMENUITEMS3, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
80 |
ID_VIEWERCONTEXTUALMENUITEMS5, ID_VIEWERCONTEXTUALMENUITEMS6, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
81 |
ID_VIEWERCONTEXTUALMENUITEMS8, ID_VIEWERCONTEXTUALMENUITEMS9, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
82 |
ID_VIEWERCONTEXTUALMENUITEMS11, ID_VIEWERCONTEXTUALMENUITEMS12, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
83 |
ID_VIEWERCONTEXTUALMENUITEMS14, ID_VIEWERCONTEXTUALMENUITEMS16, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
84 |
ID_VIEWERCONTEXTUALMENUITEMS17, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
85 |
] = [wx.NewId() for _init_coll_ContextualMenu_Items in range(13)] |
0 | 86 |
|
87 |
||
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
88 |
class ViewerDropTarget(wx.TextDropTarget): |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
89 |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
90 |
def __init__(self, parent): |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
91 |
wx.TextDropTarget.__init__(self) |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
92 |
self.ParentWindow = parent |
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
93 |
|
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
94 |
def OnDropText(self, x, y, data): |
108 | 95 |
x, y = self.ParentWindow.CalcUnscrolledPosition(x, y) |
323 | 96 |
x = int(x / self.ParentWindow.ViewScale[0]) |
97 |
y = int(y / self.ParentWindow.ViewScale[1]) |
|
145 | 98 |
scaling = self.ParentWindow.Scaling |
218 | 99 |
message = None |
100 |
try: |
|
101 |
values = eval(data) |
|
102 |
except: |
|
103 |
message = "Invalid value \"%s\" for viewer block"%data |
|
104 |
values = None |
|
105 |
if not isinstance(values, TupleType): |
|
106 |
message = "Invalid value \"%s\" for viewer block"%data |
|
107 |
values = None |
|
108 |
if values is not None: |
|
249 | 109 |
if values[1] == "debug": |
110 |
pass |
|
111 |
elif values[1] == "program": |
|
218 | 112 |
message = "Programs can't be used by other POUs!" |
113 |
elif values[1] in ["function", "functionBlock", "program"]: |
|
249 | 114 |
name, type = self.ParentWindow.Controler.GetEditedElementType(self.ParentWindow.GetTagName(), self.ParentWindow.Debug) |
253 | 115 |
words = self.ParentWindow.TagName.split("::") |
218 | 116 |
if name == values[0]: |
117 |
message = "\"%s\" can't use itself!"%name |
|
118 |
elif type == "function" and values[1] != "function": |
|
253 | 119 |
message = "Function Blocks can't be used in Functions!" |
120 |
elif words[0] == "T" and values[1] != "function": |
|
121 |
message = "Function Blocks can't be used in Transitions!" |
|
249 | 122 |
elif self.ParentWindow.Controler.PouIsUsedBy(name, values[0], self.ParentWindow.Debug): |
218 | 123 |
message = "\"%s\" is already used by \"%s\"!"%(name, values[0]) |
195
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
124 |
else: |
218 | 125 |
blockname = values[2] |
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
126 |
if len(values) > 3: |
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
127 |
blockinputs = values[3] |
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
128 |
else: |
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
129 |
blockinputs = None |
218 | 130 |
if values[1] != "function" and blockname == "": |
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
131 |
dialog = wx.TextEntryDialog(self.ParentWindow.ParentWindow, "Block name", "Please enter a block name", "", wx.OK|wx.CANCEL|wx.CENTRE) |
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
132 |
if dialog.ShowModal() == wx.ID_OK: |
218 | 133 |
blockname = dialog.GetValue() |
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
134 |
else: |
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
135 |
return |
218 | 136 |
dialog.Destroy() |
249 | 137 |
if blockname.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
218 | 138 |
message = "\"%s\" pou already exists!"%blockname |
249 | 139 |
elif blockname.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(self.ParentWindow.GetTagName(), self.ParentWindow.Debug)]: |
218 | 140 |
message = "\"%s\" element for this pou already exists!"%blockname |
141 |
else: |
|
142 |
id = self.ParentWindow.GetNewId() |
|
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
143 |
block = FBD_Block(self.ParentWindow, values[0], blockname, id, inputs = blockinputs) |
218 | 144 |
width, height = block.GetMinSize() |
145 |
if scaling is not None: |
|
146 |
x = round(float(x) / float(scaling[0])) * scaling[0] |
|
147 |
y = round(float(y) / float(scaling[1])) * scaling[1] |
|
148 |
width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0] |
|
149 |
height = round(float(height) / float(scaling[1]) + 0.5) * scaling[1] |
|
150 |
block.SetPosition(x, y) |
|
151 |
block.SetSize(width, height) |
|
152 |
self.ParentWindow.AddBlock(block) |
|
153 |
self.ParentWindow.Controler.AddEditedElementBlock(self.ParentWindow.GetTagName(), id, values[0], blockname) |
|
154 |
self.ParentWindow.RefreshBlockModel(block) |
|
155 |
self.ParentWindow.RefreshBuffer() |
|
156 |
self.ParentWindow.RefreshScrollBars() |
|
249 | 157 |
self.ParentWindow.RefreshVisibleElements() |
218 | 158 |
self.ParentWindow.ParentWindow.RefreshVariablePanel(self.ParentWindow.GetTagName()) |
159 |
self.ParentWindow.Refresh(False) |
|
160 |
elif values[1] != "location": |
|
297
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
161 |
tagname = self.ParentWindow.GetTagName() |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
162 |
if values[3] == tagname: |
218 | 163 |
if values[1] == "Output": |
297
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
164 |
var_class = OUTPUT |
218 | 165 |
elif values[1] == "InOut": |
297
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
166 |
var_class = INPUT |
218 | 167 |
else: |
297
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
168 |
var_class = INPUT |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
169 |
tree = dict([(var["Name"], var["Tree"]) for var in self.ParentWindow.Controler.GetEditedElementInterfaceVars(tagname, self.ParentWindow.Debug)]).get(values[0], None) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
170 |
if tree is not None: |
302
43e10dccc16a
Bug while drag and drop simple variables poping menu fixed
lbessard
parents:
299
diff
changeset
|
171 |
if len(tree[0]) > 0: |
297
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
172 |
menu = wx.Menu(title='') |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
173 |
self.GenerateTreeMenu(x, y, scaling, menu, "", var_class, [(values[0], values[2], tree)]) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
174 |
self.ParentWindow.PopupMenuXY(menu) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
175 |
else: |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
176 |
self.AddParentVariableBlock(x, y, scaling, var_class, values[0], values[2]) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
177 |
else: |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
178 |
message = "Unknown variable \"%s\" this POU!" % values[0] |
121 | 179 |
else: |
218 | 180 |
message = "Variable don't belong to this POU!" |
249 | 181 |
if message is not None: |
182 |
wx.CallAfter(self.ShowMessage, message) |
|
218 | 183 |
|
297
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
184 |
def GenerateTreeMenu(self, x, y, scaling, menu, base_path, var_class, tree): |
299
15669fe26e56
Adding support for generating real array dimension in variable blocks
lbessard
parents:
297
diff
changeset
|
185 |
for child_name, child_type, (child_tree, child_dimensions) in tree: |
297
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
186 |
if base_path: |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
187 |
child_path = "%s.%s" % (base_path, child_name) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
188 |
else: |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
189 |
child_path = child_name |
299
15669fe26e56
Adding support for generating real array dimension in variable blocks
lbessard
parents:
297
diff
changeset
|
190 |
if len(child_dimensions) > 0: |
15669fe26e56
Adding support for generating real array dimension in variable blocks
lbessard
parents:
297
diff
changeset
|
191 |
child_path += "[%s]" % ",".join([str(dimension[0]) for dimension in child_dimensions]) |
297
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
192 |
child_name += "[]" |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
193 |
new_id = wx.NewId() |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
194 |
AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=child_name) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
195 |
self.ParentWindow.Bind(wx.EVT_MENU, self.GetAddVariableBlockFunction(x, y, scaling, var_class, child_path, child_type), id=new_id) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
196 |
if len(child_tree) > 0: |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
197 |
new_id = wx.NewId() |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
198 |
child_menu = wx.Menu(title='') |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
199 |
self.GenerateTreeMenu(x, y, scaling, child_menu, child_path, var_class, child_tree) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
200 |
menu.AppendMenu(new_id, "%s." % child_name, child_menu) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
201 |
|
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
202 |
def GetAddVariableBlockFunction(self, x, y, scaling, var_class, var_name, var_type): |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
203 |
def AddVariableFunction(event): |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
204 |
self.AddParentVariableBlock(x, y, scaling, var_class, var_name, var_type) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
205 |
return AddVariableFunction |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
206 |
|
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
207 |
def AddParentVariableBlock(self, x, y, scaling, var_class, var_name, var_type): |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
208 |
id = self.ParentWindow.GetNewId() |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
209 |
variable = FBD_Variable(self.ParentWindow, var_class, var_name, var_type, id) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
210 |
width, height = variable.GetMinSize() |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
211 |
if scaling is not None: |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
212 |
x = round(float(x) / float(scaling[0])) * scaling[0] |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
213 |
y = round(float(y) / float(scaling[1])) * scaling[1] |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
214 |
width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0] |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
215 |
height = round(float(height) / float(scaling[1]) + 0.5) * scaling[1] |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
216 |
variable.SetPosition(x, y) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
217 |
variable.SetSize(width, height) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
218 |
self.ParentWindow.AddBlock(variable) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
219 |
self.ParentWindow.Controler.AddEditedElementVariable(self.ParentWindow.GetTagName(), id, var_class) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
220 |
self.ParentWindow.RefreshVariableModel(variable) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
221 |
self.ParentWindow.RefreshBuffer() |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
222 |
self.ParentWindow.RefreshScrollBars() |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
223 |
self.ParentWindow.RefreshVisibleElements() |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
224 |
self.ParentWindow.Refresh(False) |
e837b67cb184
Adding help menu for inserting complex variable in graphical viewer
lbessard
parents:
292
diff
changeset
|
225 |
|
218 | 226 |
def ShowMessage(self, message): |
249 | 227 |
message = wx.MessageDialog(self.ParentWindow, message, "Error", wx.OK|wx.ICON_ERROR) |
228 |
message.ShowModal() |
|
229 |
message.Destroy() |
|
235
7b58a3b5b6ec
Change in layout from AuiMDIParentFrame to AuiNotebook
lbessard
parents:
231
diff
changeset
|
230 |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
231 |
|
0 | 232 |
""" |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
233 |
Class that implements a Viewer based on a wx.ScrolledWindow for drawing and |
0 | 234 |
manipulating graphic elements |
235 |
""" |
|
236 |
||
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
237 |
class Viewer(wx.ScrolledWindow, DebugViewer): |
0 | 238 |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
239 |
if wx.VERSION < (2, 6, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
240 |
def Bind(self, event, function, id = None): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
241 |
if id is not None: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
242 |
event(self, id, function) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
243 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
244 |
event(self, function) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
245 |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
246 |
# Create Alignment Menu items |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
247 |
def _init_coll_AlignmentMenu_Items(self, parent): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
248 |
# Create menu items |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
249 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS0, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
250 |
kind=wx.ITEM_NORMAL, text=u'Left') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
251 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS1, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
252 |
kind=wx.ITEM_NORMAL, text=u'Center') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
253 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS2, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
254 |
kind=wx.ITEM_NORMAL, text=u'Right') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
255 |
parent.AppendSeparator() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
256 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS4, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
257 |
kind=wx.ITEM_NORMAL, text=u'Top') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
258 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS5, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
259 |
kind=wx.ITEM_NORMAL, text=u'Middle') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
260 |
AppendMenu(parent, help='', id=ID_VIEWERALIGNMENTMENUITEMS6, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
261 |
kind=wx.ITEM_NORMAL, text=u'Bottom') |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
262 |
# Link menu event to corresponding called functions |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
263 |
self.Bind(wx.EVT_MENU, self.OnAlignLeftMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
264 |
id=ID_VIEWERALIGNMENTMENUITEMS0) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
265 |
self.Bind(wx.EVT_MENU, self.OnAlignCenterMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
266 |
id=ID_VIEWERALIGNMENTMENUITEMS1) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
267 |
self.Bind(wx.EVT_MENU, self.OnAlignRightMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
268 |
id=ID_VIEWERALIGNMENTMENUITEMS2) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
269 |
self.Bind(wx.EVT_MENU, self.OnAlignTopMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
270 |
id=ID_VIEWERALIGNMENTMENUITEMS4) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
271 |
self.Bind(wx.EVT_MENU, self.OnAlignMiddleMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
272 |
id=ID_VIEWERALIGNMENTMENUITEMS5) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
273 |
self.Bind(wx.EVT_MENU, self.OnAlignBottomMenu, |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
274 |
id=ID_VIEWERALIGNMENTMENUITEMS6) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
275 |
|
0 | 276 |
# Create Contextual Menu items |
277 |
def _init_coll_ContextualMenu_Items(self, parent): |
|
278 |
# Create menu items |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
279 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS0, |
0 | 280 |
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
|
281 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS1, |
0 | 282 |
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
|
283 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS2, |
0 | 284 |
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
|
285 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS3, |
0 | 286 |
kind=wx.ITEM_RADIO, text=u'Falling Edge') |
287 |
parent.AppendSeparator() |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
288 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS5, |
0 | 289 |
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
|
290 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS6, |
0 | 291 |
kind=wx.ITEM_NORMAL, text=u'Delete Wire Segment') |
292 |
parent.AppendSeparator() |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
293 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS8, |
0 | 294 |
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
|
295 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS9, |
0 | 296 |
kind=wx.ITEM_NORMAL, text=u'Delete Divergence Branch') |
297 |
parent.AppendSeparator() |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
298 |
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
|
299 |
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
|
300 |
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
|
301 |
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
|
302 |
parent.AppendSeparator() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
303 |
parent.AppendMenu(ID_VIEWERCONTEXTUALMENUITEMS14, "Alignment", self.AlignmentMenu) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
304 |
parent.AppendSeparator() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
305 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS16, |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
306 |
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
|
307 |
AppendMenu(parent, help='', id=ID_VIEWERCONTEXTUALMENUITEMS17, |
0 | 308 |
kind=wx.ITEM_NORMAL, text=u'Delete') |
309 |
# Link menu event to corresponding called functions |
|
310 |
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
|
311 |
id=ID_VIEWERCONTEXTUALMENUITEMS0) |
0 | 312 |
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
|
313 |
id=ID_VIEWERCONTEXTUALMENUITEMS1) |
0 | 314 |
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
|
315 |
id=ID_VIEWERCONTEXTUALMENUITEMS2) |
0 | 316 |
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
|
317 |
id=ID_VIEWERCONTEXTUALMENUITEMS3) |
0 | 318 |
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
|
319 |
id=ID_VIEWERCONTEXTUALMENUITEMS5) |
0 | 320 |
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
|
321 |
id=ID_VIEWERCONTEXTUALMENUITEMS6) |
0 | 322 |
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
|
323 |
id=ID_VIEWERCONTEXTUALMENUITEMS8) |
0 | 324 |
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
|
325 |
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
|
326 |
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
|
327 |
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
|
328 |
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
|
329 |
id=ID_VIEWERCONTEXTUALMENUITEMS12) |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
330 |
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
|
331 |
id=ID_VIEWERCONTEXTUALMENUITEMS16) |
0 | 332 |
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
|
333 |
id=ID_VIEWERCONTEXTUALMENUITEMS17) |
0 | 334 |
|
335 |
# Create and initialize Contextual Menu |
|
336 |
def _init_menus(self): |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
337 |
self.AlignmentMenu = wx.Menu(title='') |
0 | 338 |
self.ContextualMenu = wx.Menu(title='') |
339 |
||
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
340 |
self._init_coll_AlignmentMenu_Items(self.AlignmentMenu) |
0 | 341 |
self._init_coll_ContextualMenu_Items(self.ContextualMenu) |
342 |
||
343 |
# Create a new Viewer |
|
249 | 344 |
def __init__(self, parent, tagname, window, controler, debug = False, instancepath = ""): |
80 | 345 |
wx.ScrolledWindow.__init__(self, parent, pos=wx.Point(0, 0), size=wx.Size(0, 0), |
319 | 346 |
style=wx.HSCROLL | wx.VSCROLL | wx.ALWAYS_SHOW_SB) |
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
347 |
DebugViewer.__init__(self, controler, debug) |
0 | 348 |
self._init_menus() |
349 |
# Adding a rubberband to Viewer |
|
350 |
self.rubberBand = RubberBand(drawingSurface=self) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
351 |
self.SetBackgroundColour(wx.Colour(255,255,255)) |
224
e5bf78b847e1
Bug with AutoBufferedPaintDC and Background style fixed
lbessard
parents:
222
diff
changeset
|
352 |
self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM) |
0 | 353 |
self.ResetView() |
354 |
self.Scaling = None |
|
355 |
self.DrawGrid = True |
|
145 | 356 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
213 | 357 |
self.PageSize = None |
358 |
self.PagePen = wx.TRANSPARENT_PEN |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
359 |
self.DrawingWire = False |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
360 |
self.current_id = 0 |
121 | 361 |
self.TagName = tagname |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
362 |
self.Errors = [] |
249 | 363 |
self.InstancePath = instancepath |
319 | 364 |
self.StartMousePos = None |
365 |
self.StartScreenPos = None |
|
0 | 366 |
|
42 | 367 |
# Initialize Block, Wire and Comment numbers |
368 |
self.block_id = self.wire_id = self.comment_id = 0 |
|
369 |
||
0 | 370 |
# Initialize Viewer mode to Selection mode |
371 |
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
|
372 |
self.SavedMode = False |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
373 |
self.CurrentLanguage = "FBD" |
0 | 374 |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
375 |
self.ParentWindow = window |
0 | 376 |
self.Controler = controler |
377 |
||
249 | 378 |
if not self.Debug: |
379 |
self.SetDropTarget(ViewerDropTarget(self)) |
|
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
380 |
|
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
381 |
self.NewDataRefreshRect = None |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
382 |
|
156 | 383 |
dc = wx.ClientDC(self) |
213 | 384 |
font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["mono"]) |
165 | 385 |
dc.SetFont(font) |
158 | 386 |
width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ") |
387 |
while width > 260: |
|
157 | 388 |
faces["size"] -= 1 |
213 | 389 |
font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["mono"]) |
165 | 390 |
dc.SetFont(font) |
158 | 391 |
width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ") |
165 | 392 |
self.SetFont(font) |
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
393 |
self.MiniTextDC = wx.MemoryDC() |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
394 |
self.MiniTextDC.SetFont(wx.Font(faces["size"] * 0.75, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["helv"])) |
156 | 395 |
|
332 | 396 |
self.SetScale(len(ZOOM_FACTORS) / 2) |
397 |
||
249 | 398 |
self.ResetView() |
399 |
||
0 | 400 |
# Link Viewer event to corresponding methods |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
401 |
self.Bind(wx.EVT_PAINT, self.OnPaint) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
402 |
self.Bind(wx.EVT_LEFT_DOWN, self.OnViewerLeftDown) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
403 |
self.Bind(wx.EVT_LEFT_UP, self.OnViewerLeftUp) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
404 |
self.Bind(wx.EVT_LEFT_DCLICK, self.OnViewerLeftDClick) |
145 | 405 |
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
|
406 |
self.Bind(wx.EVT_RIGHT_UP, self.OnViewerRightUp) |
319 | 407 |
self.Bind(wx.EVT_MIDDLE_DOWN, self.OnViewerMiddleDown) |
408 |
self.Bind(wx.EVT_MIDDLE_UP, self.OnViewerMiddleUp) |
|
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
409 |
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
|
410 |
self.Bind(wx.EVT_MOTION, self.OnViewerMotion) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
411 |
self.Bind(wx.EVT_CHAR, self.OnChar) |
249 | 412 |
self.Bind(wx.EVT_SCROLLWIN, self.OnScrollWindow) |
319 | 413 |
self.Bind(wx.EVT_SCROLLWIN_THUMBRELEASE, self.OnScrollStop) |
253 | 414 |
self.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheelWindow) |
144 | 415 |
self.Bind(wx.EVT_SIZE, self.OnMoveWindow) |
416 |
||
417 |
def GetScrolledRect(self, rect): |
|
323 | 418 |
rect.x, rect.y = self.CalcScrolledPosition(int(rect.x * self.ViewScale[0]), |
419 |
int(rect.y * self.ViewScale[1])) |
|
420 |
rect.width = int(rect.width * self.ViewScale[0]) + 2 |
|
421 |
rect.height = int(rect.height * self.ViewScale[1]) + 2 |
|
144 | 422 |
return rect |
0 | 423 |
|
145 | 424 |
def GetScaling(self): |
425 |
return self.Scaling |
|
426 |
||
121 | 427 |
def SetTagName(self, tagname): |
428 |
self.TagName = tagname |
|
429 |
||
430 |
def GetTagName(self): |
|
431 |
return self.TagName |
|
432 |
||
249 | 433 |
def GetInstancePath(self): |
434 |
return self.InstancePath |
|
435 |
||
121 | 436 |
def IsViewing(self, tagname): |
249 | 437 |
if self.Debug: |
438 |
return self.InstancePath == tagname |
|
439 |
else: |
|
440 |
return self.TagName == tagname |
|
121 | 441 |
|
0 | 442 |
# Returns a new id |
443 |
def GetNewId(self): |
|
444 |
self.current_id += 1 |
|
445 |
return self.current_id |
|
446 |
||
447 |
# Destructor |
|
448 |
def __del__(self): |
|
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
449 |
DebugViewer.__del__(self) |
249 | 450 |
self.Flush() |
0 | 451 |
self.ResetView() |
323 | 452 |
|
332 | 453 |
def SetScale(self, scale_number): |
454 |
self.CurrentScale = max(0, min(scale_number, len(ZOOM_FACTORS) - 1)) |
|
455 |
self.ViewScale = (ZOOM_FACTORS[self.CurrentScale], ZOOM_FACTORS[self.CurrentScale]) |
|
323 | 456 |
self.RefreshScaling() |
0 | 457 |
|
332 | 458 |
def GetScale(self): |
459 |
return self.CurrentScale |
|
460 |
||
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
461 |
def GetLogicalDC(self, buffered=False): |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
462 |
if buffered: |
352 | 463 |
bitmap = wx.EmptyBitmap(*self.GetClientSize()) |
464 |
dc = wx.MemoryDC(bitmap) |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
465 |
else: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
466 |
dc = wx.ClientDC(self) |
165 | 467 |
dc.SetFont(self.GetFont()) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
468 |
if wx.VERSION >= (2, 6, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
469 |
self.DoPrepareDC(dc) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
470 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
471 |
self.PrepareDC(dc) |
323 | 472 |
dc.SetUserScale(self.ViewScale[0], self.ViewScale[1]) |
27 | 473 |
return dc |
474 |
||
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
475 |
def GetMiniTextExtent(self, text): |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
476 |
return self.MiniTextDC.GetTextExtent(text) |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
477 |
|
253 | 478 |
def GetMiniFont(self): |
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
479 |
return self.MiniTextDC.GetFont() |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
480 |
|
0 | 481 |
#------------------------------------------------------------------------------- |
42 | 482 |
# Element management functions |
483 |
#------------------------------------------------------------------------------- |
|
484 |
||
485 |
def AddBlock(self, block): |
|
486 |
self.block_id += 1 |
|
487 |
self.Blocks[block] = self.block_id |
|
488 |
||
489 |
def AddWire(self, wire): |
|
490 |
self.wire_id += 1 |
|
491 |
self.Wires[wire] = self.wire_id |
|
492 |
||
493 |
def AddComment(self, comment): |
|
494 |
self.comment_id += 1 |
|
495 |
self.Comments[comment] = self.comment_id |
|
496 |
||
497 |
def IsBlock(self, block): |
|
498 |
return self.Blocks.get(block, False) |
|
499 |
||
500 |
def IsWire(self, wire): |
|
501 |
return self.Wires.get(wire, False) |
|
502 |
||
503 |
def IsComment(self, comment): |
|
504 |
return self.Comments.get(comment, False) |
|
505 |
||
506 |
def RemoveBlock(self, block): |
|
507 |
self.Blocks.pop(block) |
|
508 |
||
509 |
def RemoveWire(self, wire): |
|
510 |
self.Wires.pop(wire) |
|
511 |
||
512 |
def RemoveComment(self, comment): |
|
513 |
self.Comments.pop(comment) |
|
514 |
||
515 |
def GetElements(self, sort_blocks=False, sort_wires=False, sort_comments=False): |
|
516 |
blocks = self.Blocks.keys() |
|
517 |
wires = self.Wires.keys() |
|
518 |
comments = self.Comments.keys() |
|
519 |
if sort_blocks: |
|
283 | 520 |
blocks.sort(lambda x, y: cmp(self.Blocks[x], self.Blocks[y])) |
42 | 521 |
if sort_wires: |
283 | 522 |
wires.sort(lambda x, y: cmp(self.Wires[x], self.Wires[y])) |
42 | 523 |
if sort_comments: |
283 | 524 |
comments.sort(lambda x, y: cmp(self.Comments[x], self.Comments[y])) |
42 | 525 |
return blocks + wires + comments |
526 |
||
249 | 527 |
def RefreshVisibleElements(self, xp = None, yp = None): |
528 |
x, y = self.CalcUnscrolledPosition(0, 0) |
|
529 |
if xp is not None: |
|
530 |
x = xp * self.GetScrollPixelsPerUnit()[0] |
|
531 |
if yp is not None: |
|
532 |
y = yp * self.GetScrollPixelsPerUnit()[1] |
|
533 |
width, height = self.GetClientSize() |
|
323 | 534 |
screen = wx.Rect(int(x / self.ViewScale[0]), int(y / self.ViewScale[1]), |
535 |
int(width / self.ViewScale[0]), int(height / self.ViewScale[1])) |
|
249 | 536 |
for comment in self.Comments: |
537 |
comment.TestVisible(screen) |
|
538 |
for wire in self.Wires: |
|
539 |
wire.TestVisible(screen) |
|
540 |
for block in self.Blocks: |
|
541 |
block.TestVisible(screen) |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
542 |
|
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
543 |
def GetElementIECPath(self, element): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
544 |
iec_path = None |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
545 |
if isinstance(element, Wire) and element.EndConnected is not None: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
546 |
block = element.EndConnected.GetParentBlock() |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
547 |
if isinstance(block, FBD_Block): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
548 |
blockname = block.GetName() |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
549 |
connectorname = element.EndConnected.GetName() |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
550 |
if blockname != "": |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
551 |
iec_path = "%s.%s.%s"%(self.InstancePath, blockname, connectorname) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
552 |
else: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
553 |
if connectorname == "": |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
554 |
iec_path = "%s.%s%d"%(self.InstancePath, block.GetType(), block.GetId()) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
555 |
else: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
556 |
iec_path = "%s.%s%d_%s"%(self.InstancePath, block.GetType(), block.GetId(), connectorname) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
557 |
elif isinstance(block, FBD_Variable): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
558 |
iec_path = "%s.%s"%(self.InstancePath, block.GetName()) |
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
559 |
elif isinstance(element, LD_Contact): |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
560 |
iec_path = "%s.%s"%(self.InstancePath, element.GetName()) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
561 |
elif isinstance(element, SFC_Step): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
562 |
iec_path = "%s.%s.X"%(self.InstancePath, element.GetName()) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
563 |
elif isinstance(element, SFC_Transition): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
564 |
connectors = element.GetConnectors() |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
565 |
previous_steps = self.GetPreviousSteps(connectors["input"]) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
566 |
next_steps = self.GetNextSteps(connectors["output"]) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
567 |
iec_path = "%s.%s->%s"%(self.InstancePath, ",".join(previous_steps), ",".join(next_steps)) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
568 |
return iec_path |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
569 |
|
42 | 570 |
#------------------------------------------------------------------------------- |
0 | 571 |
# Reset functions |
572 |
#------------------------------------------------------------------------------- |
|
573 |
||
574 |
# Resets Viewer lists |
|
575 |
def ResetView(self): |
|
42 | 576 |
self.Blocks = {} |
577 |
self.Wires = {} |
|
578 |
self.Comments = {} |
|
249 | 579 |
self.Subscribed = {} |
0 | 580 |
self.SelectedElement = None |
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
581 |
self.HighlightedElement = None |
0 | 582 |
|
249 | 583 |
def Flush(self): |
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
584 |
self.DeleteDataConsumers() |
249 | 585 |
for block in self.Blocks: |
586 |
block.Flush() |
|
587 |
||
47
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
588 |
# Remove all elements |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
589 |
def CleanView(self): |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
590 |
for block in self.Blocks.keys(): |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
591 |
block.Clean() |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
592 |
self.ResetView() |
2b2f8d88e6d3
Interface changed to show pou interface at the bottom of the window
lbessard
parents:
45
diff
changeset
|
593 |
|
0 | 594 |
# Changes Viewer mode |
595 |
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
|
596 |
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
|
597 |
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
|
598 |
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
|
599 |
else: |
86ccc89d7b0b
FBD Blocks and Variables can now be modified and wires can't be unconnected on both sides
lbessard
parents:
2
diff
changeset
|
600 |
self.SavedMode = True |
0 | 601 |
# 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
|
602 |
if self.Mode != MODE_SELECTION and self.SelectedElement: |
0 | 603 |
self.SelectedElement.SetSelected(False) |
604 |
self.SelectedElement = None |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
605 |
|
27 | 606 |
# Return current drawing mode |
607 |
def GetDrawingMode(self): |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
608 |
return self.ParentWindow.GetDrawingMode() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
609 |
|
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
610 |
# Buffer the last model state |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
611 |
def RefreshBuffer(self): |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
612 |
self.Controler.BufferProject() |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
613 |
self.ParentWindow.RefreshTitle() |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
614 |
self.ParentWindow.RefreshEditMenu() |
27 | 615 |
|
145 | 616 |
# Refresh the current scaling |
617 |
def RefreshScaling(self, refresh=True): |
|
249 | 618 |
properties = self.Controler.GetProjectProperties(self.Debug) |
145 | 619 |
scaling = properties["scaling"][self.CurrentLanguage] |
620 |
if scaling != (0, 0): |
|
621 |
self.Scaling = scaling |
|
622 |
if self.DrawGrid: |
|
323 | 623 |
width = max(2, int(scaling[0] * self.ViewScale[0])) |
624 |
height = max(2, int(scaling[1] * self.ViewScale[1])) |
|
625 |
bitmap = wx.EmptyBitmap(width, height) |
|
145 | 626 |
dc = wx.MemoryDC(bitmap) |
627 |
dc.SetBackground(wx.Brush(self.GetBackgroundColour())) |
|
628 |
dc.Clear() |
|
629 |
dc.SetPen(wx.Pen(wx.Colour(180, 180, 180))) |
|
630 |
dc.DrawPoint(0, 0) |
|
631 |
self.GridBrush = wx.BrushFromBitmap(bitmap) |
|
632 |
else: |
|
633 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
|
634 |
else: |
|
635 |
self.Scaling = None |
|
636 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
|
213 | 637 |
page_size = properties["pageSize"] |
638 |
if page_size != (0, 0): |
|
639 |
self.PageSize = map(int, page_size) |
|
640 |
self.PagePen = wx.Pen(wx.Colour(180, 180, 180)) |
|
641 |
else: |
|
642 |
self.PageSize = None |
|
643 |
self.PagePen = wx.TRANSPARENT_PEN |
|
145 | 644 |
if refresh: |
155 | 645 |
self.Refresh(False) |
145 | 646 |
|
647 |
||
0 | 648 |
#------------------------------------------------------------------------------- |
649 |
# Refresh functions |
|
650 |
#------------------------------------------------------------------------------- |
|
651 |
||
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
652 |
def UpdateRefreshRect(self, refresh_rect): |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
653 |
if self.NewDataRefreshRect is None: |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
654 |
self.NewDataRefreshRect = refresh_rect |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
655 |
else: |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
656 |
self.NewDataRefreshRect.Union(refresh_rect) |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
657 |
|
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
658 |
def RefreshNewData(self): |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
659 |
if self.NewDataRefreshRect is not None: |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
660 |
refresh_rect, self.NewDataRefreshRect = self.NewDataRefreshRect, None |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
661 |
self.RefreshRect(self.GetScrolledRect(refresh_rect), False) |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
662 |
DebugViewer.RefreshNewData(self) |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
663 |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
664 |
def ResetBuffer(self): |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
665 |
pass |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
666 |
|
0 | 667 |
# Refresh Viewer elements |
668 |
def RefreshView(self): |
|
669 |
self.current_id = 0 |
|
670 |
# Start by reseting Viewer |
|
249 | 671 |
self.Flush() |
0 | 672 |
self.ResetView() |
249 | 673 |
instance = {} |
0 | 674 |
# List of ids of already loaded blocks |
675 |
ids = [] |
|
676 |
# Load Blocks until they are all loaded |
|
249 | 677 |
while instance is not None: |
678 |
instance = self.Controler.GetEditedElementInstanceInfos(self.TagName, exclude = ids, debug = self.Debug) |
|
679 |
if instance is not None: |
|
0 | 680 |
self.loadInstance(instance, ids) |
42 | 681 |
self.RefreshScrollBars() |
121 | 682 |
|
683 |
for wire in self.Wires: |
|
684 |
if not wire.IsConnectedCompatible(): |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
685 |
wire.SetValid(False) |
249 | 686 |
if self.Debug: |
687 |
block = wire.EndConnected.GetParentBlock() |
|
688 |
if isinstance(block, LD_PowerRail): |
|
689 |
wire.SetValue(True) |
|
690 |
if isinstance(block, FBD_Block): |
|
691 |
blockname = block.GetName() |
|
692 |
connectorname = wire.EndConnected.GetName() |
|
693 |
if blockname != "": |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
694 |
iec_path = "%s.%s.%s"%(self.InstancePath, blockname, connectorname) |
249 | 695 |
else: |
696 |
if connectorname == "": |
|
279
2ad276084038
Bug involving possible name conflict between return value and ouputs fixed
lbessard
parents:
277
diff
changeset
|
697 |
iec_path = "%s.%s%d"%(self.InstancePath, block.GetType(), block.GetId()) |
2ad276084038
Bug involving possible name conflict between return value and ouputs fixed
lbessard
parents:
277
diff
changeset
|
698 |
else: |
2ad276084038
Bug involving possible name conflict between return value and ouputs fixed
lbessard
parents:
277
diff
changeset
|
699 |
iec_path = "%s.%s%d_%s"%(self.InstancePath, block.GetType(), block.GetId(), connectorname) |
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
700 |
if self.AddDataConsumer(iec_path.upper(), wire) is None: |
253 | 701 |
wire.SetValue("undefined") |
702 |
elif isinstance(block, FBD_Variable): |
|
703 |
iec_path = "%s.%s"%(self.InstancePath, block.GetName()) |
|
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
704 |
if self.AddDataConsumer(iec_path.upper(), wire) is None: |
253 | 705 |
wire.SetValue("undefined") |
706 |
elif isinstance(block, FBD_Connector): |
|
707 |
wire.SetValue("undefined") |
|
249 | 708 |
|
709 |
if self.Debug: |
|
710 |
for block in self.Blocks.keys(): |
|
253 | 711 |
block.SpreadCurrent() |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
712 |
iec_path = self.GetElementIECPath(block) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
713 |
if iec_path is not None: |
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
714 |
self.AddDataConsumer(iec_path.upper(), block) |
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
715 |
|
249 | 716 |
self.RefreshVisibleElements() |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
717 |
self.ShowErrors() |
155 | 718 |
self.Refresh(False) |
0 | 719 |
|
253 | 720 |
def GetPreviousSteps(self, connector): |
721 |
steps = [] |
|
722 |
for wire, handle in connector.GetWires(): |
|
723 |
previous = wire.GetOtherConnected(connector).GetParentBlock() |
|
724 |
if isinstance(previous, SFC_Step): |
|
725 |
steps.append(previous.GetName()) |
|
726 |
elif isinstance(previous, SFC_Divergence) and previous.GetType() in [SIMULTANEOUS_CONVERGENCE, SELECTION_DIVERGENCE]: |
|
727 |
connectors = previous.GetConnectors() |
|
728 |
for input in connectors["inputs"]: |
|
729 |
steps.extend(self.GetPreviousSteps(input)) |
|
730 |
return steps |
|
731 |
||
732 |
def GetNextSteps(self, connector): |
|
733 |
steps = [] |
|
734 |
for wire, handle in connector.GetWires(): |
|
735 |
next = wire.GetOtherConnected(connector).GetParentBlock() |
|
736 |
if isinstance(next, SFC_Step): |
|
737 |
steps.append(next.GetName()) |
|
738 |
elif isinstance(next, SFC_Jump): |
|
739 |
steps.append(next.GetTarget()) |
|
740 |
elif isinstance(next, SFC_Divergence) and next.GetType() in [SIMULTANEOUS_DIVERGENCE, SELECTION_CONVERGENCE]: |
|
741 |
connectors = next.GetConnectors() |
|
742 |
for output in connectors["outputs"]: |
|
743 |
steps.extend(self.GetNextSteps(output)) |
|
744 |
return steps |
|
745 |
||
213 | 746 |
def GetMaxSize(self): |
27 | 747 |
maxx = maxy = 0 |
42 | 748 |
for element in self.GetElements(): |
144 | 749 |
bbox = element.GetBoundingBox() |
750 |
maxx = max(maxx, bbox.x + bbox.width) |
|
751 |
maxy = max(maxy, bbox.y + bbox.height) |
|
213 | 752 |
return maxx, maxy |
753 |
||
319 | 754 |
def RefreshScrollBars(self, width_incr=0, height_incr=0): |
213 | 755 |
xstart, ystart = self.GetViewStart() |
756 |
window_size = self.GetClientSize() |
|
757 |
maxx, maxy = self.GetMaxSize() |
|
323 | 758 |
maxx = max(maxx + WINDOW_BORDER, (xstart * SCROLLBAR_UNIT + window_size[0]) / self.ViewScale[0]) |
759 |
maxy = max(maxy + WINDOW_BORDER, (ystart * SCROLLBAR_UNIT + window_size[1]) / self.ViewScale[1]) |
|
27 | 760 |
if self.rubberBand.IsShown(): |
761 |
extent = self.rubberBand.GetCurrentExtent() |
|
762 |
maxx = max(maxx, extent.x + extent.width) |
|
763 |
maxy = max(maxy, extent.y + extent.height) |
|
323 | 764 |
maxx = int(maxx * self.ViewScale[0]) |
765 |
maxy = int(maxy * self.ViewScale[1]) |
|
27 | 766 |
self.SetScrollbars(SCROLLBAR_UNIT, SCROLLBAR_UNIT, |
319 | 767 |
round(maxx / SCROLLBAR_UNIT) + width_incr, round(maxy / SCROLLBAR_UNIT) + height_incr, |
213 | 768 |
xstart, ystart, True) |
95 | 769 |
|
0 | 770 |
# Load instance from given informations |
771 |
def loadInstance(self, instance, ids): |
|
772 |
ids.append(instance["id"]) |
|
773 |
self.current_id = max(self.current_id, instance["id"]) |
|
774 |
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
|
775 |
variable = FBD_Variable(self, INPUT, instance["name"], instance["value_type"], instance["id"], instance["executionOrder"]) |
0 | 776 |
variable.SetPosition(instance["x"], instance["y"]) |
777 |
variable.SetSize(instance["width"], instance["height"]) |
|
42 | 778 |
self.AddBlock(variable) |
0 | 779 |
connectors = variable.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
780 |
connectors["output"].SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 781 |
if instance["connector"]["negated"]: |
782 |
connectors["output"].SetNegated(True) |
|
783 |
if instance["connector"]["edge"]: |
|
784 |
connectors["output"].SetEdge(instance["connector"]["edge"]) |
|
785 |
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
|
786 |
variable = FBD_Variable(self, OUTPUT, instance["name"], instance["value_type"], instance["id"], instance["executionOrder"]) |
0 | 787 |
variable.SetPosition(instance["x"], instance["y"]) |
788 |
variable.SetSize(instance["width"], instance["height"]) |
|
42 | 789 |
self.AddBlock(variable) |
0 | 790 |
connectors = variable.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
791 |
connectors["input"].SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 792 |
if instance["connector"]["negated"]: |
793 |
connectors["input"].SetNegated(True) |
|
794 |
if instance["connector"]["edge"]: |
|
795 |
connectors["input"].SetEdge(instance["connector"]["edge"]) |
|
796 |
self.CreateWires(connectors["input"], instance["connector"]["links"], ids) |
|
797 |
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
|
798 |
variable = FBD_Variable(self, INOUT, instance["name"], instance["value_type"], instance["id"], instance["executionOrder"]) |
0 | 799 |
variable.SetPosition(instance["x"], instance["y"]) |
800 |
variable.SetSize(instance["width"], instance["height"]) |
|
42 | 801 |
self.AddBlock(variable) |
0 | 802 |
connectors = variable.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
803 |
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
|
804 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 805 |
if instance["connectors"]["output"]["negated"]: |
806 |
connectors["output"].SetNegated(True) |
|
807 |
if instance["connectors"]["output"]["edge"]: |
|
808 |
connectors["output"].SetEdge(instance["connectors"]["output"]["edge"]) |
|
809 |
if instance["connectors"]["input"]["negated"]: |
|
810 |
connectors["input"].SetNegated(True) |
|
811 |
if instance["connectors"]["input"]["edge"]: |
|
812 |
connectors["input"].SetEdge(instance["connectors"]["input"]["edge"]) |
|
813 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
|
814 |
elif instance["type"] == "continuation": |
|
815 |
connection = FBD_Connector(self, CONTINUATION, instance["name"], instance["id"]) |
|
816 |
connection.SetPosition(instance["x"], instance["y"]) |
|
817 |
connection.SetSize(instance["width"], instance["height"]) |
|
42 | 818 |
self.AddBlock(connection) |
0 | 819 |
connector = connection.GetConnector() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
820 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 821 |
elif instance["type"] == "connection": |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
822 |
connection = FBD_Connector(self, CONNECTOR, instance["name"], instance["id"]) |
0 | 823 |
connection.SetPosition(instance["x"], instance["y"]) |
824 |
connection.SetSize(instance["width"], instance["height"]) |
|
42 | 825 |
self.AddBlock(connection) |
0 | 826 |
connector = connection.GetConnector() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
827 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 828 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
829 |
elif instance["type"] == "comment": |
|
830 |
comment = Comment(self, instance["content"], instance["id"]) |
|
831 |
comment.SetPosition(instance["x"], instance["y"]) |
|
832 |
comment.SetSize(instance["width"], instance["height"]) |
|
42 | 833 |
self.AddComment(comment) |
0 | 834 |
elif instance["type"] == "leftPowerRail": |
835 |
leftpowerrail = LD_PowerRail(self, LEFTRAIL, instance["id"], [True for i in range(len(instance["connectors"]))]) |
|
836 |
leftpowerrail.SetPosition(instance["x"], instance["y"]) |
|
80 | 837 |
leftpowerrail.SetSize(instance["width"], instance["height"]) |
42 | 838 |
self.AddBlock(leftpowerrail) |
0 | 839 |
connectors = leftpowerrail.GetConnectors() |
840 |
for i, connector in enumerate(instance["connectors"]): |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
841 |
connectors[i].SetPosition(wx.Point(*connector["position"])) |
0 | 842 |
elif instance["type"] == "rightPowerRail": |
843 |
rightpowerrail = LD_PowerRail(self, RIGHTRAIL, instance["id"], [True for i in range(len(instance["connectors"]))]) |
|
844 |
rightpowerrail.SetPosition(instance["x"], instance["y"]) |
|
80 | 845 |
rightpowerrail.SetSize(instance["width"], instance["height"]) |
42 | 846 |
self.AddBlock(rightpowerrail) |
0 | 847 |
connectors = rightpowerrail.GetConnectors() |
848 |
for i, connector in enumerate(instance["connectors"]): |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
849 |
connectors[i].SetPosition(wx.Point(*connector["position"])) |
0 | 850 |
self.CreateWires(connectors[i], connector["links"], ids) |
851 |
elif instance["type"] == "contact": |
|
852 |
if instance["negated"]: |
|
853 |
negated = instance["negated"] |
|
854 |
else: |
|
855 |
negated = False |
|
856 |
if instance["edge"]: |
|
857 |
edge = instance["edge"] |
|
858 |
else: |
|
859 |
edge = "none" |
|
860 |
if negated and edge == "none": |
|
861 |
contact_type = CONTACT_REVERSE |
|
862 |
elif not negated and edge == "rising": |
|
863 |
contact_type = CONTACT_RISING |
|
864 |
elif not negated and edge == "falling": |
|
865 |
contact_type = CONTACT_FALLING |
|
866 |
else: |
|
867 |
contact_type = CONTACT_NORMAL |
|
868 |
contact = LD_Contact(self, contact_type, instance["name"], instance["id"]) |
|
869 |
contact.SetPosition(instance["x"], instance["y"]) |
|
145 | 870 |
contact.SetSize(instance["width"], instance["height"]) |
42 | 871 |
self.AddBlock(contact) |
0 | 872 |
connectors = contact.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
873 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 874 |
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
|
875 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
0 | 876 |
elif instance["type"] == "coil": |
877 |
if instance["negated"]: |
|
878 |
negated = instance["negated"] |
|
879 |
else: |
|
880 |
negated = False |
|
881 |
if instance["storage"]: |
|
882 |
storage = instance["storage"] |
|
883 |
else: |
|
884 |
storage = "none" |
|
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
885 |
if instance["edge"]: |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
886 |
edge = instance["edge"] |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
887 |
else: |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
888 |
edge = "none" |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
889 |
if negated and storage == "none" and edge == "none": |
0 | 890 |
coil_type = COIL_REVERSE |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
891 |
elif not negated and edge == "none" and storage == "set": |
0 | 892 |
coil_type = COIL_SET |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
893 |
elif not negated and edge == "none" and storage == "reset": |
0 | 894 |
coil_type = COIL_RESET |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
895 |
elif not negated and storage == "none" and edge == "rising": |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
896 |
coil_type = COIL_RISING |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
897 |
elif not negated and storage == "none" and edge == "falling": |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
898 |
coil_type = COIL_FALLING |
0 | 899 |
else: |
900 |
coil_type = COIL_NORMAL |
|
901 |
coil = LD_Coil(self, coil_type, instance["name"], instance["id"]) |
|
902 |
coil.SetPosition(instance["x"], instance["y"]) |
|
145 | 903 |
coil.SetSize(instance["width"], instance["height"]) |
42 | 904 |
self.AddBlock(coil) |
0 | 905 |
connectors = coil.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
906 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 907 |
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
|
908 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
0 | 909 |
elif instance["type"] == "step": |
910 |
if instance["initial"]: |
|
911 |
initial = instance["initial"] |
|
912 |
else: |
|
913 |
initial = False |
|
914 |
step = SFC_Step(self, instance["name"], initial, instance["id"]) |
|
915 |
step.SetPosition(instance["x"], instance["y"]) |
|
916 |
step.SetSize(instance["width"], instance["height"]) |
|
42 | 917 |
self.AddBlock(step) |
0 | 918 |
if "output" in instance["connectors"]: |
919 |
step.AddOutput() |
|
920 |
if "action" in instance["connectors"]: |
|
921 |
step.AddAction() |
|
922 |
connectors = step.GetConnectors() |
|
923 |
if connectors["input"]: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
924 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 925 |
self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids) |
926 |
if connectors["output"]: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
927 |
connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"])) |
0 | 928 |
if connectors["action"]: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
929 |
connectors["action"].SetPosition(wx.Point(*instance["connectors"]["action"]["position"])) |
0 | 930 |
elif instance["type"] == "transition": |
80 | 931 |
transition = SFC_Transition(self, instance["condition_type"], instance["condition"], instance["priority"], instance["id"]) |
0 | 932 |
transition.SetPosition(instance["x"], instance["y"]) |
145 | 933 |
transition.SetSize(instance["width"], instance["height"]) |
42 | 934 |
self.AddBlock(transition) |
0 | 935 |
connectors = transition.GetConnectors() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
936 |
connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"])) |
0 | 937 |
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
|
938 |
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
|
939 |
if instance["condition_type"] == "connection": |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
940 |
self.CreateWires(connectors["connection"], instance["connectors"]["connection"]["links"], ids) |
0 | 941 |
elif instance["type"] in ["selectionDivergence", "selectionConvergence", "simultaneousDivergence", "simultaneousConvergence"]: |
942 |
if instance["type"] == "selectionDivergence": |
|
943 |
divergence = SFC_Divergence(self, SELECTION_DIVERGENCE, |
|
944 |
len(instance["connectors"]["outputs"]), instance["id"]) |
|
945 |
elif instance["type"] == "selectionConvergence": |
|
946 |
divergence = SFC_Divergence(self, SELECTION_CONVERGENCE, |
|
947 |
len(instance["connectors"]["inputs"]), instance["id"]) |
|
948 |
elif instance["type"] == "simultaneousDivergence": |
|
949 |
divergence = SFC_Divergence(self, SIMULTANEOUS_DIVERGENCE, |
|
950 |
len(instance["connectors"]["outputs"]), instance["id"]) |
|
951 |
else: |
|
952 |
divergence = SFC_Divergence(self, SIMULTANEOUS_CONVERGENCE, |
|
953 |
len(instance["connectors"]["inputs"]), instance["id"]) |
|
954 |
divergence.SetPosition(instance["x"], instance["y"]) |
|
955 |
divergence.SetSize(instance["width"], instance["height"]) |
|
42 | 956 |
self.AddBlock(divergence) |
0 | 957 |
connectors = divergence.GetConnectors() |
958 |
for i, input_connector in enumerate(instance["connectors"]["inputs"]): |
|
959 |
connector = connectors["inputs"][i] |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
960 |
connector.SetPosition(wx.Point(*input_connector["position"])) |
0 | 961 |
self.CreateWires(connector, input_connector["links"], ids) |
962 |
for i, output_connector in enumerate(instance["connectors"]["outputs"]): |
|
963 |
connector = connectors["outputs"][i] |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
964 |
connector.SetPosition(wx.Point(*output_connector["position"])) |
0 | 965 |
elif instance["type"] == "jump": |
966 |
jump = SFC_Jump(self, instance["target"], instance["id"]) |
|
967 |
jump.SetPosition(instance["x"], instance["y"]) |
|
145 | 968 |
jump.SetSize(instance["width"], instance["height"]) |
42 | 969 |
self.AddBlock(jump) |
0 | 970 |
connector = jump.GetConnector() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
971 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 972 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
973 |
elif instance["type"] == "actionBlock": |
|
974 |
actionBlock = SFC_ActionBlock(self, instance["actions"], instance["id"]) |
|
975 |
actionBlock.SetPosition(instance["x"], instance["y"]) |
|
976 |
actionBlock.SetSize(instance["width"], instance["height"]) |
|
42 | 977 |
self.AddBlock(actionBlock) |
0 | 978 |
connector = actionBlock.GetConnector() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
979 |
connector.SetPosition(wx.Point(*instance["connector"]["position"])) |
0 | 980 |
self.CreateWires(connector, instance["connector"]["links"], ids) |
981 |
else: |
|
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
982 |
connectors = {"inputs" : [], "outputs" : []} |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
983 |
executionControl = False |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
984 |
for input in instance["connectors"]["inputs"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
985 |
if input["negated"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
986 |
connectors["inputs"].append((input["name"], None, "negated")) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
987 |
elif input["edge"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
988 |
connectors["inputs"].append((input["name"], None, input["edge"])) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
989 |
else: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
990 |
connectors["inputs"].append((input["name"], None, "none")) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
991 |
for output in instance["connectors"]["outputs"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
992 |
if output["negated"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
993 |
connectors["outputs"].append((output["name"], None, "negated")) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
994 |
elif output["edge"]: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
995 |
connectors["outputs"].append((output["name"], None, output["edge"])) |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
996 |
else: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
997 |
connectors["outputs"].append((output["name"], None, "none")) |
290
56c4fe6b7012
Bug when searching for EN/ENO on block without interface fixed
greg
parents:
283
diff
changeset
|
998 |
if len(connectors["inputs"]) > 0 and connectors["inputs"][0][0] == "EN": |
56c4fe6b7012
Bug when searching for EN/ENO on block without interface fixed
greg
parents:
283
diff
changeset
|
999 |
connectors["inputs"].pop(0) |
56c4fe6b7012
Bug when searching for EN/ENO on block without interface fixed
greg
parents:
283
diff
changeset
|
1000 |
executionControl = True |
56c4fe6b7012
Bug when searching for EN/ENO on block without interface fixed
greg
parents:
283
diff
changeset
|
1001 |
if len(connectors["outputs"]) > 0 and connectors["outputs"][0][0] == "ENO": |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1002 |
connectors["outputs"].pop(0) |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1003 |
executionControl = True |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1004 |
if instance["name"] is None: |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1005 |
instance["name"] = "" |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1006 |
block = FBD_Block(self, instance["type"], instance["name"], |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1007 |
instance["id"], len(connectors["inputs"]), |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1008 |
connectors=connectors, executionControl=executionControl, |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1009 |
executionOrder=instance["executionOrder"]) |
0 | 1010 |
block.SetPosition(instance["x"], instance["y"]) |
1011 |
block.SetSize(instance["width"], instance["height"]) |
|
42 | 1012 |
self.AddBlock(block) |
0 | 1013 |
connectors = block.GetConnectors() |
1014 |
for i, input_connector in enumerate(instance["connectors"]["inputs"]): |
|
195
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1015 |
if i < len(connectors["inputs"]): |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1016 |
connector = connectors["inputs"][i] |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1017 |
connector.SetPosition(wx.Point(*input_connector["position"])) |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1018 |
if input_connector["negated"]: |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1019 |
connector.SetNegated(True) |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1020 |
if input_connector["edge"] != "none": |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1021 |
connector.SetEdge(input_connector["edge"]) |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1022 |
self.CreateWires(connector, input_connector["links"], ids) |
0 | 1023 |
for i, output_connector in enumerate(instance["connectors"]["outputs"]): |
195
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1024 |
if i < len(connectors["outputs"]): |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1025 |
connector = connectors["outputs"][i] |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1026 |
if output_connector["negated"]: |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1027 |
connector.SetNegated(True) |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1028 |
if output_connector["edge"] != "none": |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1029 |
connector.SetEdge(output_connector["edge"]) |
d9084f6eecfd
Adding Function Block name test in Viewer Drop Target
lbessard
parents:
178
diff
changeset
|
1030 |
connector.SetPosition(wx.Point(*output_connector["position"])) |
0 | 1031 |
|
1032 |
def CreateWires(self, start_connector, links, ids): |
|
1033 |
for link in links: |
|
1034 |
refLocalId = link["refLocalId"] |
|
249 | 1035 |
if refLocalId is not None: |
0 | 1036 |
if refLocalId not in ids: |
249 | 1037 |
new_instance = self.Controler.GetEditedElementInstanceInfos(self.TagName, refLocalId, debug = self.Debug) |
1038 |
if new_instance is not None: |
|
0 | 1039 |
self.loadInstance(new_instance, ids) |
1040 |
connected = self.FindElementById(refLocalId) |
|
249 | 1041 |
if connected is not None: |
0 | 1042 |
points = link["points"] |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1043 |
end_connector = connected.GetConnector(wx.Point(points[-1][0], points[-1][1]), link["formalParameter"]) |
249 | 1044 |
if end_connector is not None: |
0 | 1045 |
wire = Wire(self) |
1046 |
wire.SetPoints(points) |
|
1047 |
start_connector.Connect((wire, 0), False) |
|
1048 |
end_connector.Connect((wire, -1), False) |
|
1049 |
wire.ConnectStartPoint(None, start_connector) |
|
1050 |
wire.ConnectEndPoint(None, end_connector) |
|
42 | 1051 |
self.AddWire(wire) |
0 | 1052 |
|
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1053 |
def IsOfType(self, type, reference): |
249 | 1054 |
return self.Controler.IsOfType(type, reference, self.Debug) |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1055 |
|
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1056 |
def IsEndType(self, type): |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1057 |
return self.Controler.IsEndType(type) |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1058 |
|
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1059 |
def GetBlockType(self, type, inputs = None): |
249 | 1060 |
return self.Controler.GetBlockType(type, inputs, self.Debug) |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1061 |
|
0 | 1062 |
#------------------------------------------------------------------------------- |
1063 |
# Search Element functions |
|
1064 |
#------------------------------------------------------------------------------- |
|
1065 |
||
1066 |
def FindBlock(self, pos): |
|
1067 |
for block in self.Blocks: |
|
1068 |
if block.HitTest(pos) or block.TestHandle(pos) != (0, 0): |
|
1069 |
return block |
|
1070 |
return None |
|
1071 |
||
1072 |
def FindWire(self, pos): |
|
1073 |
for wire in self.Wires: |
|
1074 |
if wire.HitTest(pos) or wire.TestHandle(pos) != (0, 0): |
|
1075 |
return wire |
|
1076 |
return None |
|
1077 |
||
1078 |
def FindElement(self, pos, exclude_group = False): |
|
1079 |
if self.SelectedElement and not (exclude_group and isinstance(self.SelectedElement, Graphic_Group)): |
|
1080 |
if self.SelectedElement.HitTest(pos) or self.SelectedElement.TestHandle(pos) != (0, 0): |
|
1081 |
return self.SelectedElement |
|
42 | 1082 |
for element in self.GetElements(): |
0 | 1083 |
if element.HitTest(pos) or element.TestHandle(pos) != (0, 0): |
1084 |
return element |
|
1085 |
return None |
|
1086 |
||
249 | 1087 |
def FindBlockConnector(self, pos, direction = None, exclude = None): |
0 | 1088 |
for block in self.Blocks: |
243
c5da8b706cde
Adding support for allowing connections only between an input and an output connector
lbessard
parents:
239
diff
changeset
|
1089 |
result = block.TestConnector(pos, direction, exclude) |
0 | 1090 |
if result: |
1091 |
return result |
|
1092 |
return None |
|
1093 |
||
1094 |
def FindElementById(self, id): |
|
42 | 1095 |
for element in self.Blocks: |
1096 |
if element.GetId() == id: |
|
1097 |
return element |
|
1098 |
for element in self.Comments: |
|
0 | 1099 |
if element.GetId() == id: |
1100 |
return element |
|
1101 |
return None |
|
1102 |
||
1103 |
def SearchElements(self, bbox): |
|
1104 |
elements = [] |
|
42 | 1105 |
for element in self.GetElements(): |
1106 |
if element.IsInSelection(bbox): |
|
0 | 1107 |
elements.append(element) |
1108 |
return elements |
|
1109 |
||
331
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1110 |
def SelectAll(self): |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1111 |
if self.SelectedElement is not None: |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1112 |
self.SelectedElement.SetSelected(False) |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1113 |
self.SelectedElement = Graphic_Group(self) |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1114 |
for element in self.GetElements(): |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1115 |
self.SelectedElement.SelectElement(element) |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1116 |
self.SelectedElement.SetSelected(True) |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1117 |
|
0 | 1118 |
#------------------------------------------------------------------------------- |
1119 |
# Popup menu functions |
|
1120 |
#------------------------------------------------------------------------------- |
|
1121 |
||
1122 |
def PopupBlockMenu(self, connector = None): |
|
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1123 |
if connector is not None and connector.IsCompatible("BOOL"): |
249 | 1124 |
type = self.Controler.GetEditedElementType(self.TagName, self.Debug) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1125 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1126 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1127 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, type != "function") |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1128 |
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
|
1129 |
else: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1130 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1131 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1132 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1133 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1134 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1135 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1136 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1137 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1138 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False) |
249 | 1139 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, self.SelectedElement.GetType() in self.Controler.GetProjectPouNames(self.Debug)) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1140 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, True) |
249 | 1141 |
if connector is not None: |
0 | 1142 |
if connector.IsNegated(): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1143 |
self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS1, True) |
0 | 1144 |
elif connector.GetEdge() == "rising": |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1145 |
self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS2, True) |
0 | 1146 |
elif connector.GetEdge() == "falling": |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1147 |
self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS3, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1148 |
else: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1149 |
self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS0, True) |
0 | 1150 |
self.PopupMenu(self.ContextualMenu) |
1151 |
||
235
7b58a3b5b6ec
Change in layout from AuiMDIParentFrame to AuiNotebook
lbessard
parents:
231
diff
changeset
|
1152 |
def PopupWireMenu(self, delete=True): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1153 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1154 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1155 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1156 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1157 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, True) |
235
7b58a3b5b6ec
Change in layout from AuiMDIParentFrame to AuiNotebook
lbessard
parents:
231
diff
changeset
|
1158 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, delete) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1159 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1160 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1161 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1162 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1163 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, True) |
0 | 1164 |
self.PopupMenu(self.ContextualMenu) |
1165 |
||
1166 |
def PopupDivergenceMenu(self, connector): |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1167 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1168 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1169 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1170 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1171 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1172 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1173 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1174 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, connector) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1175 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1176 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1177 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, True) |
0 | 1178 |
self.PopupMenu(self.ContextualMenu) |
1179 |
||
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1180 |
def PopupGroupMenu(self): |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1181 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1182 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1183 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1184 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1185 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1186 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1187 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1188 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1189 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1190 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1191 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1192 |
self.PopupMenu(self.ContextualMenu) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1193 |
|
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1194 |
def PopupDefaultMenu(self, block = True): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1195 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1196 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1197 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1198 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1199 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1200 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1201 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1202 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1203 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1204 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS16, False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1205 |
self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS17, block) |
0 | 1206 |
self.PopupMenu(self.ContextualMenu) |
1207 |
||
1208 |
#------------------------------------------------------------------------------- |
|
1209 |
# Menu items functions |
|
1210 |
#------------------------------------------------------------------------------- |
|
1211 |
||
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1212 |
def OnAlignLeftMenu(self, event): |
249 | 1213 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1214 |
self.SelectedElement.AlignElements(ALIGN_LEFT, None) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1215 |
self.RefreshBuffer() |
155 | 1216 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1217 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1218 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1219 |
def OnAlignCenterMenu(self, event): |
249 | 1220 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1221 |
self.SelectedElement.AlignElements(ALIGN_CENTER, None) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1222 |
self.RefreshBuffer() |
155 | 1223 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1224 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1225 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1226 |
def OnAlignRightMenu(self, event): |
249 | 1227 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1228 |
self.SelectedElement.AlignElements(ALIGN_RIGHT, None) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1229 |
self.RefreshBuffer() |
155 | 1230 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1231 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1232 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1233 |
def OnAlignTopMenu(self, event): |
249 | 1234 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1235 |
self.SelectedElement.AlignElements(None, ALIGN_TOP) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1236 |
self.RefreshBuffer() |
155 | 1237 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1238 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1239 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1240 |
def OnAlignMiddleMenu(self, event): |
249 | 1241 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1242 |
self.SelectedElement.AlignElements(None, ALIGN_MIDDLE) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1243 |
self.RefreshBuffer() |
155 | 1244 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1245 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1246 |
|
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1247 |
def OnAlignBottomMenu(self, event): |
249 | 1248 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1249 |
self.SelectedElement.AlignElements(None, ALIGN_BOTTOM) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1250 |
self.RefreshBuffer() |
155 | 1251 |
self.Refresh(False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1252 |
event.Skip() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1253 |
|
0 | 1254 |
def OnNoModifierMenu(self, event): |
249 | 1255 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
0 | 1256 |
self.SelectedElement.SetConnectorNegated(False) |
206 | 1257 |
self.SelectedElement.Refresh() |
80 | 1258 |
self.RefreshBuffer() |
0 | 1259 |
event.Skip() |
1260 |
||
1261 |
def OnNegatedMenu(self, event): |
|
249 | 1262 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
0 | 1263 |
self.SelectedElement.SetConnectorNegated(True) |
206 | 1264 |
self.SelectedElement.Refresh() |
80 | 1265 |
self.RefreshBuffer() |
0 | 1266 |
event.Skip() |
1267 |
||
1268 |
def OnRisingEdgeMenu(self, event): |
|
249 | 1269 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
0 | 1270 |
self.SelectedElement.SetConnectorEdge("rising") |
206 | 1271 |
self.SelectedElement.Refresh() |
80 | 1272 |
self.RefreshBuffer() |
0 | 1273 |
event.Skip() |
1274 |
||
1275 |
def OnFallingEdgeMenu(self, event): |
|
249 | 1276 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
0 | 1277 |
self.SelectedElement.SetConnectorEdge("falling") |
206 | 1278 |
self.SelectedElement.Refresh() |
80 | 1279 |
self.RefreshBuffer() |
0 | 1280 |
event.Skip() |
1281 |
||
1282 |
def OnAddSegmentMenu(self, event): |
|
249 | 1283 |
if self.SelectedElement is not None and self.IsWire(self.SelectedElement): |
0 | 1284 |
self.SelectedElement.AddSegment() |
206 | 1285 |
self.SelectedElement.Refresh() |
0 | 1286 |
event.Skip() |
1287 |
||
1288 |
def OnDeleteSegmentMenu(self, event): |
|
249 | 1289 |
if self.SelectedElement is not None and self.IsWire(self.SelectedElement): |
0 | 1290 |
self.SelectedElement.DeleteSegment() |
206 | 1291 |
self.SelectedElement.Refresh() |
0 | 1292 |
event.Skip() |
1293 |
||
1294 |
def OnAddBranchMenu(self, event): |
|
249 | 1295 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
0 | 1296 |
self.AddDivergenceBranch(self.SelectedElement) |
1297 |
event.Skip() |
|
1298 |
||
1299 |
def OnDeleteBranchMenu(self, event): |
|
249 | 1300 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
0 | 1301 |
self.RemoveDivergenceBranch(self.SelectedElement) |
1302 |
event.Skip() |
|
1303 |
||
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1304 |
def OnEditBlockMenu(self, event): |
249 | 1305 |
if self.SelectedElement is not None: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1306 |
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
|
1307 |
event.Skip() |
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1308 |
|
0 | 1309 |
def OnDeleteMenu(self, event): |
249 | 1310 |
if self.SelectedElement is not None: |
0 | 1311 |
self.SelectedElement.Delete() |
1312 |
self.SelectedElement = None |
|
80 | 1313 |
self.RefreshBuffer() |
206 | 1314 |
self.Refresh(False) |
0 | 1315 |
event.Skip() |
1316 |
||
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1317 |
def OnClearExecutionOrderMenu(self, event): |
121 | 1318 |
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
|
1319 |
self.RefreshBuffer() |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1320 |
self.RefreshView() |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1321 |
|
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1322 |
def OnResetExecutionOrderMenu(self, event): |
121 | 1323 |
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
|
1324 |
self.RefreshBuffer() |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1325 |
self.RefreshView() |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1326 |
|
0 | 1327 |
#------------------------------------------------------------------------------- |
1328 |
# Mouse event functions |
|
1329 |
#------------------------------------------------------------------------------- |
|
1330 |
||
1331 |
def OnViewerLeftDown(self, event): |
|
27 | 1332 |
if self.Mode == MODE_SELECTION: |
1333 |
dc = self.GetLogicalDC() |
|
1334 |
pos = event.GetLogicalPosition(dc) |
|
331
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1335 |
if event.ShiftDown() and not event.ControlDown() and self.SelectedElement is not None: |
27 | 1336 |
element = self.FindElement(pos, True) |
249 | 1337 |
if element is not None: |
27 | 1338 |
if isinstance(self.SelectedElement, Graphic_Group): |
1339 |
self.SelectedElement.SetSelected(False) |
|
1340 |
self.SelectedElement.SelectElement(element) |
|
249 | 1341 |
elif self.SelectedElement is not None: |
27 | 1342 |
group = Graphic_Group(self) |
1343 |
group.SelectElement(self.SelectedElement) |
|
1344 |
group.SelectElement(element) |
|
1345 |
self.SelectedElement = group |
|
1346 |
elements = self.SelectedElement.GetElements() |
|
1347 |
if len(elements) == 0: |
|
1348 |
self.SelectedElement = element |
|
1349 |
elif len(elements) == 1: |
|
1350 |
self.SelectedElement = elements[0] |
|
1351 |
self.SelectedElement.SetSelected(True) |
|
1352 |
else: |
|
1353 |
element = self.FindElement(pos) |
|
249 | 1354 |
if not self.Debug and (element is None or element.TestHandle(pos) == (0, 0)): |
145 | 1355 |
connector = self.FindBlockConnector(pos) |
1356 |
else: |
|
1357 |
connector = None |
|
249 | 1358 |
if not self.Debug and self.DrawingWire: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1359 |
self.DrawingWire = False |
174 | 1360 |
if self.SelectedElement is not None: |
243
c5da8b706cde
Adding support for allowing connections only between an input and an output connector
lbessard
parents:
239
diff
changeset
|
1361 |
if element is None or element.TestHandle(pos) == (0, 0): |
c5da8b706cde
Adding support for allowing connections only between an input and an output connector
lbessard
parents:
239
diff
changeset
|
1362 |
connector = self.FindBlockConnector(pos, self.SelectedElement.GetConnectionDirection()) |
249 | 1363 |
if connector is not None: |
174 | 1364 |
event.Dragging = lambda : True |
1365 |
self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling) |
|
1366 |
if self.SelectedElement.EndConnected is not None: |
|
1367 |
self.SelectedElement.ResetPoints() |
|
1368 |
self.SelectedElement.GeneratePoints() |
|
1369 |
self.SelectedElement.RefreshModel() |
|
1370 |
self.SelectedElement.SetSelected(True) |
|
1371 |
element = self.SelectedElement |
|
1372 |
self.RefreshBuffer() |
|
1373 |
else: |
|
1374 |
rect = self.SelectedElement.GetRedrawRect() |
|
1375 |
self.SelectedElement.Delete() |
|
1376 |
self.SelectedElement = None |
|
1377 |
element = None |
|
1378 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
|
249 | 1379 |
elif not self.Debug and connector is not None: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1380 |
self.DrawingWire = True |
216
93af9ac5aeaf
Not connecting wire on scaled graphics bug and forbidding copy on the fly of groups fixed
lbessard
parents:
213
diff
changeset
|
1381 |
scaled_pos = GetScaledEventPosition(event, self.GetLogicalDC(), self.Scaling) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1382 |
if (connector.GetDirection() == EAST): |
216
93af9ac5aeaf
Not connecting wire on scaled graphics bug and forbidding copy on the fly of groups fixed
lbessard
parents:
213
diff
changeset
|
1383 |
wire = Wire(self, [wx.Point(pos.x, pos.y), EAST], [wx.Point(scaled_pos.x, scaled_pos.y), WEST]) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1384 |
else: |
216
93af9ac5aeaf
Not connecting wire on scaled graphics bug and forbidding copy on the fly of groups fixed
lbessard
parents:
213
diff
changeset
|
1385 |
wire = Wire(self, [wx.Point(pos.x, pos.y), WEST], [wx.Point(scaled_pos.x, scaled_pos.y), EAST]) |
93af9ac5aeaf
Not connecting wire on scaled graphics bug and forbidding copy on the fly of groups fixed
lbessard
parents:
213
diff
changeset
|
1386 |
wire.oldPos = scaled_pos |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1387 |
wire.Handle = (HANDLE_POINT, 0) |
327
7fd5233ce5ce
Adding support for contraining move to only one direction when control down
lbessard
parents:
323
diff
changeset
|
1388 |
wire.ProcessDragging(0, 0, event, None) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1389 |
wire.Handle = (HANDLE_POINT, 1) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1390 |
self.AddWire(wire) |
249 | 1391 |
if self.SelectedElement is not None: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1392 |
self.SelectedElement.SetSelected(False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1393 |
self.SelectedElement = wire |
259 | 1394 |
self.RefreshVisibleElements() |
144 | 1395 |
self.SelectedElement.Refresh() |
27 | 1396 |
else: |
249 | 1397 |
if self.SelectedElement is not None and self.SelectedElement != element: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1398 |
self.SelectedElement.SetSelected(False) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1399 |
self.SelectedElement = None |
249 | 1400 |
if element is not None: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1401 |
self.SelectedElement = element |
249 | 1402 |
if self.Debug: |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1403 |
self.StartMousePos = event.GetPosition() |
249 | 1404 |
Graphic_Element.OnLeftDown(self.SelectedElement, event, dc, self.Scaling) |
1405 |
else: |
|
1406 |
self.SelectedElement.OnLeftDown(event, dc, self.Scaling) |
|
144 | 1407 |
self.SelectedElement.Refresh() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1408 |
else: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1409 |
self.rubberBand.Reset() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1410 |
self.rubberBand.OnLeftDown(event, dc, self.Scaling) |
27 | 1411 |
elif self.Mode in [MODE_BLOCK, MODE_VARIABLE, MODE_CONNECTION, MODE_COMMENT, |
1412 |
MODE_CONTACT, MODE_COIL, MODE_POWERRAIL, MODE_INITIALSTEP, |
|
1413 |
MODE_STEP, MODE_TRANSITION, MODE_DIVERGENCE, MODE_JUMP, MODE_ACTION]: |
|
1414 |
self.rubberBand.Reset() |
|
1415 |
self.rubberBand.OnLeftDown(event, self.GetLogicalDC(), self.Scaling) |
|
0 | 1416 |
event.Skip() |
1417 |
||
1418 |
def OnViewerLeftUp(self, event): |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1419 |
self.StartMousePos = None |
27 | 1420 |
if self.rubberBand.IsShown(): |
1421 |
if self.Mode == MODE_SELECTION: |
|
1422 |
elements = self.SearchElements(self.rubberBand.GetCurrentExtent()) |
|
1423 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
80 | 1424 |
if len(elements) == 1: |
1425 |
self.SelectedElement = elements[0] |
|
1426 |
self.SelectedElement.SetSelected(True) |
|
1427 |
elif len(elements) > 1: |
|
27 | 1428 |
self.SelectedElement = Graphic_Group(self) |
1429 |
self.SelectedElement.SetElements(elements) |
|
1430 |
self.SelectedElement.SetSelected(True) |
|
1431 |
else: |
|
1432 |
bbox = self.rubberBand.GetCurrentExtent() |
|
1433 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
1434 |
if self.Mode == MODE_BLOCK: |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1435 |
wx.CallAfter(self.AddNewBlock, bbox) |
27 | 1436 |
elif self.Mode == MODE_VARIABLE: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1437 |
wx.CallAfter(self.AddNewVariable, bbox) |
27 | 1438 |
elif self.Mode == MODE_CONNECTION: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1439 |
wx.CallAfter(self.AddNewConnection, bbox) |
27 | 1440 |
elif self.Mode == MODE_COMMENT: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1441 |
wx.CallAfter(self.AddNewComment, bbox) |
27 | 1442 |
elif self.Mode == MODE_CONTACT: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1443 |
wx.CallAfter(self.AddNewContact, bbox) |
27 | 1444 |
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
|
1445 |
wx.CallAfter(self.AddNewCoil, bbox) |
27 | 1446 |
elif self.Mode == MODE_POWERRAIL: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1447 |
wx.CallAfter(self.AddNewPowerRail, bbox) |
27 | 1448 |
elif self.Mode == MODE_INITIALSTEP: |
71 | 1449 |
wx.CallAfter(self.AddNewStep, bbox, True) |
27 | 1450 |
elif self.Mode == MODE_STEP: |
71 | 1451 |
wx.CallAfter(self.AddNewStep, bbox, False) |
27 | 1452 |
elif self.Mode == MODE_TRANSITION: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1453 |
wx.CallAfter(self.AddNewTransition, bbox) |
27 | 1454 |
elif self.Mode == MODE_DIVERGENCE: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1455 |
wx.CallAfter(self.AddNewDivergence, bbox) |
27 | 1456 |
elif self.Mode == MODE_JUMP: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1457 |
wx.CallAfter(self.AddNewJump, bbox) |
27 | 1458 |
elif self.Mode == MODE_ACTION: |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1459 |
wx.CallAfter(self.AddNewActionBlock, bbox) |
249 | 1460 |
elif self.Mode == MODE_SELECTION and self.SelectedElement is not None: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1461 |
dc = self.GetLogicalDC() |
249 | 1462 |
if not self.Debug and self.DrawingWire: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1463 |
pos = event.GetLogicalPosition(dc) |
243
c5da8b706cde
Adding support for allowing connections only between an input and an output connector
lbessard
parents:
239
diff
changeset
|
1464 |
connector = self.FindBlockConnector(pos, self.SelectedElement.GetConnectionDirection()) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1465 |
if self.SelectedElement.EndConnected is not None: |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1466 |
self.DrawingWire = False |
145 | 1467 |
self.SelectedElement.StartConnected.HighlightParentBlock(False) |
1468 |
self.SelectedElement.EndConnected.HighlightParentBlock(False) |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1469 |
self.SelectedElement.ResetPoints() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1470 |
self.SelectedElement.OnMotion(event, dc, self.Scaling) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1471 |
self.SelectedElement.GeneratePoints() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1472 |
self.SelectedElement.RefreshModel() |
145 | 1473 |
if self.HighlightedElement is not None: |
1474 |
self.HighlightedElement.SetHighlighted(False) |
|
1475 |
self.HighlightedElement = None |
|
1476 |
self.SelectedElement.SetHighlighted(True) |
|
1477 |
self.HighlightedElement = self.SelectedElement |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1478 |
self.SelectedElement.SetSelected(True) |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1479 |
self.RefreshBuffer() |
144 | 1480 |
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
|
1481 |
self.DrawingWire = False |
144 | 1482 |
rect = self.SelectedElement.GetRedrawRect() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1483 |
self.SelectedElement.Delete() |
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1484 |
self.SelectedElement = None |
155 | 1485 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1486 |
else: |
249 | 1487 |
if self.Debug: |
1488 |
Graphic_Element.OnLeftUp(self.SelectedElement, event, dc, self.Scaling) |
|
1489 |
else: |
|
1490 |
self.SelectedElement.OnLeftUp(event, dc, self.Scaling) |
|
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1491 |
wx.CallAfter(self.SetCursor, wx.NullCursor) |
106
3fc63036de16
Adding support for variable type compatibility check after drag and drop
lbessard
parents:
102
diff
changeset
|
1492 |
if self.Mode != MODE_SELECTION and not self.SavedMode: |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
1493 |
wx.CallAfter(self.ParentWindow.ResetCurrentMode) |
0 | 1494 |
event.Skip() |
1495 |
||
319 | 1496 |
def OnViewerMiddleDown(self, event): |
1497 |
self.StartMousePos = event.GetPosition() |
|
1498 |
self.StartScreenPos = self.GetScrollPos(wx.HORIZONTAL), self.GetScrollPos(wx.VERTICAL) |
|
1499 |
event.Skip() |
|
1500 |
||
1501 |
def OnViewerMiddleUp(self, event): |
|
1502 |
self.StartMousePos = None |
|
1503 |
self.StartScreenPos = None |
|
1504 |
event.Skip() |
|
1505 |
||
145 | 1506 |
def OnViewerRightDown(self, event): |
1507 |
if self.Mode == MODE_SELECTION: |
|
1508 |
dc = self.GetLogicalDC() |
|
1509 |
pos = event.GetLogicalPosition(dc) |
|
1510 |
element = self.FindElement(pos) |
|
249 | 1511 |
if self.SelectedElement is not None and self.SelectedElement != element: |
145 | 1512 |
self.SelectedElement.SetSelected(False) |
1513 |
self.SelectedElement = None |
|
1514 |
if element: |
|
1515 |
self.SelectedElement = element |
|
249 | 1516 |
if self.Debug: |
1517 |
Graphic_Element.OnRightDown(self.SelectedElement, event, dc, self.Scaling) |
|
1518 |
else: |
|
1519 |
self.SelectedElement.OnRightDown(event, dc, self.Scaling) |
|
145 | 1520 |
self.SelectedElement.Refresh() |
1521 |
event.Skip() |
|
1522 |
||
0 | 1523 |
def OnViewerRightUp(self, event): |
80 | 1524 |
dc = self.GetLogicalDC() |
249 | 1525 |
if self.SelectedElement is not None: |
1526 |
if self.Debug: |
|
1527 |
Graphic_Element.OnRightUp(self.SelectedElement, event, dc, self.Scaling) |
|
1528 |
else: |
|
1529 |
self.SelectedElement.OnRightUp(event, dc, self.Scaling) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1530 |
wx.CallAfter(self.SetCursor, wx.NullCursor) |
249 | 1531 |
elif not self.Debug: |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
1532 |
self.PopupDefaultMenu(False) |
0 | 1533 |
event.Skip() |
1534 |
||
1535 |
def OnViewerLeftDClick(self, event): |
|
249 | 1536 |
if self.Mode == MODE_SELECTION and self.SelectedElement is not None: |
1537 |
if self.Debug: |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1538 |
iec_path = self.GetElementIECPath(self.SelectedElement) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1539 |
if iec_path is not None: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1540 |
if isinstance(self.SelectedElement, Wire): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1541 |
if self.SelectedElement.EndConnected is not None: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1542 |
var_type = self.SelectedElement.EndConnected.GetType() |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1543 |
if self.Controler.IsOfType(var_type, "ANY_NUM", self.Debug) or\ |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1544 |
self.Controler.IsOfType(var_type, "ANY_BIT", self.Debug): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1545 |
self.ParentWindow.OpenGraphicViewer(iec_path) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1546 |
else: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1547 |
self.ParentWindow.OpenGraphicViewer(iec_path) |
331
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1548 |
elif event.ControlDown() and not event.ShiftDown(): |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1549 |
if self.IsBlock(self.SelectedElement) and self.SelectedElement.GetType() in self.Controler.GetProjectPouNames(self.Debug): |
345 | 1550 |
self.ParentWindow.EditProjectElement(ITEM_POU, self.Controler.ComputePouName(self.SelectedElement.GetType())) |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1551 |
else: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1552 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
331
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1553 |
elif event.ControlDown() and event.ShiftDown(): |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1554 |
movex, movey = self.SelectedElement.AdjustToScaling(self.Scaling) |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1555 |
self.SelectedElement.RefreshModel() |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1556 |
self.RefreshBuffer() |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1557 |
if movex != 0 or movey != 0: |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1558 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
102
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1559 |
else: |
85875dcb7754
Adding edit user's POU by double click on block instance
lbessard
parents:
98
diff
changeset
|
1560 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
0 | 1561 |
event.Skip() |
1562 |
||
1563 |
def OnViewerMotion(self, event): |
|
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1564 |
refresh = False |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1565 |
dc = self.GetLogicalDC() |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1566 |
pos = GetScaledEventPosition(event, dc, self.Scaling) |
323 | 1567 |
if event.MiddleIsDown(): |
1568 |
if self.StartMousePos is not None and self.StartScreenPos is not None: |
|
1569 |
new_pos = event.GetPosition() |
|
1570 |
xmax = self.GetScrollRange(wx.HORIZONTAL) - self.GetScrollThumb(wx.HORIZONTAL) |
|
1571 |
ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL) |
|
331
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1572 |
scrollx = max(0, self.StartScreenPos[0] - (new_pos[0] - self.StartMousePos[0]) / SCROLLBAR_UNIT) |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
1573 |
scrolly = max(0, self.StartScreenPos[1] - (new_pos[1] - self.StartMousePos[1]) / SCROLLBAR_UNIT) |
323 | 1574 |
if scrollx > xmax or scrolly > ymax: |
1575 |
self.RefreshScrollBars(max(0, scrollx - xmax), max(0, scrolly - ymax)) |
|
1576 |
self.Scroll(scrollx, scrolly) |
|
1577 |
else: |
|
1578 |
self.Scroll(scrollx, scrolly) |
|
1579 |
self.RefreshScrollBars() |
|
1580 |
self.RefreshVisibleElements() |
|
1581 |
else: |
|
319 | 1582 |
if not event.Dragging(): |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1583 |
if self.Debug: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1584 |
tooltip_pos = self.ClientToScreen(event.GetPosition()) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1585 |
tooltip_pos.x += 10 |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1586 |
tooltip_pos.y += 10 |
319 | 1587 |
highlighted = self.FindElement(pos) |
1588 |
if self.HighlightedElement is not None and self.HighlightedElement != highlighted: |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1589 |
if self.Debug and isinstance(self.HighlightedElement, Wire): |
338 | 1590 |
self.HighlightedElement.ClearToolTip() |
319 | 1591 |
self.HighlightedElement.SetHighlighted(False) |
1592 |
self.HighlightedElement = None |
|
1593 |
if highlighted is not None and self.HighlightedElement != highlighted: |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1594 |
if self.Debug and isinstance(highlighted, Wire): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1595 |
highlighted.CreateToolTip(tooltip_pos) |
319 | 1596 |
highlighted.SetHighlighted(True) |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1597 |
elif self.Debug and highlighted is not None and isinstance(highlighted, Wire): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1598 |
highlighted.MoveToolTip(tooltip_pos) |
319 | 1599 |
self.HighlightedElement = highlighted |
1600 |
if self.rubberBand.IsShown(): |
|
1601 |
self.rubberBand.OnMotion(event, dc, self.Scaling) |
|
1602 |
elif not self.Debug and self.Mode == MODE_SELECTION and self.SelectedElement is not None: |
|
1603 |
if self.DrawingWire: |
|
1604 |
connector = self.FindBlockConnector(pos, self.SelectedElement.GetConnectionDirection(), self.SelectedElement.EndConnected) |
|
1605 |
if not connector or self.SelectedElement.EndConnected == None: |
|
1606 |
self.SelectedElement.ResetPoints() |
|
1607 |
movex, movey = self.SelectedElement.OnMotion(event, dc, self.Scaling) |
|
1608 |
self.SelectedElement.GeneratePoints() |
|
1609 |
if movex != 0 or movey != 0: |
|
1610 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
|
1611 |
else: |
|
144 | 1612 |
movex, movey = self.SelectedElement.OnMotion(event, dc, self.Scaling) |
1613 |
if movex != 0 or movey != 0: |
|
155 | 1614 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1615 |
elif self.Debug and self.StartMousePos is not None and event.Dragging(): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1616 |
pos = event.GetPosition() |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1617 |
if abs(self.StartMousePos.x - pos.x) > 5 or abs(self.StartMousePos.y - pos.y) > 5: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1618 |
iec_path = self.GetElementIECPath(self.SelectedElement) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1619 |
if iec_path is not None: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1620 |
self.StartMousePos = None |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1621 |
if self.HighlightedElement is not None: |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1622 |
if isinstance(self.HighlightedElement, Wire): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1623 |
self.HighlightedElement.ClearToolTip() |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1624 |
self.HighlightedElement.SetHighlighted(False) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1625 |
self.HighlightedElement = None |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1626 |
data = wx.TextDataObject(str((iec_path, "debug"))) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1627 |
dragSource = wx.DropSource(self) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1628 |
dragSource.SetData(data) |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1629 |
dragSource.DoDragDrop() |
319 | 1630 |
self.UpdateScrollPos(event) |
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1631 |
event.Skip() |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1632 |
|
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1633 |
def OnLeaveViewer(self, event): |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
1634 |
self.StartMousePos = None |
249 | 1635 |
if self.SelectedElement is not None and self.SelectedElement.GetDragging(): |
144 | 1636 |
event.Skip() |
1637 |
elif self.HighlightedElement is not None: |
|
338 | 1638 |
if isinstance(self.HighlightedElement, Wire): |
1639 |
self.HighlightedElement.ClearToolTip() |
|
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1640 |
self.HighlightedElement.SetHighlighted(False) |
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
1641 |
self.HighlightedElement = None |
71 | 1642 |
event.Skip() |
1643 |
||
1644 |
def UpdateScrollPos(self, event): |
|
249 | 1645 |
if (event.Dragging() and self.SelectedElement is not None) or self.rubberBand.IsShown(): |
27 | 1646 |
position = event.GetPosition() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1647 |
move_window = wx.Point() |
27 | 1648 |
window_size = self.GetClientSize() |
1649 |
xstart, ystart = self.GetViewStart() |
|
1650 |
if position.x < SCROLL_ZONE and xstart > 0: |
|
1651 |
move_window.x = -1 |
|
1652 |
elif position.x > window_size[0] - SCROLL_ZONE: |
|
1653 |
move_window.x = 1 |
|
1654 |
if position.y < SCROLL_ZONE and ystart > 0: |
|
1655 |
move_window.y = -1 |
|
1656 |
elif position.y > window_size[1] - SCROLL_ZONE: |
|
1657 |
move_window.y = 1 |
|
1658 |
if move_window.x != 0 or move_window.y != 0: |
|
267 | 1659 |
self.RefreshVisibleElements(xp = xstart + move_window.x, yp = ystart + move_window.y) |
27 | 1660 |
self.Scroll(xstart + move_window.x, ystart + move_window.y) |
42 | 1661 |
self.RefreshScrollBars() |
0 | 1662 |
|
1663 |
#------------------------------------------------------------------------------- |
|
1664 |
# Keyboard event functions |
|
1665 |
#------------------------------------------------------------------------------- |
|
1666 |
||
1667 |
def OnChar(self, event): |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1668 |
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
|
1669 |
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
|
1670 |
ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL) |
27 | 1671 |
keycode = event.GetKeyCode() |
249 | 1672 |
if self.Scaling is not None: |
27 | 1673 |
scaling = self.Scaling |
1674 |
else: |
|
1675 |
scaling = (8, 8) |
|
249 | 1676 |
if not self.Debug and keycode == wx.WXK_DELETE and self.SelectedElement is not None: |
144 | 1677 |
rect = self.SelectedElement.GetRedrawRect(1, 1) |
27 | 1678 |
self.SelectedElement.Delete() |
1679 |
self.SelectedElement = None |
|
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1680 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1681 |
self.RefreshScrollBars() |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1682 |
self.SetCursor(wx.NullCursor) |
155 | 1683 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
249 | 1684 |
elif not self.Debug and keycode == wx.WXK_RETURN and self.SelectedElement is not None: |
138
9c74d00ce93e
Last bugs on block and wire moving, resizing with cursor fixed
lbessard
parents:
128
diff
changeset
|
1685 |
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
|
1686 |
elif keycode == wx.WXK_LEFT: |
42 | 1687 |
if event.ControlDown() and event.ShiftDown(): |
1688 |
self.Scroll(0, ypos) |
|
319 | 1689 |
self.RefreshVisibleElements() |
42 | 1690 |
elif event.ControlDown(): |
319 | 1691 |
self.Scroll(xpos - 1, ypos) |
1692 |
self.RefreshScrollBars() |
|
1693 |
self.RefreshVisibleElements() |
|
249 | 1694 |
elif not self.Debug and self.SelectedElement is not None: |
42 | 1695 |
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
|
1696 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1697 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1698 |
self.RefreshScrollBars() |
155 | 1699 |
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
|
1700 |
elif keycode == wx.WXK_RIGHT: |
42 | 1701 |
if event.ControlDown() and event.ShiftDown(): |
1702 |
self.Scroll(xmax, ypos) |
|
319 | 1703 |
self.RefreshVisibleElements() |
42 | 1704 |
elif event.ControlDown(): |
319 | 1705 |
self.RefreshScrollBars(width_incr=max(0, xpos + 1 - xmax)) |
1706 |
self.Scroll(xpos + 1, ypos) |
|
1707 |
self.RefreshVisibleElements() |
|
249 | 1708 |
elif not self.Debug and self.SelectedElement is not None: |
42 | 1709 |
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
|
1710 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1711 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1712 |
self.RefreshScrollBars() |
155 | 1713 |
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
|
1714 |
elif keycode == wx.WXK_UP: |
42 | 1715 |
if event.ControlDown() and event.ShiftDown(): |
1716 |
self.Scroll(xpos, 0) |
|
319 | 1717 |
self.RefreshVisibleElements() |
42 | 1718 |
elif event.ControlDown(): |
319 | 1719 |
self.Scroll(xpos, ypos - 1) |
1720 |
self.RefreshScrollBars() |
|
1721 |
self.RefreshVisibleElements() |
|
249 | 1722 |
elif not self.Debug and self.SelectedElement is not None: |
42 | 1723 |
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
|
1724 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1725 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1726 |
self.RefreshScrollBars() |
155 | 1727 |
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
|
1728 |
elif keycode == wx.WXK_DOWN: |
42 | 1729 |
if event.ControlDown() and event.ShiftDown(): |
1730 |
self.Scroll(xpos, ymax) |
|
319 | 1731 |
self.RefreshVisibleElements() |
42 | 1732 |
elif event.ControlDown(): |
319 | 1733 |
self.RefreshScrollBars(height_incr=max(0, ypos + 1 - ymax)) |
1734 |
self.Scroll(xpos, ypos + 1) |
|
1735 |
self.RefreshVisibleElements() |
|
249 | 1736 |
elif not self.Debug and self.SelectedElement is not None: |
42 | 1737 |
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
|
1738 |
self.SelectedElement.RefreshModel() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1739 |
self.RefreshBuffer() |
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1740 |
self.RefreshScrollBars() |
155 | 1741 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(0, scaling[1])), False) |
249 | 1742 |
elif not self.Debug and keycode == wx.WXK_SPACE and self.SelectedElement is not None and self.SelectedElement.Dragging: |
216
93af9ac5aeaf
Not connecting wire on scaled graphics bug and forbidding copy on the fly of groups fixed
lbessard
parents:
213
diff
changeset
|
1743 |
if self.IsBlock(self.SelectedElement) or self.IsComment(self.SelectedElement): |
332 | 1744 |
block = self.CopyBlock(self.SelectedElement, wx.Point(*self.SelectedElement.GetPosition())) |
1745 |
event = wx.MouseEvent() |
|
1746 |
event.m_x, event.m_y = self.ScreenToClient(wx.GetMousePosition()) |
|
1747 |
dc = self.GetLogicalDC() |
|
1748 |
self.SelectedElement.OnLeftUp(event, dc, self.Scaling) |
|
1749 |
self.SelectedElement.SetSelected(False) |
|
1750 |
block.OnLeftDown(event, dc, self.Scaling) |
|
1751 |
self.SelectedElement = block |
|
1752 |
self.SelectedElement.SetSelected(True) |
|
216
93af9ac5aeaf
Not connecting wire on scaled graphics bug and forbidding copy on the fly of groups fixed
lbessard
parents:
213
diff
changeset
|
1753 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
267 | 1754 |
self.RefreshVisibleElements() |
216
93af9ac5aeaf
Not connecting wire on scaled graphics bug and forbidding copy on the fly of groups fixed
lbessard
parents:
213
diff
changeset
|
1755 |
else: |
93af9ac5aeaf
Not connecting wire on scaled graphics bug and forbidding copy on the fly of groups fixed
lbessard
parents:
213
diff
changeset
|
1756 |
event.Skip() |
97 | 1757 |
else: |
1758 |
event.Skip() |
|
27 | 1759 |
|
1760 |
#------------------------------------------------------------------------------- |
|
1761 |
# Model adding functions |
|
1762 |
#------------------------------------------------------------------------------- |
|
1763 |
||
145 | 1764 |
def GetScaledSize(self, width, height): |
1765 |
if self.Scaling is not None: |
|
1766 |
width = round(float(width) / float(self.Scaling[0]) + 0.4) * self.Scaling[0] |
|
1767 |
height = round(float(height) / float(self.Scaling[1]) + 0.4) * self.Scaling[1] |
|
1768 |
return width, height |
|
332 | 1769 |
|
27 | 1770 |
def AddNewBlock(self, bbox): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1771 |
dialog = BlockPropertiesDialog(self.ParentWindow, self.Controler) |
165 | 1772 |
dialog.SetPreviewFont(self.GetFont()) |
249 | 1773 |
dialog.SetBlockList(self.Controler.GetBlockTypes(self.TagName, self.Debug)) |
1774 |
dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug)) |
|
1775 |
dialog.SetPouElementNames(self.Controler.GetEditedElementVariables(self.TagName, self.Debug)) |
|
27 | 1776 |
dialog.SetMinBlockSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1777 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1778 |
id = self.GetNewId() |
1779 |
values = dialog.GetValues() |
|
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1780 |
values.setdefault("name", "") |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1781 |
block = FBD_Block(self, values["type"], values["name"], id, |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1782 |
values["extension"], values["inputs"], |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1783 |
executionControl = values["executionControl"], |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
1784 |
executionOrder = values["executionOrder"]) |
27 | 1785 |
block.SetPosition(bbox.x, bbox.y) |
145 | 1786 |
block.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1787 |
self.AddBlock(block) |
121 | 1788 |
self.Controler.AddEditedElementBlock(self.TagName, id, values["type"], values.get("name", None)) |
27 | 1789 |
self.RefreshBlockModel(block) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1790 |
self.RefreshBuffer() |
42 | 1791 |
self.RefreshScrollBars() |
249 | 1792 |
self.RefreshVisibleElements() |
144 | 1793 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
1794 |
self.ParentWindow.RefreshInstancesTree() |
144 | 1795 |
block.Refresh() |
27 | 1796 |
dialog.Destroy() |
1797 |
||
1798 |
def AddNewVariable(self, bbox): |
|
253 | 1799 |
words = self.TagName.split("::") |
1800 |
if words[0] == "T": |
|
1801 |
dialog = VariablePropertiesDialog(self.ParentWindow, self.Controler, words[2]) |
|
1802 |
else: |
|
1803 |
dialog = VariablePropertiesDialog(self.ParentWindow, self.Controler) |
|
165 | 1804 |
dialog.SetPreviewFont(self.GetFont()) |
27 | 1805 |
dialog.SetMinVariableSize((bbox.width, bbox.height)) |
1806 |
varlist = [] |
|
249 | 1807 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) |
27 | 1808 |
if vars: |
1809 |
for var in vars: |
|
70 | 1810 |
if var["Edit"]: |
1811 |
varlist.append((var["Name"], var["Class"], var["Type"])) |
|
249 | 1812 |
returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.Debug) |
27 | 1813 |
if returntype: |
121 | 1814 |
varlist.append((self.Controler.GetEditedElementName(self.TagName), "Output", returntype)) |
27 | 1815 |
dialog.SetVariables(varlist) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1816 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1817 |
id = self.GetNewId() |
1818 |
values = dialog.GetValues() |
|
1819 |
variable = FBD_Variable(self, values["type"], values["name"], values["value_type"], id) |
|
1820 |
variable.SetPosition(bbox.x, bbox.y) |
|
145 | 1821 |
variable.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1822 |
self.AddBlock(variable) |
121 | 1823 |
self.Controler.AddEditedElementVariable(self.TagName, id, values["type"]) |
27 | 1824 |
self.RefreshVariableModel(variable) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1825 |
self.RefreshBuffer() |
42 | 1826 |
self.RefreshScrollBars() |
249 | 1827 |
self.RefreshVisibleElements() |
144 | 1828 |
variable.Refresh() |
27 | 1829 |
dialog.Destroy() |
1830 |
||
1831 |
def AddNewConnection(self, bbox): |
|
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1832 |
dialog = ConnectionPropertiesDialog(self.ParentWindow, self.Controler) |
165 | 1833 |
dialog.SetPreviewFont(self.GetFont()) |
330 | 1834 |
dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug)) |
1835 |
dialog.SetPouElementNames(self.Controler.GetEditedElementVariables(self.TagName, self.Debug)) |
|
27 | 1836 |
dialog.SetMinConnectionSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1837 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1838 |
id = self.GetNewId() |
1839 |
values = dialog.GetValues() |
|
1840 |
connection = FBD_Connector(self, values["type"], values["name"], id) |
|
1841 |
connection.SetPosition(bbox.x, bbox.y) |
|
145 | 1842 |
connection.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1843 |
self.AddBlock(connection) |
121 | 1844 |
self.Controler.AddEditedElementConnection(self.TagName, id, values["type"]) |
27 | 1845 |
self.RefreshConnectionModel(connection) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1846 |
self.RefreshBuffer() |
42 | 1847 |
self.RefreshScrollBars() |
249 | 1848 |
self.RefreshVisibleElements() |
144 | 1849 |
connection.Refresh() |
27 | 1850 |
dialog.Destroy() |
1851 |
||
1852 |
def AddNewComment(self, bbox): |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1853 |
if wx.VERSION >= (2, 5, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1854 |
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
|
1855 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
1856 |
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
|
1857 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1858 |
value = dialog.GetValue() |
1859 |
id = self.GetNewId() |
|
1860 |
comment = Comment(self, value, id) |
|
1861 |
comment.SetPosition(bbox.x, bbox.y) |
|
1862 |
min_width, min_height = comment.GetMinSize() |
|
145 | 1863 |
comment.SetSize(*self.GetScaledSize(max(min_width,bbox.width),max(min_height,bbox.height))) |
42 | 1864 |
self.AddComment(comment) |
121 | 1865 |
self.Controler.AddEditedElementComment(self.TagName, id) |
27 | 1866 |
self.RefreshCommentModel(comment) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1867 |
self.RefreshBuffer() |
42 | 1868 |
self.RefreshScrollBars() |
249 | 1869 |
self.RefreshVisibleElements() |
144 | 1870 |
comment.Refresh() |
27 | 1871 |
dialog.Destroy() |
1872 |
||
1873 |
def AddNewContact(self, bbox): |
|
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1874 |
dialog = LDElementDialog(self.ParentWindow, self.Controler, "contact") |
165 | 1875 |
dialog.SetPreviewFont(self.GetFont()) |
27 | 1876 |
varlist = [] |
249 | 1877 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) |
27 | 1878 |
if vars: |
1879 |
for var in vars: |
|
277
5fc11b2d4fbb
Bug in contact edition not allowing output referencing fixed
lbessard
parents:
275
diff
changeset
|
1880 |
if var["Type"] == "BOOL": |
27 | 1881 |
varlist.append(var["Name"]) |
1882 |
dialog.SetVariables(varlist) |
|
1883 |
dialog.SetValues({"name":"","type":CONTACT_NORMAL}) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1884 |
dialog.SetElementSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1885 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1886 |
id = self.GetNewId() |
1887 |
values = dialog.GetValues() |
|
1888 |
contact = LD_Contact(self, values["type"], values["name"], id) |
|
1889 |
contact.SetPosition(bbox.x, bbox.y) |
|
145 | 1890 |
contact.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1891 |
self.AddBlock(contact) |
121 | 1892 |
self.Controler.AddEditedElementContact(self.TagName, id) |
27 | 1893 |
self.RefreshContactModel(contact) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1894 |
self.RefreshBuffer() |
42 | 1895 |
self.RefreshScrollBars() |
249 | 1896 |
self.RefreshVisibleElements() |
144 | 1897 |
contact.Refresh() |
27 | 1898 |
dialog.Destroy() |
1899 |
||
1900 |
def AddNewCoil(self, bbox): |
|
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1901 |
dialog = LDElementDialog(self.ParentWindow, self.Controler, "coil") |
165 | 1902 |
dialog.SetPreviewFont(self.GetFont()) |
27 | 1903 |
varlist = [] |
249 | 1904 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) |
27 | 1905 |
if vars: |
1906 |
for var in vars: |
|
1907 |
if var["Class"] != "Input" and var["Type"] == "BOOL": |
|
1908 |
varlist.append(var["Name"]) |
|
249 | 1909 |
returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.Debug) |
27 | 1910 |
if returntype == "BOOL": |
121 | 1911 |
varlist.append(self.Controler.GetEditedElementName(self.TagName)) |
27 | 1912 |
dialog.SetVariables(varlist) |
1913 |
dialog.SetValues({"name":"","type":COIL_NORMAL}) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
1914 |
dialog.SetElementSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1915 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1916 |
id = self.GetNewId() |
1917 |
values = dialog.GetValues() |
|
1918 |
coil = LD_Coil(self, values["type"], values["name"], id) |
|
1919 |
coil.SetPosition(bbox.x, bbox.y) |
|
145 | 1920 |
coil.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1921 |
self.AddBlock(coil) |
121 | 1922 |
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
|
1923 |
self.RefreshCoilModel(coil) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1924 |
self.RefreshBuffer() |
42 | 1925 |
self.RefreshScrollBars() |
249 | 1926 |
self.RefreshVisibleElements() |
144 | 1927 |
coil.Refresh() |
27 | 1928 |
dialog.Destroy() |
1929 |
||
1930 |
def AddNewPowerRail(self, bbox): |
|
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1931 |
dialog = LDPowerRailDialog(self.ParentWindow, self.Controler) |
165 | 1932 |
dialog.SetPreviewFont(self.GetFont()) |
27 | 1933 |
dialog.SetMinSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1934 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1935 |
id = self.GetNewId() |
1936 |
values = dialog.GetValues() |
|
1937 |
powerrail = LD_PowerRail(self, values["type"], id, [True for i in xrange(values["number"])]) |
|
1938 |
powerrail.SetPosition(bbox.x, bbox.y) |
|
145 | 1939 |
powerrail.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
42 | 1940 |
self.AddBlock(powerrail) |
121 | 1941 |
self.Controler.AddEditedElementPowerRail(self.TagName, id, values["type"]) |
27 | 1942 |
self.RefreshPowerRailModel(powerrail) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1943 |
self.RefreshBuffer() |
42 | 1944 |
self.RefreshScrollBars() |
249 | 1945 |
self.RefreshVisibleElements() |
144 | 1946 |
powerrail.Refresh() |
27 | 1947 |
dialog.Destroy() |
1948 |
||
71 | 1949 |
def AddNewStep(self, bbox, initial = False): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1950 |
dialog = StepContentDialog(self.ParentWindow, self.Controler, initial) |
165 | 1951 |
dialog.SetPreviewFont(self.GetFont()) |
249 | 1952 |
dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug)) |
1953 |
dialog.SetVariables(self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)) |
|
71 | 1954 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step)]) |
1955 |
dialog.SetMinStepSize((bbox.width, bbox.height)) |
|
1956 |
if dialog.ShowModal() == wx.ID_OK: |
|
1957 |
id = self.GetNewId() |
|
1958 |
values = dialog.GetValues() |
|
1959 |
step = SFC_Step(self, values["name"], initial, id) |
|
1960 |
if values["input"]: |
|
1961 |
step.AddInput() |
|
1962 |
else: |
|
1963 |
step.RemoveInput() |
|
1964 |
if values["output"]: |
|
1965 |
step.AddOutput() |
|
1966 |
else: |
|
1967 |
step.RemoveOutput() |
|
1968 |
if values["action"]: |
|
1969 |
step.AddAction() |
|
1970 |
else: |
|
1971 |
step.RemoveAction() |
|
1972 |
step.SetPosition(bbox.x, bbox.y) |
|
1973 |
min_width, min_height = step.GetMinSize() |
|
145 | 1974 |
step.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
71 | 1975 |
self.AddBlock(step) |
121 | 1976 |
self.Controler.AddEditedElementStep(self.TagName, id) |
71 | 1977 |
self.RefreshStepModel(step) |
1978 |
self.RefreshBuffer() |
|
1979 |
self.RefreshScrollBars() |
|
249 | 1980 |
self.RefreshVisibleElements() |
144 | 1981 |
step.Refresh() |
71 | 1982 |
dialog.Destroy() |
1983 |
||
27 | 1984 |
def AddNewTransition(self, bbox): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
1985 |
dialog = TransitionContentDialog(self.ParentWindow, self.Controler, self.GetDrawingMode() == FREEDRAWING_MODE) |
165 | 1986 |
dialog.SetPreviewFont(self.GetFont()) |
249 | 1987 |
dialog.SetTransitions(self.Controler.GetEditedElementTransitions(self.TagName, self.Debug)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
1988 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 1989 |
id = self.GetNewId() |
1990 |
values = dialog.GetValues() |
|
80 | 1991 |
transition = SFC_Transition(self, values["type"], values["value"], values["priority"], id) |
27 | 1992 |
transition.SetPosition(bbox.x, bbox.y) |
1993 |
min_width, min_height = transition.GetMinSize() |
|
145 | 1994 |
transition.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
42 | 1995 |
self.AddBlock(transition) |
121 | 1996 |
self.Controler.AddEditedElementTransition(self.TagName, id) |
27 | 1997 |
self.RefreshTransitionModel(transition) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
1998 |
self.RefreshBuffer() |
42 | 1999 |
self.RefreshScrollBars() |
249 | 2000 |
self.RefreshVisibleElements() |
144 | 2001 |
transition.Refresh() |
27 | 2002 |
dialog.Destroy() |
2003 |
||
2004 |
def AddNewDivergence(self, bbox): |
|
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2005 |
dialog = DivergenceCreateDialog(self.ParentWindow, self.Controler) |
165 | 2006 |
dialog.SetPreviewFont(self.GetFont()) |
27 | 2007 |
dialog.SetMinSize((bbox.width, bbox.height)) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2008 |
if dialog.ShowModal() == wx.ID_OK: |
27 | 2009 |
id = self.GetNewId() |
2010 |
values = dialog.GetValues() |
|
2011 |
divergence = SFC_Divergence(self, values["type"], values["number"], id) |
|
2012 |
divergence.SetPosition(bbox.x, bbox.y) |
|
111 | 2013 |
min_width, min_height = divergence.GetMinSize(True) |
145 | 2014 |
divergence.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
42 | 2015 |
self.AddBlock(divergence) |
121 | 2016 |
self.Controler.AddEditedElementDivergence(self.TagName, id, values["type"]) |
27 | 2017 |
self.RefreshDivergenceModel(divergence) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
2018 |
self.RefreshBuffer() |
42 | 2019 |
self.RefreshScrollBars() |
249 | 2020 |
self.RefreshVisibleElements() |
144 | 2021 |
divergence.Refresh() |
27 | 2022 |
dialog.Destroy() |
0 | 2023 |
|
108 | 2024 |
def AddNewJump(self, bbox): |
2025 |
choices = [] |
|
2026 |
for block in self.Blocks: |
|
2027 |
if isinstance(block, SFC_Step): |
|
2028 |
choices.append(block.GetName()) |
|
2029 |
dialog = wx.SingleChoiceDialog(self.ParentWindow, "Add a new jump", "Please choose a target", choices, wx.OK|wx.CANCEL) |
|
2030 |
if dialog.ShowModal() == wx.ID_OK: |
|
2031 |
id = self.GetNewId() |
|
2032 |
value = dialog.GetStringSelection() |
|
2033 |
jump = SFC_Jump(self, value, id) |
|
2034 |
jump.SetPosition(bbox.x, bbox.y) |
|
2035 |
min_width, min_height = jump.GetMinSize() |
|
145 | 2036 |
jump.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
108 | 2037 |
self.AddBlock(jump) |
121 | 2038 |
self.Controler.AddEditedElementJump(self.TagName, id) |
108 | 2039 |
self.RefreshJumpModel(jump) |
2040 |
self.RefreshBuffer() |
|
2041 |
self.RefreshScrollBars() |
|
249 | 2042 |
self.RefreshVisibleElements() |
144 | 2043 |
jump.Refresh() |
108 | 2044 |
dialog.Destroy() |
2045 |
||
2046 |
def AddNewActionBlock(self, bbox): |
|
2047 |
dialog = ActionBlockDialog(self.ParentWindow) |
|
2048 |
dialog.SetQualifierList(self.Controler.GetQualifierTypes()) |
|
249 | 2049 |
dialog.SetActionList(self.Controler.GetEditedElementActions(self.TagName, self.Debug)) |
2050 |
dialog.SetVariableList(self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)) |
|
108 | 2051 |
if dialog.ShowModal() == wx.ID_OK: |
2052 |
actions = dialog.GetValues() |
|
2053 |
id = self.GetNewId() |
|
2054 |
actionblock = SFC_ActionBlock(self, actions, id) |
|
2055 |
actionblock.SetPosition(bbox.x, bbox.y) |
|
2056 |
min_width, min_height = actionblock.GetMinSize() |
|
145 | 2057 |
actionblock.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height))) |
108 | 2058 |
self.AddBlock(actionblock) |
121 | 2059 |
self.Controler.AddEditedElementActionBlock(self.TagName, id) |
108 | 2060 |
self.RefreshActionBlockModel(actionblock) |
2061 |
self.RefreshBuffer() |
|
2062 |
self.RefreshScrollBars() |
|
249 | 2063 |
self.RefreshVisibleElements() |
144 | 2064 |
actionblock.Refresh() |
108 | 2065 |
dialog.Destroy() |
27 | 2066 |
|
2067 |
#------------------------------------------------------------------------------- |
|
2068 |
# Edit element content functions |
|
2069 |
#------------------------------------------------------------------------------- |
|
2070 |
||
2071 |
def EditBlockContent(self, block): |
|
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2072 |
dialog = BlockPropertiesDialog(self.ParentWindow, self.Controler) |
165 | 2073 |
dialog.SetPreviewFont(self.GetFont()) |
249 | 2074 |
dialog.SetBlockList(self.Controler.GetBlockTypes(self.TagName, self.Debug)) |
2075 |
dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug)) |
|
2076 |
variable_names = self.Controler.GetEditedElementVariables(self.TagName, self.Debug) |
|
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
2077 |
if block.GetName() != "": |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
2078 |
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
|
2079 |
dialog.SetPouElementNames(variable_names) |
27 | 2080 |
dialog.SetMinBlockSize(block.GetSize()) |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2081 |
old_values = {"name" : block.GetName(), |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2082 |
"type" : block.GetType(), |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2083 |
"extension" : block.GetExtension(), |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2084 |
"inputs" : block.GetInputTypes(), |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2085 |
"executionControl" : block.GetExecutionControl(), |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2086 |
"executionOrder" : block.GetExecutionOrder()} |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
2087 |
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
|
2088 |
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
|
2089 |
new_values = dialog.GetValues() |
154 | 2090 |
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
|
2091 |
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
|
2092 |
block.SetName(new_values["name"]) |
154 | 2093 |
else: |
2094 |
block.SetName("") |
|
145 | 2095 |
block.SetSize(*self.GetScaledSize(new_values["width"], new_values["height"])) |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2096 |
block.SetType(new_values["type"], new_values["extension"], executionControl = new_values["executionControl"]) |
118
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
2097 |
block.SetExecutionOrder(new_values["executionOrder"]) |
154 | 2098 |
rect = rect.Union(block.GetRedrawRect()) |
27 | 2099 |
self.RefreshBlockModel(block) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
2100 |
self.RefreshBuffer() |
42 | 2101 |
self.RefreshScrollBars() |
249 | 2102 |
self.RefreshVisibleElements() |
144 | 2103 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
2104 |
self.ParentWindow.RefreshInstancesTree() |
269
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2105 |
if old_values["executionOrder"] != new_values["executionOrder"]: |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2106 |
self.RefreshView() |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2107 |
else: |
34eff05909b0
Adding support for EN/ENO variables (temporarily disabled, waiting for matiec support)
lbessard
parents:
267
diff
changeset
|
2108 |
block.Refresh(rect) |
27 | 2109 |
dialog.Destroy() |
2110 |
||
2111 |
def EditVariableContent(self, variable): |
|
253 | 2112 |
words = self.TagName.split("::") |
2113 |
if words[0] == "T": |
|
2114 |
dialog = VariablePropertiesDialog(self.ParentWindow, self.Controler, words[2]) |
|
2115 |
else: |
|
2116 |
dialog = VariablePropertiesDialog(self.ParentWindow, self.Controler) |
|
165 | 2117 |
dialog.SetPreviewFont(self.GetFont()) |
27 | 2118 |
dialog.SetMinVariableSize(variable.GetSize()) |
2119 |
varlist = [] |
|
249 | 2120 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) |
27 | 2121 |
if vars: |
2122 |
for var in vars: |
|
70 | 2123 |
if var["Edit"]: |
2124 |
varlist.append((var["Name"], var["Class"], var["Type"])) |
|
249 | 2125 |
returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.Debug) |
27 | 2126 |
if returntype: |
121 | 2127 |
varlist.append((self.Controler.GetEditedElementName(self.TagName), "Output", returntype)) |
27 | 2128 |
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
|
2129 |
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
|
2130 |
"executionOrder" : variable.GetExecutionOrder()} |
0c53d6a36013
Add support for defining execution order in FBD networks (related ST code not generated yet)
lbessard
parents:
114
diff
changeset
|
2131 |
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
|
2132 |
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
|
2133 |
new_values = dialog.GetValues() |
154 | 2134 |
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
|
2135 |
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
|
2136 |
variable.SetType(new_values["type"], new_values["value_type"]) |
145 | 2137 |
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
|
2138 |
variable.SetExecutionOrder(new_values["executionOrder"]) |
154 | 2139 |
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
|
2140 |
if old_values["type"] != new_values["type"]: |
27 | 2141 |
id = variable.GetId() |
121 | 2142 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
2143 |
self.Controler.AddEditedElementVariable(self.TagName, id, new_values["type"]) |
|
27 | 2144 |
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
|
2145 |
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
|
2146 |
self.RefreshView() |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
2147 |
self.RefreshBuffer() |
249 | 2148 |
self.RefreshVisibleElements() |
42 | 2149 |
self.RefreshScrollBars() |
154 | 2150 |
variable.Refresh(rect) |
27 | 2151 |
dialog.Destroy() |
2152 |
||
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2153 |
def EditConnectionContent(self, connection): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2154 |
dialog = ConnectionPropertiesDialog(self.ParentWindow, self.Controler) |
165 | 2155 |
dialog.SetPreviewFont(self.GetFont()) |
330 | 2156 |
dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug)) |
2157 |
dialog.SetPouElementNames(self.Controler.GetEditedElementVariables(self.TagName, self.Debug)) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2158 |
dialog.SetMinConnectionSize(connection.GetSize()) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2159 |
values = {"name" : connection.GetName(), "type" : connection.GetType()} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2160 |
dialog.SetValues(values) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2161 |
if dialog.ShowModal() == wx.ID_OK: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2162 |
old_type = connection.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2163 |
values = dialog.GetValues() |
154 | 2164 |
rect = connection.GetRedrawRect(1, 1) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2165 |
connection.SetName(values["name"]) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2166 |
connection.SetType(values["type"]) |
145 | 2167 |
connection.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 2168 |
rect = rect.Union(connection.GetRedrawRect()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2169 |
if old_type != values["type"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2170 |
id = connection.GetId() |
121 | 2171 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
2172 |
self.Controler.AddEditedElementConnection(self.TagName, id, values["type"]) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2173 |
self.RefreshConnectionModel(connection) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
2174 |
self.RefreshBuffer() |
42 | 2175 |
self.RefreshScrollBars() |
249 | 2176 |
self.RefreshVisibleElements() |
154 | 2177 |
connection.Refresh(rect) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2178 |
dialog.Destroy() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2179 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2180 |
def EditContactContent(self, contact): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2181 |
dialog = LDElementDialog(self.ParentWindow, self.Controler, "contact") |
165 | 2182 |
dialog.SetPreviewFont(self.GetFont()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2183 |
varlist = [] |
249 | 2184 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2185 |
if vars: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2186 |
for var in vars: |
277
5fc11b2d4fbb
Bug in contact edition not allowing output referencing fixed
lbessard
parents:
275
diff
changeset
|
2187 |
if var["Type"] == "BOOL": |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2188 |
varlist.append(var["Name"]) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2189 |
dialog.SetVariables(varlist) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2190 |
values = {"name" : contact.GetName(), "type" : contact.GetType()} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2191 |
dialog.SetValues(values) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2192 |
dialog.SetElementSize(contact.GetSize()) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2193 |
if dialog.ShowModal() == wx.ID_OK: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2194 |
values = dialog.GetValues() |
154 | 2195 |
rect = contact.GetRedrawRect(1, 1) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2196 |
contact.SetName(values["name"]) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2197 |
contact.SetType(values["type"]) |
145 | 2198 |
contact.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 2199 |
rect = rect.Union(contact.GetRedrawRect()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2200 |
self.RefreshContactModel(contact) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
2201 |
self.RefreshBuffer() |
42 | 2202 |
self.RefreshScrollBars() |
249 | 2203 |
self.RefreshVisibleElements() |
154 | 2204 |
contact.Refresh(rect) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2205 |
dialog.Destroy() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2206 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2207 |
def EditCoilContent(self, coil): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2208 |
dialog = LDElementDialog(self.ParentWindow, self.Controler, "coil") |
165 | 2209 |
dialog.SetPreviewFont(self.GetFont()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2210 |
varlist = [] |
249 | 2211 |
vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2212 |
if vars: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2213 |
for var in vars: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2214 |
if var["Class"] != "Input" and var["Type"] == "BOOL": |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2215 |
varlist.append(var["Name"]) |
249 | 2216 |
returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.Debug) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2217 |
if returntype == "BOOL": |
121 | 2218 |
varlist.append(self.Controler.GetEditedElementName(self.TagName)) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2219 |
dialog.SetVariables(varlist) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2220 |
values = {"name" : coil.GetName(), "type" : coil.GetType()} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2221 |
dialog.SetValues(values) |
61
dc7142ae9438
Adding possibility to change Type and Pin number of power rails
lbessard
parents:
58
diff
changeset
|
2222 |
dialog.SetElementSize(coil.GetSize()) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2223 |
if dialog.ShowModal() == wx.ID_OK: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2224 |
values = dialog.GetValues() |
154 | 2225 |
rect = coil.GetRedrawRect(1, 1) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2226 |
coil.SetName(values["name"]) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2227 |
coil.SetType(values["type"]) |
145 | 2228 |
coil.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 2229 |
rect = rect.Union(coil.GetRedrawRect()) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2230 |
self.RefreshCoilModel(coil) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
2231 |
self.RefreshBuffer() |
42 | 2232 |
self.RefreshScrollBars() |
249 | 2233 |
self.RefreshVisibleElements() |
154 | 2234 |
coil.Refresh(rect) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2235 |
dialog.Destroy() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2236 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2237 |
def EditPowerRailContent(self, powerrail): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2238 |
dialog = LDPowerRailDialog(self.ParentWindow, self.Controler, powerrail.GetType(), len(powerrail.GetConnectors())) |
165 | 2239 |
dialog.SetPreviewFont(self.GetFont()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2240 |
dialog.SetMinSize(powerrail.GetSize()) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2241 |
if dialog.ShowModal() == wx.ID_OK: |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2242 |
old_type = powerrail.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2243 |
values = dialog.GetValues() |
154 | 2244 |
rect = powerrail.GetRedrawRect(1, 1) |
61
dc7142ae9438
Adding possibility to change Type and Pin number of power rails
lbessard
parents:
58
diff
changeset
|
2245 |
powerrail.SetType(values["type"], [True for i in xrange(values["number"])]) |
145 | 2246 |
powerrail.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 2247 |
rect = rect.Union(powerrail.GetRedrawRect()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2248 |
if old_type != values["type"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2249 |
id = powerrail.GetId() |
121 | 2250 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
2251 |
self.Controler.AddEditedElementPowerRail(self.TagName, id, values["type"]) |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2252 |
self.RefreshPowerRailModel(powerrail) |
56
7187e1c00975
Adding support for Undo/Redo and Unsaved File On Close detection
lbessard
parents:
54
diff
changeset
|
2253 |
self.RefreshBuffer() |
42 | 2254 |
self.RefreshScrollBars() |
249 | 2255 |
self.RefreshVisibleElements() |
154 | 2256 |
powerrail.Refresh(rect) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2257 |
dialog.Destroy() |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2258 |
|
71 | 2259 |
def EditStepContent(self, step): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2260 |
dialog = StepContentDialog(self.ParentWindow, self.Controler, step.GetInitial()) |
165 | 2261 |
dialog.SetPreviewFont(self.GetFont()) |
249 | 2262 |
dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug)) |
2263 |
dialog.SetVariables(self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)) |
|
71 | 2264 |
dialog.SetStepNames([block.GetName() for block in self.Blocks if isinstance(block, SFC_Step) and block.GetName() != step.GetName()]) |
2265 |
dialog.SetMinStepSize(step.GetSize()) |
|
2266 |
values = {"name" : step.GetName()} |
|
2267 |
connectors = step.GetConnectors() |
|
2268 |
values["input"] = connectors["input"] != None |
|
2269 |
values["output"] = connectors["output"] != None |
|
2270 |
values["action"] = connectors["action"] != None |
|
2271 |
dialog.SetValues(values) |
|
2272 |
if dialog.ShowModal() == wx.ID_OK: |
|
2273 |
values = dialog.GetValues() |
|
154 | 2274 |
rect = step.GetRedrawRect(1, 1) |
71 | 2275 |
step.SetName(values["name"]) |
2276 |
if values["input"]: |
|
2277 |
step.AddInput() |
|
2278 |
else: |
|
2279 |
step.RemoveInput() |
|
2280 |
if values["output"]: |
|
2281 |
step.AddOutput() |
|
2282 |
else: |
|
2283 |
step.RemoveOutput() |
|
2284 |
if values["action"]: |
|
2285 |
step.AddAction() |
|
2286 |
else: |
|
2287 |
step.RemoveAction() |
|
145 | 2288 |
step.UpdateSize(*self.GetScaledSize(values["width"], values["height"])) |
154 | 2289 |
rect = rect.Union(step.GetRedrawRect()) |
2290 |
self.RefreshStepModel(step) |
|
2291 |
self.RefreshBuffer() |
|
2292 |
self.RefreshScrollBars() |
|
249 | 2293 |
self.RefreshVisibleElements() |
154 | 2294 |
step.Refresh(rect) |
71 | 2295 |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2296 |
def EditTransitionContent(self, transition): |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2297 |
dialog = TransitionContentDialog(self.ParentWindow, self.Controler, self.GetDrawingMode() == FREEDRAWING_MODE) |
165 | 2298 |
dialog.SetPreviewFont(self.GetFont()) |
249 | 2299 |
dialog.SetTransitions(self.Controler.GetEditedElementTransitions(self.TagName, self.Debug)) |
80 | 2300 |
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
|
2301 |
dialog.SetElementSize(transition.GetSize()) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2302 |
if dialog.ShowModal() == wx.ID_OK: |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2303 |
values = dialog.GetValues() |
154 | 2304 |
rect = transition.GetRedrawRect(1, 1) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2305 |
transition.SetType(values["type"],values["value"]) |
80 | 2306 |
transition.SetPriority(values["priority"]) |
154 | 2307 |
rect = rect.Union(transition.GetRedrawRect()) |
2308 |
self.RefreshTransitionModel(transition) |
|
2309 |
self.RefreshBuffer() |
|
2310 |
self.RefreshScrollBars() |
|
249 | 2311 |
self.RefreshVisibleElements() |
154 | 2312 |
transition.Refresh(rect) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2313 |
dialog.Destroy() |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2314 |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2315 |
def EditJumpContent(self, jump): |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2316 |
choices = [] |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2317 |
for block in self.Blocks: |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2318 |
if isinstance(block, SFC_Step): |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2319 |
choices.append(block.GetName()) |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2320 |
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
|
2321 |
dialog.SetSelection(choices.index(jump.GetTarget())) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2322 |
if dialog.ShowModal() == wx.ID_OK: |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2323 |
value = dialog.GetStringSelection() |
154 | 2324 |
rect = jump.GetRedrawRect(1, 1) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2325 |
jump.SetTarget(value) |
154 | 2326 |
rect = rect.Union(jump.GetRedrawRect()) |
2327 |
self.RefreshJumpModel(jump) |
|
2328 |
self.RefreshBuffer() |
|
2329 |
self.RefreshScrollBars() |
|
249 | 2330 |
self.RefreshVisibleElements() |
154 | 2331 |
jump.Refresh(rect) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2332 |
dialog.Destroy() |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2333 |
|
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2334 |
def EditActionBlockContent(self, actionblock): |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2335 |
dialog = ActionBlockDialog(self.ParentWindow) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2336 |
dialog.SetQualifierList(self.Controler.GetQualifierTypes()) |
249 | 2337 |
dialog.SetActionList(self.Controler.GetEditedElementActions(self.TagName, self.Debug)) |
2338 |
dialog.SetVariableList(self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)) |
|
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2339 |
dialog.SetValues(actionblock.GetActions()) |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2340 |
if dialog.ShowModal() == wx.ID_OK: |
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2341 |
actions = dialog.GetValues() |
154 | 2342 |
rect = actionblock.GetRedrawRect(1, 1) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2343 |
actionblock.SetActions(actions) |
145 | 2344 |
actionblock.SetSize(*self.GetScaledSize(*actionblock.GetSize())) |
154 | 2345 |
rect = rect.Union(actionblock.GetRedrawRect()) |
2346 |
self.RefreshActionBlockModel(actionblock) |
|
2347 |
self.RefreshBuffer() |
|
2348 |
self.RefreshScrollBars() |
|
249 | 2349 |
self.RefreshVisibleElements() |
154 | 2350 |
actionblock.Refresh(rect) |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2351 |
dialog.Destroy() |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2352 |
|
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2353 |
def EditCommentContent(self, comment): |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2354 |
if wx.VERSION >= (2, 5, 0): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2355 |
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
|
2356 |
else: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2357 |
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
|
2358 |
if dialog.ShowModal() == wx.ID_OK: |
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2359 |
value = dialog.GetValue() |
154 | 2360 |
rect = comment.GetRedrawRect(1, 1) |
90
2245e8776086
Adding support support for using PLCOpenEditor with Beremiz
lbessard
parents:
80
diff
changeset
|
2361 |
comment.SetContent(value) |
145 | 2362 |
comment.SetSize(*self.GetScaledSize(*comment.GetSize())) |
154 | 2363 |
rect = rect.Union(comment.GetRedrawRect()) |
2364 |
self.RefreshCommentModel(comment) |
|
2365 |
self.RefreshBuffer() |
|
2366 |
self.RefreshScrollBars() |
|
249 | 2367 |
self.RefreshVisibleElements() |
154 | 2368 |
comment.Refresh(rect) |
64
dd6f693e46a1
Cleaning code for using only wxPython 2.6 class naming
lbessard
parents:
61
diff
changeset
|
2369 |
dialog.Destroy() |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2370 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2371 |
#------------------------------------------------------------------------------- |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2372 |
# Model update functions |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2373 |
#------------------------------------------------------------------------------- |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2374 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2375 |
def RefreshBlockModel(self, block): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2376 |
blockid = block.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2377 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2378 |
infos["type"] = block.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2379 |
infos["name"] = block.GetName() |
145 | 2380 |
if self.CurrentLanguage == "FBD": |
2381 |
infos["executionOrder"] = block.GetExecutionOrder() |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2382 |
infos["x"], infos["y"] = block.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2383 |
infos["width"], infos["height"] = block.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2384 |
infos["connectors"] = block.GetConnectors() |
121 | 2385 |
self.Controler.SetEditedElementBlockInfos(self.TagName, blockid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2386 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2387 |
def RefreshVariableModel(self, variable): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2388 |
variableid = variable.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2389 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2390 |
infos["name"] = variable.GetName() |
145 | 2391 |
if self.CurrentLanguage == "FBD": |
2392 |
infos["executionOrder"] = variable.GetExecutionOrder() |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2393 |
infos["x"], infos["y"] = variable.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2394 |
infos["width"], infos["height"] = variable.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2395 |
infos["connectors"] = variable.GetConnectors() |
121 | 2396 |
self.Controler.SetEditedElementVariableInfos(self.TagName, variableid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2397 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2398 |
def RefreshConnectionModel(self, connection): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2399 |
connectionid = connection.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2400 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2401 |
infos["name"] = connection.GetName() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2402 |
infos["x"], infos["y"] = connection.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2403 |
infos["width"], infos["height"] = connection.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2404 |
infos["connector"] = connection.GetConnector() |
121 | 2405 |
self.Controler.SetEditedElementConnectionInfos(self.TagName, connectionid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2406 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2407 |
def RefreshCommentModel(self, comment): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2408 |
commentid = comment.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2409 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2410 |
infos["content"] = comment.GetContent() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2411 |
infos["x"], infos["y"] = comment.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2412 |
infos["width"], infos["height"] = comment.GetSize() |
121 | 2413 |
self.Controler.SetEditedElementCommentInfos(self.TagName, commentid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2414 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2415 |
def RefreshPowerRailModel(self, powerrail): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2416 |
powerrailid = powerrail.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2417 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2418 |
infos["x"], infos["y"] = powerrail.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2419 |
infos["width"], infos["height"] = powerrail.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2420 |
infos["connectors"] = powerrail.GetConnectors() |
121 | 2421 |
self.Controler.SetEditedElementPowerRailInfos(self.TagName, powerrailid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2422 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2423 |
def RefreshContactModel(self, contact): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2424 |
contactid = contact.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2425 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2426 |
infos["name"] = contact.GetName() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2427 |
infos["type"] = contact.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2428 |
infos["x"], infos["y"] = contact.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2429 |
infos["width"], infos["height"] = contact.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2430 |
infos["connectors"] = contact.GetConnectors() |
121 | 2431 |
self.Controler.SetEditedElementContactInfos(self.TagName, contactid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2432 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2433 |
def RefreshCoilModel(self, coil): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2434 |
coilid = coil.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2435 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2436 |
infos["name"] = coil.GetName() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2437 |
infos["type"] = coil.GetType() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2438 |
infos["x"], infos["y"] = coil.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2439 |
infos["width"], infos["height"] = coil.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2440 |
infos["connectors"] = coil.GetConnectors() |
121 | 2441 |
self.Controler.SetEditedElementCoilInfos(self.TagName, coilid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2442 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2443 |
def RefreshStepModel(self, step): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2444 |
stepid = step.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2445 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2446 |
infos["name"] = step.GetName() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2447 |
infos["initial"] = step.GetInitial() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2448 |
infos["x"], infos["y"] = step.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2449 |
infos["width"], infos["height"] = step.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2450 |
infos["connectors"] = step.GetConnectors() |
121 | 2451 |
self.Controler.SetEditedElementStepInfos(self.TagName, stepid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2452 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2453 |
def RefreshTransitionModel(self, transition): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2454 |
transitionid = transition.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2455 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2456 |
infos["type"] = transition.GetType() |
80 | 2457 |
infos["priority"] = transition.GetPriority() |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2458 |
infos["condition"] = transition.GetCondition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2459 |
infos["x"], infos["y"] = transition.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2460 |
infos["width"], infos["height"] = transition.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2461 |
infos["connectors"] = transition.GetConnectors() |
121 | 2462 |
self.Controler.SetEditedElementTransitionInfos(self.TagName, transitionid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2463 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2464 |
def RefreshDivergenceModel(self, divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2465 |
divergenceid = divergence.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2466 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2467 |
infos["x"], infos["y"] = divergence.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2468 |
infos["width"], infos["height"] = divergence.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2469 |
infos["connectors"] = divergence.GetConnectors() |
121 | 2470 |
self.Controler.SetEditedElementDivergenceInfos(self.TagName, divergenceid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2471 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2472 |
def RefreshJumpModel(self, jump): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2473 |
jumpid = jump.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2474 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2475 |
infos["target"] = jump.GetTarget() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2476 |
infos["x"], infos["y"] = jump.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2477 |
infos["width"], infos["height"] = jump.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2478 |
infos["connector"] = jump.GetConnector() |
121 | 2479 |
self.Controler.SetEditedElementJumpInfos(self.TagName, jumpid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2480 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2481 |
def RefreshActionBlockModel(self, actionblock): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2482 |
actionblockid = actionblock.GetId() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2483 |
infos = {} |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2484 |
infos["actions"] = actionblock.GetActions() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2485 |
infos["x"], infos["y"] = actionblock.GetPosition() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2486 |
infos["width"], infos["height"] = actionblock.GetSize() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2487 |
infos["connector"] = actionblock.GetConnector() |
121 | 2488 |
self.Controler.SetEditedElementActionBlockInfos(self.TagName, actionblockid, infos) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2489 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2490 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2491 |
#------------------------------------------------------------------------------- |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2492 |
# Model delete functions |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2493 |
#------------------------------------------------------------------------------- |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2494 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2495 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2496 |
def DeleteBlock(self, block): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2497 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2498 |
for output in block.GetConnectors()["outputs"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2499 |
for element in output.GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2500 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2501 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2502 |
block.Clean() |
42 | 2503 |
self.RemoveBlock(block) |
121 | 2504 |
self.Controler.RemoveEditedElementInstance(self.TagName, block.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2505 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2506 |
element.RefreshModel() |
144 | 2507 |
wx.CallAfter(self.ParentWindow.RefreshVariablePanel, self.TagName) |
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
2508 |
wx.CallAfter(self.ParentWindow.RefreshInstancesTree) |
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
2509 |
|
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2510 |
def DeleteVariable(self, variable): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2511 |
connectors = variable.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2512 |
if connectors["output"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2513 |
elements = connectors["output"].GetConnectedBlocks() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2514 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2515 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2516 |
variable.Clean() |
42 | 2517 |
self.RemoveBlock(variable) |
121 | 2518 |
self.Controler.RemoveEditedElementInstance(self.TagName, variable.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2519 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2520 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2521 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2522 |
def DeleteConnection(self, connection): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2523 |
if connection.GetType() == CONTINUATION: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2524 |
elements = connection.GetConnector().GetConnectedBlocks() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2525 |
else: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2526 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2527 |
connection.Clean() |
42 | 2528 |
self.RemoveBlock(connection) |
121 | 2529 |
self.Controler.RemoveEditedElementInstance(self.TagName, connection.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2530 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2531 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2532 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2533 |
def DeleteComment(self, comment): |
42 | 2534 |
self.RemoveComment(comment) |
121 | 2535 |
self.Controler.RemoveEditedElementInstance(self.TagName, comment.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2536 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2537 |
def DeleteWire(self, wire): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2538 |
if wire in self.Wires: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2539 |
connected = wire.GetConnected() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2540 |
wire.Clean() |
42 | 2541 |
self.RemoveWire(wire) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2542 |
for connector in connected: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2543 |
connector.RefreshParentBlock() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2544 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2545 |
def DeleteContact(self, contact): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2546 |
connectors = contact.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2547 |
elements = connectors["output"].GetConnectedBlocks() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2548 |
contact.Clean() |
42 | 2549 |
self.RemoveBlock(contact) |
121 | 2550 |
self.Controler.RemoveEditedElementInstance(self.TagName, contact.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2551 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2552 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2553 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2554 |
def DeleteCoil(self, coil): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2555 |
connectors = coil.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2556 |
elements = connectors["output"].GetConnectedBlocks() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2557 |
coil.Clean() |
42 | 2558 |
self.RemoveBlock(coil) |
121 | 2559 |
self.Controler.RemoveEditedElementInstance(self.TagName, coil.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2560 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2561 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2562 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2563 |
def DeletePowerRail(self, powerrail): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2564 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2565 |
if powerrail.GetType() == LEFTRAIL: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2566 |
for connector in powerrail.GetConnectors(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2567 |
for element in connector.GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2568 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2569 |
elements.append(element) |
108 | 2570 |
powerrail.Clean() |
2571 |
self.RemoveBlock(powerrail) |
|
121 | 2572 |
self.Controler.RemoveEditedElementInstance(self.TagName, powerrail.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2573 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2574 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2575 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2576 |
def DeleteStep(self, step): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2577 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2578 |
connectors = step.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2579 |
if connectors["output"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2580 |
for element in connectors["output"].GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2581 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2582 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2583 |
if connectors["action"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2584 |
for element in connectors["action"].GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2585 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2586 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2587 |
step.Clean() |
42 | 2588 |
self.RemoveBlock(step) |
121 | 2589 |
self.Controler.RemoveEditedElementInstance(self.TagName, step.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2590 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2591 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2592 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2593 |
def DeleteTransition(self, transition): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2594 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2595 |
connectors = transition.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2596 |
if connectors["output"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2597 |
for element in connectors["output"].GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2598 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2599 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2600 |
transition.Clean() |
42 | 2601 |
self.RemoveBlock(transition) |
121 | 2602 |
self.Controler.RemoveEditedElementInstance(self.TagName, transition.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2603 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2604 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2605 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2606 |
def DeleteDivergence(self, divergence): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2607 |
elements = [] |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2608 |
connectors = divergence.GetConnectors() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2609 |
for output in connectors["outputs"]: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2610 |
for element in output.GetConnectedBlocks(): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2611 |
if element not in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2612 |
elements.append(element) |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2613 |
divergence.Clean() |
42 | 2614 |
self.RemoveBlock(divergence) |
121 | 2615 |
self.Controler.RemoveEditedElementInstance(self.TagName, divergence.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2616 |
for element in elements: |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2617 |
element.RefreshModel() |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2618 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2619 |
def DeleteJump(self, jump): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2620 |
jump.Clean() |
42 | 2621 |
self.RemoveBlock(jump) |
121 | 2622 |
self.Controler.RemoveEditedElementInstance(self.TagName, jump.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2623 |
|
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2624 |
def DeleteActionBlock(self, actionblock): |
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2625 |
actionblock.Clean() |
42 | 2626 |
self.RemoveBlock(actionblock) |
121 | 2627 |
self.Controler.RemoveEditedElementInstance(self.TagName, actionblock.GetId()) |
28
fc23e1f415d8
Adding support for concurrent overriden standard function
lbessard
parents:
27
diff
changeset
|
2628 |
|
27 | 2629 |
|
0 | 2630 |
#------------------------------------------------------------------------------- |
2631 |
# Editing functions |
|
2632 |
#------------------------------------------------------------------------------- |
|
2633 |
||
2634 |
def Cut(self): |
|
283 | 2635 |
if not self.Debug and (self.IsBlock(self.SelectedElement) or self.IsComment(self.SelectedElement) or isinstance(self.SelectedElement, Graphic_Group)): |
162 | 2636 |
self.ParentWindow.SetCopyBuffer(self.SelectedElement.Clone(self)) |
144 | 2637 |
rect = self.SelectedElement.GetRedrawRect(1, 1) |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2638 |
self.SelectedElement.Delete() |
144 | 2639 |
self.SelectedElement = None |
2640 |
self.RefreshBuffer() |
|
2641 |
self.RefreshScrollBars() |
|
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
2642 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
2643 |
self.ParentWindow.RefreshInstancesTree() |
155 | 2644 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
0 | 2645 |
|
2646 |
def Copy(self): |
|
283 | 2647 |
if not self.Debug and (self.IsBlock(self.SelectedElement) or self.IsComment(self.SelectedElement) or isinstance(self.SelectedElement, Graphic_Group)): |
162 | 2648 |
self.ParentWindow.SetCopyBuffer(self.SelectedElement.Clone(self)) |
144 | 2649 |
|
0 | 2650 |
def Paste(self): |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2651 |
element = self.ParentWindow.GetCopyBuffer() |
283 | 2652 |
if not self.Debug and element is not None and self.CanAddElement(element): |
332 | 2653 |
mouse_pos = self.ScreenToClient(wx.GetMousePosition()) |
2654 |
if wx.Rect(0, 0, *self.GetClientSize()).InsideXY(mouse_pos.x, mouse_pos.y): |
|
2655 |
x, y = self.CalcUnscrolledPosition(mouse_pos.x, mouse_pos.y) |
|
2656 |
block_size = element.GetSize() |
|
2657 |
x = int(float(x) / self.ViewScale[0]) - block_size[0] / 2 |
|
2658 |
y = int(float(y) / self.ViewScale[1]) - block_size[1] / 2 |
|
2659 |
else: |
|
2660 |
x, y = self.CalcUnscrolledPosition(0, 0) |
|
2661 |
x = int(x / self.ViewScale[0]) + 30 |
|
2662 |
y = int(y / self.ViewScale[1]) + 30 |
|
2663 |
if self.Scaling is not None: |
|
2664 |
new_pos = wx.Point(max(round_scaling(30, self.Scaling[0], 1), |
|
2665 |
round_scaling(x, self.Scaling[0])), |
|
2666 |
max(round_scaling(30, self.Scaling[1], 1), |
|
2667 |
round_scaling(y, self.Scaling[1]))) |
|
2668 |
else: |
|
2669 |
new_pos = wx.Point(max(30, x), max(30, y)) |
|
2670 |
block = self.CopyBlock(element, new_pos) |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
2671 |
self.RefreshVisibleElements() |
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2672 |
if self.SelectedElement is not None: |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2673 |
self.SelectedElement.SetSelected(False) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2674 |
self.SelectedElement = block |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2675 |
self.SelectedElement.SetSelected(True) |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2676 |
self.RefreshBuffer() |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2677 |
self.RefreshScrollBars() |
144 | 2678 |
self.ParentWindow.RefreshVariablePanel(self.TagName) |
239
d12779e971bd
Adding support for function and functionBlock (standard or user) library
lbessard
parents:
235
diff
changeset
|
2679 |
self.ParentWindow.RefreshInstancesTree() |
283 | 2680 |
else: |
2681 |
message = wx.MessageDialog(self, "You can't paste the element in buffer here!", "Error", wx.OK|wx.ICON_ERROR) |
|
2682 |
message.ShowModal() |
|
2683 |
message.Destroy() |
|
2684 |
||
2685 |
def CanAddElement(self, block): |
|
2686 |
if isinstance(block, Graphic_Group): |
|
2687 |
return block.CanAddBlocks(self) |
|
2688 |
elif self.CurrentLanguage == "SFC": |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2689 |
return True |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2690 |
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
|
2691 |
return True |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2692 |
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
|
2693 |
return True |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2694 |
return False |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2695 |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
2696 |
def GenerateNewName(self, element, exclude={}): |
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
2697 |
names = exclude.copy() |
283 | 2698 |
if isinstance(element, FBD_Block): |
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
2699 |
names.update(dict([(varname.upper(), True) for varname in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)])) |
283 | 2700 |
format = "Block%d" |
2701 |
elif isinstance(element, SFC_Step): |
|
361
62570186dad4
Adding support for synchronize refreshing with tick and limit it to a defined period
greg
parents:
352
diff
changeset
|
2702 |
names.update(dict([(block.GetName().upper(), True) for block in self.Blocks if isinstance(block, SFC_Step)])) |
283 | 2703 |
format = "Step%d" |
2704 |
i = 1 |
|
343
dc8ff76b39fd
Adding support for drag and drop wire, step and transition in debug mode
lbessard
parents:
338
diff
changeset
|
2705 |
while names.get((format%i).upper(), False): |
283 | 2706 |
i += 1 |
2707 |
return format%i |
|
2708 |
||
2709 |
def IsNamedElement(self, element): |
|
2710 |
return isinstance(element, FBD_Block) and element.GetName() != "" or isinstance(element, SFC_Step) |
|
2711 |
||
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2712 |
def CopyBlock(self, element, pos): |
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2713 |
id = self.GetNewId() |
283 | 2714 |
if isinstance(element, Graphic_Group): |
2715 |
block = element.Clone(self, pos=pos) |
|
144 | 2716 |
else: |
283 | 2717 |
if self.IsNamedElement(element): |
2718 |
name = self.GenerateNewName(element) |
|
2719 |
block = element.Clone(self, id, name, pos) |
|
2720 |
else: |
|
2721 |
name = None |
|
2722 |
block = element.Clone(self, id, pos=pos) |
|
2723 |
self.AddBlockInModel(block) |
|
2724 |
return block |
|
2725 |
||
2726 |
def AddBlockInModel(self, block): |
|
114
06454545e5d0
Adding support for block copy and for wxpython 2.4
lbessard
parents:
111
diff
changeset
|
2727 |
if isinstance(block, Comment): |
178 | 2728 |
self.AddComment(block) |
283 | 2729 |
self.Controler.AddEditedElementComment(self.TagName, block.GetId()) |
144 | 2730 |
self.RefreshCommentModel(block) |
178 | 2731 |
else: |
2732 |
self.AddBlock(block) |
|
2733 |
if isinstance(block, FBD_Block): |
|
283 | 2734 |
self.Controler.AddEditedElementBlock(self.TagName, block.GetId(), block.GetType(), block.GetName()) |
178 | 2735 |
self.RefreshBlockModel(block) |
2736 |
elif isinstance(block, FBD_Variable): |
|
283 | 2737 |
self.Controler.AddEditedElementVariable(self.TagName, block.GetId(), block.GetType()) |
178 | 2738 |
self.RefreshVariableModel(block) |
2739 |
elif isinstance(block, FBD_Connector): |
|
283 | 2740 |
self.Controler.AddEditedElementConnection(self.TagName, block.GetId(), block.GetType()) |
178 | 2741 |
self.RefreshConnectionModel(block) |
2742 |
elif isinstance(block, LD_Contact): |
|
283 | 2743 |
self.Controler.AddEditedElementContact(self.TagName, block.GetId()) |
178 | 2744 |
self.RefreshContactModel(block) |
2745 |
elif isinstance(block, LD_Coil): |
|
283 | 2746 |
self.Controler.AddEditedElementCoil(self.TagName, block.GetId()) |
178 | 2747 |
self.RefreshCoilModel(block) |
2748 |
elif isinstance(block, LD_PowerRail): |
|
283 | 2749 |
self.Controler.AddEditedElementPowerRail(self.TagName, block.GetId(), block.GetType()) |
178 | 2750 |
self.RefreshPowerRailModel(block) |
2751 |
elif isinstance(block, SFC_Step): |
|
283 | 2752 |
self.Controler.AddEditedElementStep(self.TagName, block.GetId()) |
178 | 2753 |
self.RefreshStepModel(block) |
2754 |
elif isinstance(block, SFC_Transition): |
|
283 | 2755 |
self.Controler.AddEditedElementTransition(self.TagName, block.GetId()) |
178 | 2756 |
self.RefreshTransitionModel(block) |
2757 |
elif isinstance(block, SFC_Divergence): |
|
283 | 2758 |
self.Controler.AddEditedElementDivergence(self.TagName, block.GetId(), block.GetType()) |
202 | 2759 |
self.RefreshDivergenceModel(block) |
178 | 2760 |
elif isinstance(block, SFC_Jump): |
283 | 2761 |
self.Controler.AddEditedElementJump(self.TagName, block.GetId()) |
178 | 2762 |
self.RefreshJumpModel(block) |
2763 |
elif isinstance(block, SFC_ActionBlock): |
|
283 | 2764 |
self.Controler.AddEditedElementActionBlock(self.TagName, block.GetId()) |
178 | 2765 |
self.RefreshActionBlockModel(block) |
231
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2766 |
|
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2767 |
|
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2768 |
#------------------------------------------------------------------------------- |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2769 |
# Errors showing functions |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2770 |
#------------------------------------------------------------------------------- |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2771 |
|
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2772 |
def ClearErrors(self): |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2773 |
self.Errors = [] |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2774 |
self.RefreshView() |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2775 |
|
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2776 |
def AddShownError(self, infos, start, end): |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2777 |
self.Errors.append((infos, start, end)) |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2778 |
|
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2779 |
def ShowErrors(self): |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2780 |
for infos, start, end in self.Errors: |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2781 |
if infos[0] in ["io_variable", "block", "coil", "contact", "transition", "step", "action_block"]: |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2782 |
block = self.FindElementById(infos[1]) |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2783 |
if block is not None: |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2784 |
block.AddError(infos[2:], start, end) |
fc2d6cbb8b39
Adding support for highlighing compiling errors from matiec
lbessard
parents:
224
diff
changeset
|
2785 |
|
0 | 2786 |
#------------------------------------------------------------------------------- |
2787 |
# Drawing functions |
|
2788 |
#------------------------------------------------------------------------------- |
|
2789 |
||
249 | 2790 |
def OnScrollWindow(self, event): |
2791 |
if event.GetOrientation() == wx.HORIZONTAL: |
|
2792 |
self.RefreshVisibleElements(xp = event.GetPosition()) |
|
2793 |
else: |
|
2794 |
self.RefreshVisibleElements(yp = event.GetPosition()) |
|
2795 |
event.Skip() |
|
2796 |
||
319 | 2797 |
def OnScrollStop(self, event): |
2798 |
self.RefreshScrollBars() |
|
2799 |
event.Skip() |
|
2800 |
||
253 | 2801 |
def OnMouseWheelWindow(self, event): |
319 | 2802 |
if self.StartMousePos is None or self.StartScreenPos is None: |
323 | 2803 |
rotation = event.GetWheelRotation() / event.GetWheelDelta() |
2804 |
if event.ShiftDown(): |
|
2805 |
x, y = self.GetViewStart() |
|
2806 |
xp = max(0, min(x - rotation * 3, self.GetVirtualSize()[0] / self.GetScrollPixelsPerUnit()[0])) |
|
2807 |
self.RefreshVisibleElements(xp = xp) |
|
2808 |
self.Scroll(xp, y) |
|
2809 |
elif event.ControlDown(): |
|
2810 |
dc = self.GetLogicalDC() |
|
2811 |
pos = event.GetLogicalPosition(dc) |
|
2812 |
mouse_pos = event.GetPosition() |
|
332 | 2813 |
self.SetScale(self.CurrentScale + rotation) |
323 | 2814 |
self.Scroll(round(pos.x * self.ViewScale[0] - mouse_pos.x) / SCROLLBAR_UNIT, |
2815 |
round(pos.y * self.ViewScale[1] - mouse_pos.y) / SCROLLBAR_UNIT) |
|
2816 |
self.RefreshScrollBars() |
|
2817 |
self.RefreshVisibleElements() |
|
2818 |
self.Refresh() |
|
332 | 2819 |
self.ParentWindow.RefreshDisplayMenu() |
323 | 2820 |
else: |
2821 |
x, y = self.GetViewStart() |
|
2822 |
yp = max(0, min(y - rotation * 3, self.GetVirtualSize()[1] / self.GetScrollPixelsPerUnit()[1])) |
|
2823 |
self.RefreshVisibleElements(yp = yp) |
|
2824 |
self.Scroll(x, yp) |
|
253 | 2825 |
|
27 | 2826 |
def OnMoveWindow(self, event): |
292 | 2827 |
if not USE_AUI: |
2828 |
self.GetBestSize() |
|
42 | 2829 |
self.RefreshScrollBars() |
249 | 2830 |
self.RefreshVisibleElements() |
27 | 2831 |
event.Skip() |
2832 |
||
213 | 2833 |
def DoDrawing(self, dc, printing = False): |
2834 |
if printing: |
|
2835 |
if getattr(dc, "printing", False): |
|
2836 |
font = wx.Font(self.GetFont().GetPointSize(), wx.MODERN, wx.NORMAL, wx.NORMAL) |
|
2837 |
dc.SetFont(font) |
|
2838 |
else: |
|
2839 |
dc.SetFont(self.GetFont()) |
|
2840 |
else: |
|
2841 |
dc.SetBackground(wx.Brush(self.GetBackgroundColour())) |
|
2842 |
dc.Clear() |
|
2843 |
dc.BeginDrawing() |
|
2844 |
if self.Scaling is not None and self.DrawGrid and not printing: |
|
145 | 2845 |
dc.SetPen(wx.TRANSPARENT_PEN) |
2846 |
dc.SetBrush(self.GridBrush) |
|
213 | 2847 |
xstart, ystart = self.GetViewStart() |
2848 |
window_size = self.GetClientSize() |
|
145 | 2849 |
width, height = self.GetVirtualSize() |
323 | 2850 |
width = int(max(width, xstart * SCROLLBAR_UNIT + window_size[0]) / self.ViewScale[0]) |
2851 |
height = int(max(height, ystart * SCROLLBAR_UNIT + window_size[1]) / self.ViewScale[1]) |
|
331
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
2852 |
dc.DrawRectangle(1, 1, width, height) |
213 | 2853 |
if self.PageSize is not None and not printing: |
2854 |
dc.SetPen(self.PagePen) |
|
2855 |
xstart, ystart = self.GetViewStart() |
|
2856 |
window_size = self.GetClientSize() |
|
331
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
2857 |
for x in xrange(self.PageSize[0] - (xstart * SCROLLBAR_UNIT) % self.PageSize[0], int(window_size[0] / self.ViewScale[0]), self.PageSize[0]): |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
2858 |
dc.DrawLine(xstart * SCROLLBAR_UNIT + x + 1, int(ystart * SCROLLBAR_UNIT / self.ViewScale[0]), |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
2859 |
xstart * SCROLLBAR_UNIT + x + 1, int((ystart * SCROLLBAR_UNIT + window_size[1]) / self.ViewScale[0])) |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
2860 |
for y in xrange(self.PageSize[1] - (ystart * SCROLLBAR_UNIT) % self.PageSize[1], int(window_size[1] / self.ViewScale[1]), self.PageSize[1]): |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
2861 |
dc.DrawLine(int(xstart * SCROLLBAR_UNIT / self.ViewScale[0]), ystart * SCROLLBAR_UNIT + y + 1, |
9106d66bd204
Bug with Scaling, MiddleButton, Wire modifications fixed.
lbessard
parents:
330
diff
changeset
|
2862 |
int((xstart * SCROLLBAR_UNIT + window_size[0]) / self.ViewScale[1]), ystart * SCROLLBAR_UNIT + y + 1) |
140
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
2863 |
|
06d28f03f6f4
Adding highlighting on group or element when mouse is over
lbessard
parents:
138
diff
changeset
|
2864 |
# Draw all elements |
42 | 2865 |
for comment in self.Comments: |
249 | 2866 |
if comment != self.SelectedElement and (comment.IsVisible() or printing): |
42 | 2867 |
comment.Draw(dc) |
0 | 2868 |
for wire in self.Wires: |
249 | 2869 |
if wire != self.SelectedElement and (wire.IsVisible() or printing): |
2870 |
if not self.Debug or wire.GetValue() != True: |
|
2871 |
wire.Draw(dc) |
|
2872 |
if self.Debug: |
|
2873 |
for wire in self.Wires: |
|
2874 |
if wire != self.SelectedElement and (wire.IsVisible() or printing) and wire.GetValue() == True: |
|
2875 |
wire.Draw(dc) |
|
42 | 2876 |
for block in self.Blocks: |
249 | 2877 |
if block != self.SelectedElement and (block.IsVisible() or printing): |
42 | 2878 |
block.Draw(dc) |
144 | 2879 |
|
249 | 2880 |
if self.SelectedElement is not None and (self.SelectedElement.IsVisible() or printing): |
2881 |
self.SelectedElement.Draw(dc) |
|
213 | 2882 |
|
2883 |
if not printing: |
|
2884 |
if self.rubberBand.IsShown(): |
|
2885 |
self.rubberBand.Draw(dc) |
|
2886 |
dc.EndDrawing() |
|
2887 |
||
2888 |
def OnPaint(self, event): |
|
352 | 2889 |
dc = self.GetLogicalDC(True) |
2890 |
self.DoDrawing(dc) |
|
2891 |
wx.BufferedPaintDC(self, dc.GetAsBitmap()) |
|
213 | 2892 |
event.Skip() |
2893 |
||
2894 |