| author | Laurent Bessard |
| Wed, 28 Aug 2013 11:43:51 +0200 | |
| changeset 1287 | 70dc98533ec6 |
| parent 1273 | 921858d68a13 |
| child 1293 | 40117d02601b |
| permissions | -rw-r--r-- |
| 814 | 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 |
# |
|
7 |
#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD |
|
8 |
# |
|
9 |
#See COPYING file for copyrights details. |
|
10 |
# |
|
11 |
#This library is free software; you can redistribute it and/or |
|
12 |
#modify it under the terms of the GNU General Public |
|
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 |
|
19 |
#General Public License for more details. |
|
20 |
# |
|
21 |
#You should have received a copy of the GNU General Public |
|
22 |
#License along with this library; if not, write to the Free Software |
|
23 |
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
24 |
||
25 |
import re |
|
26 |
import math |
|
| 1224 | 27 |
from time import time as gettime |
| 814 | 28 |
from types import TupleType |
29 |
from threading import Lock |
|
30 |
||
31 |
import wx |
|
32 |
||
33 |
from plcopen.structures import * |
|
|
885
fc91d3718b74
Fix bug multiple graph viewer tab displaying values of the same variable can be opened
Laurent Bessard
parents:
882
diff
changeset
|
34 |
from PLCControler import ITEM_VAR_LOCAL, ITEM_POU, ITEM_PROGRAM, ITEM_FUNCTIONBLOCK |
| 814 | 35 |
|
36 |
from dialogs import * |
|
37 |
from graphics import * |
|
| 1224 | 38 |
from editors.DebugViewer import DebugViewer, REFRESH_PERIOD |
| 814 | 39 |
from EditorPanel import EditorPanel |
40 |
||
41 |
SCROLLBAR_UNIT = 10 |
|
42 |
WINDOW_BORDER = 10 |
|
43 |
SCROLL_ZONE = 10 |
|
44 |
||
45 |
CURSORS = None |
|
46 |
||
47 |
def ResetCursors(): |
|
48 |
global CURSORS |
|
49 |
if CURSORS == None: |
|
50 |
CURSORS = [wx.NullCursor, |
|
51 |
wx.StockCursor(wx.CURSOR_HAND), |
|
52 |
wx.StockCursor(wx.CURSOR_SIZENWSE), |
|
53 |
wx.StockCursor(wx.CURSOR_SIZENESW), |
|
54 |
wx.StockCursor(wx.CURSOR_SIZEWE), |
|
55 |
wx.StockCursor(wx.CURSOR_SIZENS)] |
|
56 |
||
57 |
def AppendMenu(parent, help, id, kind, text): |
|
58 |
if wx.VERSION >= (2, 6, 0): |
|
59 |
parent.Append(help=help, id=id, kind=kind, text=text) |
|
60 |
else: |
|
61 |
parent.Append(helpString=help, id=id, kind=kind, item=text) |
|
62 |
||
63 |
if wx.Platform == '__WXMSW__': |
|
64 |
faces = { 'times': 'Times New Roman',
|
|
65 |
'mono' : 'Courier New', |
|
66 |
'helv' : 'Arial', |
|
67 |
'other': 'Comic Sans MS', |
|
68 |
'size' : 10, |
|
69 |
} |
|
70 |
else: |
|
71 |
faces = { 'times': 'Times',
|
|
72 |
'mono' : 'Courier', |
|
73 |
'helv' : 'Helvetica', |
|
74 |
'other': 'new century schoolbook', |
|
75 |
'size' : 12, |
|
76 |
} |
|
77 |
||
|
1123
55ed55ef7aea
Fixed bug on biggest Viewer zoom factor preventing them to be used on Windows
Laurent Bessard
parents:
1122
diff
changeset
|
78 |
if wx.Platform == '__WXMSW__': |
|
55ed55ef7aea
Fixed bug on biggest Viewer zoom factor preventing them to be used on Windows
Laurent Bessard
parents:
1122
diff
changeset
|
79 |
MAX_ZOOMIN = 4 |
|
55ed55ef7aea
Fixed bug on biggest Viewer zoom factor preventing them to be used on Windows
Laurent Bessard
parents:
1122
diff
changeset
|
80 |
else: |
|
55ed55ef7aea
Fixed bug on biggest Viewer zoom factor preventing them to be used on Windows
Laurent Bessard
parents:
1122
diff
changeset
|
81 |
MAX_ZOOMIN = 7 |
|
55ed55ef7aea
Fixed bug on biggest Viewer zoom factor preventing them to be used on Windows
Laurent Bessard
parents:
1122
diff
changeset
|
82 |
ZOOM_FACTORS = [math.sqrt(2) ** x for x in xrange(-6, MAX_ZOOMIN)] |
| 814 | 83 |
|
84 |
def GetVariableCreationFunction(variable_type): |
|
85 |
def variableCreationFunction(viewer, id, specific_values): |
|
86 |
return FBD_Variable(viewer, variable_type, |
|
87 |
specific_values["name"], |
|
88 |
specific_values["value_type"], |
|
89 |
id, |
|
90 |
specific_values["executionOrder"]) |
|
91 |
return variableCreationFunction |
|
92 |
||
93 |
def GetConnectorCreationFunction(connector_type): |
|
94 |
def connectorCreationFunction(viewer, id, specific_values): |
|
95 |
return FBD_Connector(viewer, connector_type, |
|
96 |
specific_values["name"], id) |
|
97 |
return connectorCreationFunction |
|
98 |
||
99 |
def commentCreationFunction(viewer, id, specific_values): |
|
100 |
return Comment(viewer, specific_values["content"], id) |
|
101 |
||
102 |
def GetPowerRailCreationFunction(powerrail_type): |
|
103 |
def powerRailCreationFunction(viewer, id, specific_values): |
|
104 |
return LD_PowerRail(viewer, powerrail_type, id, |
|
105 |
specific_values["connectors"]) |
|
106 |
return powerRailCreationFunction |
|
107 |
||
108 |
CONTACT_TYPES = {(True, "none"): CONTACT_REVERSE,
|
|
109 |
(False, "rising"): CONTACT_RISING, |
|
110 |
(False, "falling"): CONTACT_FALLING} |
|
111 |
||
112 |
def contactCreationFunction(viewer, id, specific_values): |
|
113 |
contact_type = CONTACT_TYPES.get((specific_values.get("negated", False),
|
|
114 |
specific_values.get("edge", "none")),
|
|
115 |
CONTACT_NORMAL) |
|
116 |
return LD_Contact(viewer, contact_type, specific_values["name"], id) |
|
117 |
||
118 |
COIL_TYPES = {(True, "none", "none"): COIL_REVERSE,
|
|
119 |
(False, "none", "set"): COIL_SET, |
|
120 |
(False, "none", "reset"): COIL_RESET, |
|
121 |
(False, "rising", "none"): COIL_RISING, |
|
122 |
(False, "falling", "none"): COIL_FALLING} |
|
123 |
||
124 |
def coilCreationFunction(viewer, id, specific_values): |
|
125 |
coil_type = COIL_TYPES.get((specific_values.get("negated", False),
|
|
126 |
specific_values.get("edge", "none"),
|
|
127 |
specific_values.get("storage", "none")),
|
|
128 |
COIL_NORMAL) |
|
129 |
return LD_Coil(viewer, coil_type, specific_values["name"], id) |
|
130 |
||
131 |
def stepCreationFunction(viewer, id, specific_values): |
|
132 |
step = SFC_Step(viewer, specific_values["name"], |
|
133 |
specific_values.get("initial", False), id)
|
|
134 |
if specific_values.get("action", None):
|
|
135 |
step.AddAction() |
|
136 |
connector = step.GetActionConnector() |
|
137 |
connector.SetPosition(wx.Point(*specific_values["action"]["position"])) |
|
138 |
return step |
|
139 |
||
140 |
def transitionCreationFunction(viewer, id, specific_values): |
|
141 |
transition = SFC_Transition(viewer, specific_values["condition_type"], |
|
142 |
specific_values.get("condition", None),
|
|
143 |
specific_values["priority"], id) |
|
144 |
return transition |
|
145 |
||
146 |
def GetDivergenceCreationFunction(divergence_type): |
|
147 |
def divergenceCreationFunction(viewer, id, specific_values): |
|
148 |
return SFC_Divergence(viewer, divergence_type, |
|
149 |
specific_values["connectors"], id) |
|
150 |
return divergenceCreationFunction |
|
151 |
||
152 |
def jumpCreationFunction(viewer, id, specific_values): |
|
153 |
return SFC_Jump(viewer, specific_values["target"], id) |
|
154 |
||
155 |
def actionBlockCreationFunction(viewer, id, specific_values): |
|
156 |
return SFC_ActionBlock(viewer, specific_values["actions"], id) |
|
157 |
||
158 |
ElementCreationFunctions = {
|
|
159 |
"input": GetVariableCreationFunction(INPUT), |
|
160 |
"output": GetVariableCreationFunction(OUTPUT), |
|
161 |
"inout": GetVariableCreationFunction(INOUT), |
|
162 |
"connector": GetConnectorCreationFunction(CONNECTOR), |
|
163 |
"continuation": GetConnectorCreationFunction(CONTINUATION), |
|
164 |
"comment": commentCreationFunction, |
|
165 |
"leftPowerRail": GetPowerRailCreationFunction(LEFTRAIL), |
|
166 |
"rightPowerRail": GetPowerRailCreationFunction(RIGHTRAIL), |
|
167 |
"contact": contactCreationFunction, |
|
168 |
"coil": coilCreationFunction, |
|
169 |
"step": stepCreationFunction, |
|
170 |
"transition": transitionCreationFunction, |
|
171 |
"selectionDivergence": GetDivergenceCreationFunction(SELECTION_DIVERGENCE), |
|
172 |
"selectionConvergence": GetDivergenceCreationFunction(SELECTION_CONVERGENCE), |
|
173 |
"simultaneousDivergence": GetDivergenceCreationFunction(SIMULTANEOUS_DIVERGENCE), |
|
174 |
"simultaneousConvergence": GetDivergenceCreationFunction(SIMULTANEOUS_CONVERGENCE), |
|
175 |
"jump": jumpCreationFunction, |
|
176 |
"actionBlock": actionBlockCreationFunction, |
|
177 |
} |
|
178 |
||
179 |
def sort_blocks(block_infos1, block_infos2): |
|
180 |
x1, y1 = block_infos1[0].GetPosition() |
|
181 |
x2, y2 = block_infos2[0].GetPosition() |
|
182 |
if y1 == y2: |
|
183 |
return cmp(x1, x2) |
|
184 |
else: |
|
185 |
return cmp(y1, y2) |
|
186 |
||
187 |
#------------------------------------------------------------------------------- |
|
188 |
# Graphic elements Viewer base class |
|
189 |
#------------------------------------------------------------------------------- |
|
190 |
||
191 |
# ID Constants for alignment menu items |
|
192 |
[ID_VIEWERALIGNMENTMENUITEMS0, ID_VIEWERALIGNMENTMENUITEMS1, |
|
193 |
ID_VIEWERALIGNMENTMENUITEMS2, ID_VIEWERALIGNMENTMENUITEMS4, |
|
194 |
ID_VIEWERALIGNMENTMENUITEMS5, ID_VIEWERALIGNMENTMENUITEMS6, |
|
195 |
] = [wx.NewId() for _init_coll_AlignmentMenu_Items in range(6)] |
|
196 |
||
197 |
# ID Constants for contextual menu items |
|
198 |
[ID_VIEWERCONTEXTUALMENUITEMS0, ID_VIEWERCONTEXTUALMENUITEMS1, |
|
199 |
ID_VIEWERCONTEXTUALMENUITEMS2, ID_VIEWERCONTEXTUALMENUITEMS3, |
|
200 |
ID_VIEWERCONTEXTUALMENUITEMS5, ID_VIEWERCONTEXTUALMENUITEMS6, |
|
201 |
ID_VIEWERCONTEXTUALMENUITEMS8, ID_VIEWERCONTEXTUALMENUITEMS9, |
|
202 |
ID_VIEWERCONTEXTUALMENUITEMS11, ID_VIEWERCONTEXTUALMENUITEMS12, |
|
203 |
ID_VIEWERCONTEXTUALMENUITEMS14, ID_VIEWERCONTEXTUALMENUITEMS16, |
|
204 |
ID_VIEWERCONTEXTUALMENUITEMS17, |
|
205 |
] = [wx.NewId() for _init_coll_ContextualMenu_Items in range(13)] |
|
206 |
||
207 |
||
208 |
class ViewerDropTarget(wx.TextDropTarget): |
|
209 |
||
210 |
def __init__(self, parent): |
|
211 |
wx.TextDropTarget.__init__(self) |
|
212 |
self.ParentWindow = parent |
|
213 |
||
214 |
def OnDropText(self, x, y, data): |
|
215 |
self.ParentWindow.Select() |
|
216 |
tagname = self.ParentWindow.GetTagName() |
|
217 |
pou_name, pou_type = self.ParentWindow.Controler.GetEditedElementType(tagname, self.ParentWindow.Debug) |
|
218 |
x, y = self.ParentWindow.CalcUnscrolledPosition(x, y) |
|
219 |
x = int(x / self.ParentWindow.ViewScale[0]) |
|
220 |
y = int(y / self.ParentWindow.ViewScale[1]) |
|
221 |
scaling = self.ParentWindow.Scaling |
|
222 |
message = None |
|
223 |
try: |
|
224 |
values = eval(data) |
|
225 |
except: |
|
226 |
message = _("Invalid value \"%s\" for viewer block")%data
|
|
227 |
values = None |
|
228 |
if not isinstance(values, TupleType): |
|
229 |
message = _("Invalid value \"%s\" for viewer block")%data
|
|
230 |
values = None |
|
231 |
if values is not None: |
|
232 |
if values[1] == "debug": |
|
233 |
pass |
|
234 |
elif values[1] == "program": |
|
235 |
message = _("Programs can't be used by other POUs!")
|
|
236 |
elif values[1] in ["function", "functionBlock"]: |
|
237 |
words = tagname.split("::")
|
|
238 |
if pou_name == values[0]: |
|
239 |
message = _("\"%s\" can't use itself!")%pou_name
|
|
240 |
elif pou_type == "function" and values[1] != "function": |
|
241 |
message = _("Function Blocks can't be used in Functions!")
|
|
242 |
elif self.ParentWindow.Controler.PouIsUsedBy(pou_name, values[0], self.ParentWindow.Debug): |
|
243 |
message = _("\"%s\" is already used by \"%s\"!")%(pou_name, values[0])
|
|
244 |
else: |
|
245 |
blockname = values[2] |
|
246 |
if len(values) > 3: |
|
247 |
blockinputs = values[3] |
|
248 |
else: |
|
249 |
blockinputs = None |
|
250 |
if values[1] != "function" and blockname == "": |
|
251 |
blockname = self.ParentWindow.GenerateNewName(blocktype=values[0]) |
|
252 |
if blockname.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
|
253 |
message = _("\"%s\" pou already exists!")%blockname
|
|
254 |
elif blockname.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
|
255 |
message = _("\"%s\" element for this pou already exists!")%blockname
|
|
256 |
else: |
|
257 |
id = self.ParentWindow.GetNewId() |
|
258 |
block = FBD_Block(self.ParentWindow, values[0], blockname, id, inputs = blockinputs) |
|
259 |
width, height = block.GetMinSize() |
|
260 |
if scaling is not None: |
|
261 |
x = round(float(x) / float(scaling[0])) * scaling[0] |
|
262 |
y = round(float(y) / float(scaling[1])) * scaling[1] |
|
263 |
width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0] |
|
264 |
height = round(float(height) / float(scaling[1]) + 0.5) * scaling[1] |
|
265 |
block.SetPosition(x, y) |
|
266 |
block.SetSize(width, height) |
|
267 |
self.ParentWindow.AddBlock(block) |
|
268 |
self.ParentWindow.Controler.AddEditedElementBlock(tagname, id, values[0], blockname) |
|
269 |
self.ParentWindow.RefreshBlockModel(block) |
|
270 |
self.ParentWindow.RefreshBuffer() |
|
271 |
self.ParentWindow.RefreshScrollBars() |
|
272 |
self.ParentWindow.RefreshVisibleElements() |
|
273 |
self.ParentWindow.RefreshVariablePanel() |
|
|
1233
5e6d0969bb5d
Fixed bugs in refresh of PouInstanceVariablesPanel
Laurent Bessard
parents:
1229
diff
changeset
|
274 |
self.ParentWindow.ParentWindow.RefreshPouInstanceVariablesPanel() |
| 814 | 275 |
self.ParentWindow.Refresh(False) |
276 |
elif values[1] == "location": |
|
277 |
if pou_type == "program": |
|
278 |
location = values[0] |
|
279 |
if not location.startswith("%"):
|
|
280 |
dialog = wx.SingleChoiceDialog(self.ParentWindow.ParentWindow, |
|
281 |
_("Select a variable class:"), _("Variable class"),
|
|
282 |
["Input", "Output", "Memory"], |
|
283 |
wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL) |
|
284 |
if dialog.ShowModal() == wx.ID_OK: |
|
285 |
selected = dialog.GetSelection() |
|
286 |
else: |
|
287 |
selected = None |
|
288 |
dialog.Destroy() |
|
289 |
if selected is None: |
|
290 |
return |
|
291 |
if selected == 0: |
|
292 |
location = "%I" + location |
|
293 |
elif selected == 1: |
|
294 |
location = "%Q" + location |
|
295 |
else: |
|
296 |
location = "%M" + location |
|
297 |
var_name = values[3] |
|
298 |
if var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
|
299 |
message = _("\"%s\" pou already exists!")%var_name
|
|
300 |
else: |
|
301 |
if location[1] == "Q": |
|
302 |
var_class = OUTPUT |
|
303 |
else: |
|
304 |
var_class = INPUT |
|
305 |
if values[2] is not None: |
|
306 |
var_type = values[2] |
|
307 |
else: |
|
308 |
var_type = LOCATIONDATATYPES.get(location[2], ["BOOL"])[0] |
|
309 |
if not var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
|
310 |
self.ParentWindow.Controler.AddEditedElementPouVar(tagname, var_type, var_name, location, values[4]) |
|
311 |
self.ParentWindow.RefreshVariablePanel() |
|
|
940
0c68d1af821d
Fixed bug PouInstancePanel not updated when drag'n dropping variable from extensions
Laurent Bessard
parents:
908
diff
changeset
|
312 |
self.ParentWindow.ParentWindow.RefreshPouInstanceVariablesPanel() |
| 814 | 313 |
self.ParentWindow.AddVariableBlock(x, y, scaling, var_class, var_name, var_type) |
314 |
elif values[1] == "Global": |
|
315 |
var_name = values[0] |
|
316 |
if var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]: |
|
317 |
message = _("\"%s\" pou already exists!")%var_name
|
|
318 |
else: |
|
319 |
if not var_name.upper() in [name.upper() for name in self.ParentWindow.Controler.GetEditedElementVariables(tagname, self.ParentWindow.Debug)]: |
|
320 |
self.ParentWindow.Controler.AddEditedElementPouExternalVar(tagname, values[2], var_name) |
|
321 |
self.ParentWindow.RefreshVariablePanel() |
|
|
1233
5e6d0969bb5d
Fixed bugs in refresh of PouInstanceVariablesPanel
Laurent Bessard
parents:
1229
diff
changeset
|
322 |
self.ParentWindow.ParentWindow.RefreshPouInstanceVariablesPanel() |
| 814 | 323 |
self.ParentWindow.AddVariableBlock(x, y, scaling, INPUT, var_name, values[2]) |
324 |
elif values[1] == "Constant": |
|
325 |
self.ParentWindow.AddVariableBlock(x, y, scaling, INPUT, values[0], None) |
|
326 |
elif values[3] == tagname: |
|
327 |
if values[1] == "Output": |
|
328 |
var_class = OUTPUT |
|
329 |
elif values[1] == "InOut": |
|
330 |
var_class = INPUT |
|
331 |
else: |
|
332 |
var_class = INPUT |
|
333 |
tree = dict([(var["Name"], var["Tree"]) for var in self.ParentWindow.Controler.GetEditedElementInterfaceVars(tagname, self.ParentWindow.Debug)]).get(values[0], None) |
|
334 |
if tree is not None: |
|
335 |
if len(tree[0]) > 0: |
|
336 |
menu = wx.Menu(title='') |
|
337 |
self.GenerateTreeMenu(x, y, scaling, menu, "", var_class, [(values[0], values[2], tree)]) |
|
338 |
self.ParentWindow.PopupMenuXY(menu) |
|
339 |
else: |
|
340 |
self.ParentWindow.AddVariableBlock(x, y, scaling, var_class, values[0], values[2]) |
|
341 |
else: |
|
342 |
message = _("Unknown variable \"%s\" for this POU!") % values[0]
|
|
343 |
else: |
|
344 |
message = _("Variable don't belong to this POU!")
|
|
345 |
if message is not None: |
|
346 |
wx.CallAfter(self.ShowMessage, message) |
|
347 |
||
348 |
def GenerateTreeMenu(self, x, y, scaling, menu, base_path, var_class, tree): |
|
349 |
for child_name, child_type, (child_tree, child_dimensions) in tree: |
|
350 |
if base_path: |
|
351 |
child_path = "%s.%s" % (base_path, child_name) |
|
352 |
else: |
|
353 |
child_path = child_name |
|
354 |
if len(child_dimensions) > 0: |
|
355 |
child_path += "[%s]" % ",".join([str(dimension[0]) for dimension in child_dimensions]) |
|
356 |
child_name += "[]" |
|
357 |
new_id = wx.NewId() |
|
358 |
AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=child_name) |
|
359 |
self.ParentWindow.Bind(wx.EVT_MENU, self.GetAddVariableBlockFunction(x, y, scaling, var_class, child_path, child_type), id=new_id) |
|
360 |
if len(child_tree) > 0: |
|
361 |
new_id = wx.NewId() |
|
362 |
child_menu = wx.Menu(title='') |
|
363 |
self.GenerateTreeMenu(x, y, scaling, child_menu, child_path, var_class, child_tree) |
|
364 |
menu.AppendMenu(new_id, "%s." % child_name, child_menu) |
|
365 |
||
366 |
def GetAddVariableBlockFunction(self, x, y, scaling, var_class, var_name, var_type): |
|
367 |
def AddVariableFunction(event): |
|
368 |
self.ParentWindow.AddVariableBlock(x, y, scaling, var_class, var_name, var_type) |
|
369 |
return AddVariableFunction |
|
370 |
||
371 |
def ShowMessage(self, message): |
|
372 |
message = wx.MessageDialog(self.ParentWindow, message, _("Error"), wx.OK|wx.ICON_ERROR)
|
|
373 |
message.ShowModal() |
|
374 |
message.Destroy() |
|
375 |
||
376 |
""" |
|
377 |
Class that implements a Viewer based on a wx.ScrolledWindow for drawing and |
|
378 |
manipulating graphic elements |
|
379 |
""" |
|
380 |
||
|
1176
f4b434672204
Moved and rewrote DebugViewer and DebusDataConsumer classes
Laurent Bessard
parents:
1170
diff
changeset
|
381 |
class Viewer(EditorPanel, DebugViewer): |
| 814 | 382 |
|
383 |
if wx.VERSION < (2, 6, 0): |
|
384 |
def Bind(self, event, function, id = None): |
|
385 |
if id is not None: |
|
386 |
event(self, id, function) |
|
387 |
else: |
|
388 |
event(self, function) |
|
389 |
||
390 |
# Add list of menu items to the given menu |
|
391 |
def AddMenuItems(self, menu, items): |
|
392 |
for item in items: |
|
393 |
if item is None: |
|
394 |
menu.AppendSeparator() |
|
395 |
else: |
|
396 |
id, kind, text, help, callback = item |
|
397 |
AppendMenu(menu, help=help, id=id, kind=kind, text=text) |
|
398 |
# Link menu event to corresponding called functions |
|
399 |
self.Bind(wx.EVT_MENU, callback, id=id) |
|
400 |
||
401 |
# Add Block Pin Menu items to the given menu |
|
402 |
def AddBlockPinMenuItems(self, menu, connector): |
|
403 |
[ID_NO_MODIFIER, ID_NEGATED, ID_RISING_EDGE, |
|
404 |
ID_FALLING_EDGE] = [wx.NewId() for i in xrange(4)] |
|
405 |
||
406 |
# Create menu items |
|
407 |
self.AddMenuItems(menu, [ |
|
408 |
(ID_NO_MODIFIER, wx.ITEM_RADIO, _(u'No Modifier'), '', self.OnNoModifierMenu), |
|
409 |
(ID_NEGATED, wx.ITEM_RADIO, _(u'Negated'), '', self.OnNegatedMenu), |
|
410 |
(ID_RISING_EDGE, wx.ITEM_RADIO, _(u'Rising Edge'), '', self.OnRisingEdgeMenu), |
|
411 |
(ID_FALLING_EDGE, wx.ITEM_RADIO, _(u'Falling Edge'), '', self.OnFallingEdgeMenu)]) |
|
412 |
||
413 |
type = self.Controler.GetEditedElementType(self.TagName, self.Debug) |
|
414 |
menu.Enable(ID_RISING_EDGE, type != "function") |
|
415 |
menu.Enable(ID_FALLING_EDGE, type != "function") |
|
416 |
||
417 |
if connector.IsNegated(): |
|
418 |
menu.Check(ID_NEGATED, True) |
|
419 |
elif connector.GetEdge() == "rising": |
|
420 |
menu.Check(ID_RISING_EDGE, True) |
|
421 |
elif connector.GetEdge() == "falling": |
|
422 |
menu.Check(ID_FALLING_EDGE, True) |
|
423 |
else: |
|
424 |
menu.Check(ID_NO_MODIFIER, True) |
|
425 |
||
426 |
# Add Alignment Menu items to the given menu |
|
427 |
def AddAlignmentMenuItems(self, menu): |
|
428 |
[ID_ALIGN_LEFT, ID_ALIGN_CENTER, ID_ALIGN_RIGHT, |
|
429 |
ID_ALIGN_TOP, ID_ALIGN_MIDDLE, ID_ALIGN_BOTTOM, |
|
430 |
] = [wx.NewId() for i in xrange(6)] |
|
431 |
||
432 |
# Create menu items |
|
433 |
self.AddMenuItems(menu, [ |
|
434 |
(ID_ALIGN_LEFT, wx.ITEM_NORMAL, _(u'Left'), '', self.OnAlignLeftMenu), |
|
435 |
(ID_ALIGN_CENTER, wx.ITEM_NORMAL, _(u'Center'), '', self.OnAlignCenterMenu), |
|
436 |
(ID_ALIGN_RIGHT, wx.ITEM_NORMAL, _(u'Right'), '', self.OnAlignRightMenu), |
|
437 |
None, |
|
438 |
(ID_ALIGN_TOP, wx.ITEM_NORMAL, _(u'Top'), '', self.OnAlignTopMenu), |
|
439 |
(ID_ALIGN_MIDDLE, wx.ITEM_NORMAL, _(u'Middle'), '', self.OnAlignMiddleMenu), |
|
440 |
(ID_ALIGN_BOTTOM, wx.ITEM_NORMAL, _(u'Bottom'), '', self.OnAlignBottomMenu)]) |
|
441 |
||
442 |
# Add Wire Menu items to the given menu |
|
|
1263
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
443 |
def AddWireMenuItems(self, menu, delete=False, replace=False): |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
444 |
[ID_ADD_SEGMENT, ID_DELETE_SEGMENT, ID_REPLACE_WIRE, |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
445 |
] = [wx.NewId() for i in xrange(3)] |
| 814 | 446 |
|
447 |
# Create menu items |
|
448 |
self.AddMenuItems(menu, [ |
|
449 |
(ID_ADD_SEGMENT, wx.ITEM_NORMAL, _(u'Add Wire Segment'), '', self.OnAddSegmentMenu), |
|
|
1263
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
450 |
(ID_DELETE_SEGMENT, wx.ITEM_NORMAL, _(u'Delete Wire Segment'), '', self.OnDeleteSegmentMenu), |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
451 |
(ID_REPLACE_WIRE, wx.ITEM_NORMAL, _(u'Replace Wire by connections'), '', self.OnReplaceWireMenu)]) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
452 |
|
| 814 | 453 |
menu.Enable(ID_DELETE_SEGMENT, delete) |
|
1263
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
454 |
menu.Enable(ID_REPLACE_WIRE, replace) |
| 814 | 455 |
|
456 |
# Add Divergence Menu items to the given menu |
|
457 |
def AddDivergenceMenuItems(self, menu, delete=False): |
|
458 |
[ID_ADD_BRANCH, ID_DELETE_BRANCH] = [wx.NewId() for i in xrange(2)] |
|
459 |
||
460 |
# Create menu items |
|
461 |
self.AddMenuItems(menu, [ |
|
462 |
(ID_ADD_BRANCH, wx.ITEM_NORMAL, _(u'Add Divergence Branch'), '', self.OnAddBranchMenu), |
|
463 |
(ID_DELETE_BRANCH, wx.ITEM_NORMAL, _(u'Delete Divergence Branch'), '', self.OnDeleteBranchMenu)]) |
|
464 |
||
465 |
menu.Enable(ID_DELETE_BRANCH, delete) |
|
466 |
||
467 |
# Add Add Menu items to the given menu |
|
468 |
def AddAddMenuItems(self, menu): |
|
469 |
[ID_ADD_BLOCK, ID_ADD_VARIABLE, ID_ADD_CONNECTION, |
|
470 |
ID_ADD_COMMENT] = [wx.NewId() for i in xrange(4)] |
|
471 |
||
472 |
# Create menu items |
|
473 |
self.AddMenuItems(menu, [ |
|
474 |
(ID_ADD_BLOCK, wx.ITEM_NORMAL, _(u'Block'), '', self.GetAddMenuCallBack(self.AddNewBlock)), |
|
475 |
(ID_ADD_VARIABLE, wx.ITEM_NORMAL, _(u'Variable'), '', self.GetAddMenuCallBack(self.AddNewVariable)), |
|
476 |
(ID_ADD_CONNECTION, wx.ITEM_NORMAL, _(u'Connection'), '', self.GetAddMenuCallBack(self.AddNewConnection)), |
|
477 |
None]) |
|
478 |
||
479 |
if self.CurrentLanguage != "FBD": |
|
480 |
[ID_ADD_POWER_RAIL, ID_ADD_CONTACT, ID_ADD_COIL, |
|
481 |
] = [wx.NewId() for i in xrange(3)] |
|
482 |
||
483 |
# Create menu items |
|
484 |
self.AddMenuItems(menu, [ |
|
485 |
(ID_ADD_POWER_RAIL, wx.ITEM_NORMAL, _(u'Power Rail'), '', self.GetAddMenuCallBack(self.AddNewPowerRail)), |
|
486 |
(ID_ADD_CONTACT, wx.ITEM_NORMAL, _(u'Contact'), '', self.GetAddMenuCallBack(self.AddNewContact))]) |
|
487 |
||
488 |
if self.CurrentLanguage != "SFC": |
|
489 |
self.AddMenuItems(menu, [ |
|
490 |
(ID_ADD_COIL, wx.ITEM_NORMAL, _(u'Coil'), '', self.GetAddMenuCallBack(self.AddNewCoil))]) |
|
491 |
||
492 |
menu.AppendSeparator() |
|
493 |
||
494 |
if self.CurrentLanguage == "SFC": |
|
495 |
[ID_ADD_INITIAL_STEP, ID_ADD_STEP, ID_ADD_TRANSITION, |
|
496 |
ID_ADD_ACTION_BLOCK, ID_ADD_DIVERGENCE, ID_ADD_JUMP, |
|
497 |
] = [wx.NewId() for i in xrange(6)] |
|
498 |
||
499 |
# Create menu items |
|
500 |
self.AddMenuItems(menu, [ |
|
501 |
(ID_ADD_INITIAL_STEP, wx.ITEM_NORMAL, _(u'Initial Step'), '', self.GetAddMenuCallBack(self.AddNewStep, True)), |
|
502 |
(ID_ADD_STEP, wx.ITEM_NORMAL, _(u'Step'), '', self.GetAddMenuCallBack(self.AddNewStep)), |
|
503 |
(ID_ADD_TRANSITION, wx.ITEM_NORMAL, _(u'Transition'), '', self.GetAddMenuCallBack(self.AddNewTransition)), |
|
504 |
(ID_ADD_ACTION_BLOCK, wx.ITEM_NORMAL, _(u'Action Block'), '', self.GetAddMenuCallBack(self.AddNewActionBlock)), |
|
505 |
(ID_ADD_DIVERGENCE, wx.ITEM_NORMAL, _(u'Divergence'), '', self.GetAddMenuCallBack(self.AddNewDivergence)), |
|
506 |
(ID_ADD_JUMP, wx.ITEM_NORMAL, _(u'Jump'), '', self.GetAddMenuCallBack(self.AddNewJump)), |
|
507 |
None]) |
|
508 |
||
509 |
self.AddMenuItems(menu, [ |
|
510 |
(ID_ADD_COMMENT, wx.ITEM_NORMAL, _(u'Comment'), '', self.GetAddMenuCallBack(self.AddNewComment))]) |
|
511 |
||
512 |
# Add Default Menu items to the given menu |
|
513 |
def AddDefaultMenuItems(self, menu, edit=False, block=False): |
|
514 |
if block: |
|
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
515 |
[ID_EDIT_BLOCK, ID_DELETE, ID_ADJUST_BLOCK_SIZE] = [wx.NewId() for i in xrange(3)] |
| 814 | 516 |
|
517 |
# Create menu items |
|
518 |
self.AddMenuItems(menu, [ |
|
519 |
(ID_EDIT_BLOCK, wx.ITEM_NORMAL, _(u'Edit Block'), '', self.OnEditBlockMenu), |
|
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
520 |
(ID_ADJUST_BLOCK_SIZE, wx.ITEM_NORMAL, _(u'Adjust Block Size'), '', self.OnAdjustBlockSizeMenu), |
| 814 | 521 |
(ID_DELETE, wx.ITEM_NORMAL, _(u'Delete'), '', self.OnDeleteMenu)]) |
522 |
||
523 |
menu.Enable(ID_EDIT_BLOCK, edit) |
|
524 |
||
525 |
else: |
|
526 |
[ID_CLEAR_EXEC_ORDER, ID_RESET_EXEC_ORDER] = [wx.NewId() for i in xrange(2)] |
|
527 |
||
528 |
# Create menu items |
|
529 |
self.AddMenuItems(menu, [ |
|
530 |
(ID_CLEAR_EXEC_ORDER, wx.ITEM_NORMAL, _(u'Clear Execution Order'), '', self.OnClearExecutionOrderMenu), |
|
531 |
(ID_RESET_EXEC_ORDER, wx.ITEM_NORMAL, _(u'Reset Execution Order'), '', self.OnResetExecutionOrderMenu)]) |
|
532 |
||
533 |
menu.AppendSeparator() |
|
534 |
||
535 |
add_menu = wx.Menu(title='') |
|
536 |
self.AddAddMenuItems(add_menu) |
|
537 |
menu.AppendMenu(-1, _(u'Add'), add_menu) |
|
538 |
||
539 |
menu.AppendSeparator() |
|
540 |
||
541 |
[ID_CUT, ID_COPY, ID_PASTE] = [wx.NewId() for i in xrange(3)] |
|
542 |
||
543 |
# Create menu items |
|
544 |
self.AddMenuItems(menu, [ |
|
545 |
(ID_CUT, wx.ITEM_NORMAL, _(u'Cut'), '', self.GetClipboardCallBack(self.Cut)), |
|
546 |
(ID_COPY, wx.ITEM_NORMAL, _(u'Copy'), '', self.GetClipboardCallBack(self.Copy)), |
|
547 |
(ID_PASTE, wx.ITEM_NORMAL, _(u'Paste'), '', self.GetAddMenuCallBack(self.Paste))]) |
|
548 |
||
549 |
menu.Enable(ID_CUT, block) |
|
550 |
menu.Enable(ID_COPY, block) |
|
551 |
menu.Enable(ID_PASTE, self.ParentWindow.GetCopyBuffer() is not None) |
|
552 |
||
553 |
def _init_Editor(self, prnt): |
|
554 |
self.Editor = wx.ScrolledWindow(prnt, name="Viewer", |
|
555 |
pos=wx.Point(0, 0), size=wx.Size(0, 0), |
|
556 |
style=wx.HSCROLL | wx.VSCROLL | wx.ALWAYS_SHOW_SB) |
|
557 |
self.Editor.ParentWindow = self |
|
558 |
||
559 |
# Create a new Viewer |
|
560 |
def __init__(self, parent, tagname, window, controler, debug = False, instancepath = ""): |
|
561 |
self.VARIABLE_PANEL_TYPE = controler.GetPouType(tagname.split("::")[1])
|
|
562 |
||
563 |
EditorPanel.__init__(self, parent, tagname, window, controler, debug) |
|
564 |
DebugViewer.__init__(self, controler, debug) |
|
565 |
||
566 |
# Adding a rubberband to Viewer |
|
567 |
self.rubberBand = RubberBand(viewer=self) |
|
568 |
self.Editor.SetBackgroundColour(wx.Colour(255,255,255)) |
|
569 |
self.Editor.SetBackgroundStyle(wx.BG_STYLE_CUSTOM) |
|
570 |
self.ResetView() |
|
571 |
self.Scaling = None |
|
572 |
self.DrawGrid = True |
|
573 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
|
574 |
self.PageSize = None |
|
575 |
self.PagePen = wx.TRANSPARENT_PEN |
|
576 |
self.DrawingWire = False |
|
577 |
self.current_id = 0 |
|
578 |
self.TagName = tagname |
|
579 |
self.Highlights = [] |
|
580 |
self.SearchParams = None |
|
581 |
self.SearchResults = None |
|
582 |
self.CurrentFindHighlight = None |
|
583 |
self.InstancePath = instancepath |
|
584 |
self.StartMousePos = None |
|
585 |
self.StartScreenPos = None |
|
| 1224 | 586 |
|
587 |
# Prevent search for highlighted element to be called too often |
|
588 |
self.LastHighlightCheckTime = gettime() |
|
589 |
# Prevent search for element producing tooltip to be called too often |
|
590 |
self.LastToolTipCheckTime = gettime() |
|
591 |
||
| 814 | 592 |
self.Buffering = False |
593 |
||
594 |
# Initialize Cursors |
|
595 |
ResetCursors() |
|
596 |
self.CurrentCursor = 0 |
|
597 |
||
598 |
# Initialize Block, Wire and Comment numbers |
|
599 |
self.wire_id = 0 |
|
600 |
||
601 |
# Initialize Viewer mode to Selection mode |
|
602 |
self.Mode = MODE_SELECTION |
|
603 |
self.SavedMode = False |
|
604 |
self.CurrentLanguage = "FBD" |
|
605 |
||
606 |
if not self.Debug: |
|
607 |
self.Editor.SetDropTarget(ViewerDropTarget(self)) |
|
608 |
||
609 |
self.ElementRefreshList = [] |
|
610 |
self.ElementRefreshList_lock = Lock() |
|
611 |
||
612 |
dc = wx.ClientDC(self.Editor) |
|
613 |
font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["mono"]) |
|
614 |
dc.SetFont(font) |
|
615 |
width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
|
|
616 |
while width > 260: |
|
617 |
faces["size"] -= 1 |
|
618 |
font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["mono"]) |
|
619 |
dc.SetFont(font) |
|
620 |
width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
|
|
621 |
self.SetFont(font) |
|
622 |
self.MiniTextDC = wx.MemoryDC() |
|
623 |
self.MiniTextDC.SetFont(wx.Font(faces["size"] * 0.75, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["helv"])) |
|
624 |
||
625 |
self.CurrentScale = None |
|
|
1123
55ed55ef7aea
Fixed bug on biggest Viewer zoom factor preventing them to be used on Windows
Laurent Bessard
parents:
1122
diff
changeset
|
626 |
self.SetScale(ZOOM_FACTORS.index(1.0), False) |
| 814 | 627 |
|
628 |
self.RefreshHighlightsTimer = wx.Timer(self, -1) |
|
629 |
self.Bind(wx.EVT_TIMER, self.OnRefreshHighlightsTimer, self.RefreshHighlightsTimer) |
|
630 |
||
631 |
self.ResetView() |
|
632 |
||
633 |
# Link Viewer event to corresponding methods |
|
634 |
self.Editor.Bind(wx.EVT_PAINT, self.OnPaint) |
|
635 |
self.Editor.Bind(wx.EVT_LEFT_DOWN, self.OnViewerLeftDown) |
|
636 |
self.Editor.Bind(wx.EVT_LEFT_UP, self.OnViewerLeftUp) |
|
637 |
self.Editor.Bind(wx.EVT_LEFT_DCLICK, self.OnViewerLeftDClick) |
|
638 |
self.Editor.Bind(wx.EVT_RIGHT_DOWN, self.OnViewerRightDown) |
|
639 |
self.Editor.Bind(wx.EVT_RIGHT_UP, self.OnViewerRightUp) |
|
640 |
self.Editor.Bind(wx.EVT_MIDDLE_DOWN, self.OnViewerMiddleDown) |
|
641 |
self.Editor.Bind(wx.EVT_MIDDLE_UP, self.OnViewerMiddleUp) |
|
642 |
self.Editor.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeaveViewer) |
|
643 |
self.Editor.Bind(wx.EVT_MOTION, self.OnViewerMotion) |
|
644 |
self.Editor.Bind(wx.EVT_CHAR, self.OnChar) |
|
645 |
self.Editor.Bind(wx.EVT_SCROLLWIN, self.OnScrollWindow) |
|
646 |
self.Editor.Bind(wx.EVT_SCROLLWIN_THUMBRELEASE, self.OnScrollStop) |
|
647 |
self.Editor.Bind(wx.EVT_MOUSEWHEEL, self.OnMouseWheelWindow) |
|
648 |
self.Editor.Bind(wx.EVT_SIZE, self.OnMoveWindow) |
|
649 |
self.Editor.Bind(wx.EVT_MOUSE_EVENTS, self.OnViewerMouseEvent) |
|
650 |
||
651 |
# Destructor |
|
652 |
def __del__(self): |
|
653 |
DebugViewer.__del__(self) |
|
654 |
self.Flush() |
|
655 |
self.ResetView() |
|
656 |
self.RefreshHighlightsTimer.Stop() |
|
657 |
||
658 |
def SetCurrentCursor(self, cursor): |
|
659 |
if self.Mode != MODE_MOTION: |
|
660 |
global CURSORS |
|
661 |
if self.CurrentCursor != cursor: |
|
662 |
self.CurrentCursor = cursor |
|
663 |
self.Editor.SetCursor(CURSORS[cursor]) |
|
664 |
||
665 |
def GetScrolledRect(self, rect): |
|
666 |
rect.x, rect.y = self.Editor.CalcScrolledPosition(int(rect.x * self.ViewScale[0]), |
|
667 |
int(rect.y * self.ViewScale[1])) |
|
668 |
rect.width = int(rect.width * self.ViewScale[0]) + 2 |
|
669 |
rect.height = int(rect.height * self.ViewScale[1]) + 2 |
|
670 |
return rect |
|
671 |
||
672 |
def GetTitle(self): |
|
673 |
if self.Debug: |
|
674 |
if len(self.InstancePath) > 15: |
|
675 |
return "..." + self.InstancePath[-12:] |
|
676 |
return self.InstancePath |
|
677 |
return EditorPanel.GetTitle(self) |
|
678 |
||
679 |
def GetScaling(self): |
|
680 |
return self.Scaling |
|
681 |
||
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
682 |
def GetInstancePath(self, variable_base=False): |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
683 |
if variable_base: |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
684 |
words = self.TagName.split("::")
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
685 |
if words[0] in ["A", "T"]: |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
686 |
return ".".join(self.InstancePath.split(".")[:-1])
|
| 814 | 687 |
return self.InstancePath |
688 |
||
689 |
def IsViewing(self, tagname): |
|
690 |
if self.Debug: |
|
691 |
return self.InstancePath == tagname |
|
692 |
return EditorPanel.IsViewing(self, tagname) |
|
693 |
||
694 |
# Returns a new id |
|
695 |
def GetNewId(self): |
|
696 |
self.current_id += 1 |
|
697 |
return self.current_id |
|
698 |
||
699 |
def SetScale(self, scale_number, refresh=True, mouse_event=None): |
|
700 |
new_scale = max(0, min(scale_number, len(ZOOM_FACTORS) - 1)) |
|
701 |
if self.CurrentScale != new_scale: |
|
702 |
if refresh: |
|
703 |
dc = self.GetLogicalDC() |
|
704 |
self.CurrentScale = new_scale |
|
705 |
self.ViewScale = (ZOOM_FACTORS[self.CurrentScale], ZOOM_FACTORS[self.CurrentScale]) |
|
706 |
if refresh: |
|
707 |
self.Editor.Freeze() |
|
708 |
if mouse_event is None: |
|
709 |
client_size = self.Editor.GetClientSize() |
|
710 |
mouse_pos = wx.Point(client_size[0] / 2, client_size[1] / 2) |
|
711 |
mouse_event = wx.MouseEvent(wx.EVT_MOUSEWHEEL.typeId) |
|
712 |
mouse_event.m_x = mouse_pos.x |
|
713 |
mouse_event.m_y = mouse_pos.y |
|
714 |
else: |
|
715 |
mouse_pos = mouse_event.GetPosition() |
|
716 |
pos = mouse_event.GetLogicalPosition(dc) |
|
717 |
xmax = self.GetScrollRange(wx.HORIZONTAL) - self.GetScrollThumb(wx.HORIZONTAL) |
|
718 |
ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL) |
|
719 |
scrollx = max(0, round(pos.x * self.ViewScale[0] - mouse_pos.x) / SCROLLBAR_UNIT) |
|
720 |
scrolly = max(0, round(pos.y * self.ViewScale[1] - mouse_pos.y) / SCROLLBAR_UNIT) |
|
721 |
if scrollx > xmax or scrolly > ymax: |
|
722 |
self.RefreshScrollBars(max(0, scrollx - xmax), max(0, scrolly - ymax)) |
|
723 |
self.Scroll(scrollx, scrolly) |
|
724 |
else: |
|
725 |
self.Scroll(scrollx, scrolly) |
|
726 |
self.RefreshScrollBars() |
|
727 |
self.RefreshScaling(refresh) |
|
728 |
self.Editor.Thaw() |
|
729 |
||
730 |
def GetScale(self): |
|
731 |
return self.CurrentScale |
|
732 |
||
733 |
def GetViewScale(self): |
|
734 |
return self.ViewScale |
|
735 |
||
736 |
def GetLogicalDC(self, buffered=False): |
|
737 |
if buffered: |
|
738 |
bitmap = wx.EmptyBitmap(*self.Editor.GetClientSize()) |
|
739 |
dc = wx.MemoryDC(bitmap) |
|
740 |
else: |
|
741 |
dc = wx.ClientDC(self.Editor) |
|
742 |
dc.SetFont(self.GetFont()) |
|
743 |
if wx.VERSION >= (2, 6, 0): |
|
744 |
self.Editor.DoPrepareDC(dc) |
|
745 |
else: |
|
746 |
self.Editor.PrepareDC(dc) |
|
747 |
dc.SetUserScale(self.ViewScale[0], self.ViewScale[1]) |
|
748 |
return dc |
|
749 |
||
750 |
def RefreshRect(self, rect, eraseBackground=True): |
|
751 |
self.Editor.RefreshRect(rect, eraseBackground) |
|
752 |
||
753 |
def Scroll(self, x, y): |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
754 |
if self.Debug and wx.Platform == '__WXMSW__': |
|
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
755 |
self.Editor.Freeze() |
| 814 | 756 |
self.Editor.Scroll(x, y) |
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
757 |
if self.Debug: |
|
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
758 |
if wx.Platform == '__WXMSW__': |
|
1208
d22fcdfae8d0
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1205
diff
changeset
|
759 |
self.Editor.Thaw() |
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
760 |
else: |
|
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
761 |
self.Editor.Refresh() |
| 814 | 762 |
|
763 |
def GetScrollPos(self, orientation): |
|
764 |
return self.Editor.GetScrollPos(orientation) |
|
765 |
||
766 |
def GetScrollRange(self, orientation): |
|
767 |
return self.Editor.GetScrollRange(orientation) |
|
768 |
||
769 |
def GetScrollThumb(self, orientation): |
|
770 |
return self.Editor.GetScrollThumb(orientation) |
|
771 |
||
772 |
def CalcUnscrolledPosition(self, x, y): |
|
773 |
return self.Editor.CalcUnscrolledPosition(x, y) |
|
774 |
||
775 |
def GetViewStart(self): |
|
776 |
return self.Editor.GetViewStart() |
|
777 |
||
778 |
def GetTextExtent(self, text): |
|
779 |
return self.Editor.GetTextExtent(text) |
|
780 |
||
781 |
def GetFont(self): |
|
782 |
return self.Editor.GetFont() |
|
783 |
||
784 |
def GetMiniTextExtent(self, text): |
|
785 |
return self.MiniTextDC.GetTextExtent(text) |
|
786 |
||
787 |
def GetMiniFont(self): |
|
788 |
return self.MiniTextDC.GetFont() |
|
789 |
||
790 |
#------------------------------------------------------------------------------- |
|
791 |
# Element management functions |
|
792 |
#------------------------------------------------------------------------------- |
|
793 |
||
794 |
def AddBlock(self, block): |
|
795 |
self.Blocks[block.GetId()] = block |
|
796 |
||
797 |
def AddWire(self, wire): |
|
798 |
self.wire_id += 1 |
|
799 |
self.Wires[wire] = self.wire_id |
|
800 |
||
801 |
def AddComment(self, comment): |
|
802 |
self.Comments[comment.GetId()] = comment |
|
803 |
||
804 |
def IsBlock(self, block): |
|
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
805 |
if block is not None: |
|
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
806 |
return self.Blocks.get(block.GetId(), False) |
|
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
807 |
return False |
| 814 | 808 |
|
809 |
def IsWire(self, wire): |
|
810 |
return self.Wires.get(wire, False) |
|
811 |
||
812 |
def IsComment(self, comment): |
|
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
813 |
if comment is not None: |
|
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
814 |
return self.Comments.get(comment.GetId(), False) |
|
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
815 |
return False |
| 814 | 816 |
|
817 |
def RemoveBlock(self, block): |
|
818 |
self.Blocks.pop(block.GetId()) |
|
819 |
||
820 |
def RemoveWire(self, wire): |
|
821 |
self.Wires.pop(wire) |
|
822 |
||
823 |
def RemoveComment(self, comment): |
|
824 |
self.Comments.pop(comment.GetId()) |
|
825 |
||
826 |
def GetElements(self, sort_blocks=False, sort_wires=False, sort_comments=False): |
|
827 |
blocks = self.Blocks.values() |
|
828 |
wires = self.Wires.keys() |
|
829 |
comments = self.Comments.values() |
|
830 |
if sort_blocks: |
|
831 |
blocks.sort(lambda x, y: cmp(x.GetId(), y.GetId())) |
|
832 |
if sort_wires: |
|
833 |
wires.sort(lambda x, y: cmp(self.Wires[x], self.Wires[y])) |
|
834 |
if sort_comments: |
|
835 |
comments.sort(lambda x, y: cmp(x.GetId(), y.GetId())) |
|
836 |
return blocks + wires + comments |
|
837 |
||
838 |
def GetConnectorByName(self, name): |
|
839 |
for block in self.Blocks.itervalues(): |
|
840 |
if isinstance(block, FBD_Connector) and\ |
|
841 |
block.GetType() == CONNECTOR and\ |
|
842 |
block.GetName() == name: |
|
843 |
return block |
|
844 |
return None |
|
845 |
||
846 |
def RefreshVisibleElements(self, xp = None, yp = None): |
|
847 |
x, y = self.Editor.CalcUnscrolledPosition(0, 0) |
|
848 |
if xp is not None: |
|
849 |
x = xp * self.Editor.GetScrollPixelsPerUnit()[0] |
|
850 |
if yp is not None: |
|
851 |
y = yp * self.Editor.GetScrollPixelsPerUnit()[1] |
|
852 |
width, height = self.Editor.GetClientSize() |
|
853 |
screen = wx.Rect(int(x / self.ViewScale[0]), int(y / self.ViewScale[1]), |
|
854 |
int(width / self.ViewScale[0]), int(height / self.ViewScale[1])) |
|
855 |
for comment in self.Comments.itervalues(): |
|
856 |
comment.TestVisible(screen) |
|
857 |
for wire in self.Wires.iterkeys(): |
|
858 |
wire.TestVisible(screen) |
|
859 |
for block in self.Blocks.itervalues(): |
|
860 |
block.TestVisible(screen) |
|
861 |
||
862 |
def GetElementIECPath(self, element): |
|
863 |
iec_path = None |
|
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
864 |
instance_path = self.GetInstancePath(True) |
|
1166
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
865 |
if isinstance(element, (Wire, Connector)): |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
866 |
if isinstance(element, Wire): |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
867 |
element = element.EndConnected |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
868 |
block = element.GetParentBlock() |
| 814 | 869 |
if isinstance(block, FBD_Block): |
870 |
blockname = block.GetName() |
|
|
1166
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
871 |
connectorname = element.GetName() |
| 814 | 872 |
if blockname != "": |
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
873 |
iec_path = "%s.%s.%s"%(instance_path, blockname, connectorname) |
| 814 | 874 |
else: |
875 |
if connectorname == "": |
|
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
876 |
iec_path = "%s.%s%d"%(instance_path, block.GetType(), block.GetId()) |
| 814 | 877 |
else: |
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
878 |
iec_path = "%s.%s%d_%s"%(instance_path, block.GetType(), block.GetId(), connectorname) |
| 814 | 879 |
elif isinstance(block, FBD_Variable): |
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
880 |
iec_path = "%s.%s"%(instance_path, block.GetName()) |
| 814 | 881 |
elif isinstance(block, FBD_Connector): |
882 |
connection = self.GetConnectorByName(block.GetName()) |
|
883 |
if connection is not None: |
|
884 |
connector = connection.GetConnector() |
|
885 |
if len(connector.Wires) == 1: |
|
886 |
iec_path = self.GetElementIECPath(connector.Wires[0][0]) |
|
887 |
elif isinstance(element, LD_Contact): |
|
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
888 |
iec_path = "%s.%s"%(instance_path, element.GetName()) |
| 814 | 889 |
elif isinstance(element, SFC_Step): |
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
890 |
iec_path = "%s.%s.X"%(instance_path, element.GetName()) |
| 814 | 891 |
elif isinstance(element, SFC_Transition): |
892 |
connectors = element.GetConnectors() |
|
893 |
previous_steps = self.GetPreviousSteps(connectors["inputs"]) |
|
894 |
next_steps = self.GetNextSteps(connectors["outputs"]) |
|
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
895 |
iec_path = "%s.%s->%s"%(instance_path, ",".join(previous_steps), ",".join(next_steps)) |
| 814 | 896 |
return iec_path |
897 |
||
898 |
#------------------------------------------------------------------------------- |
|
899 |
# Reset functions |
|
900 |
#------------------------------------------------------------------------------- |
|
901 |
||
902 |
# Resets Viewer lists |
|
903 |
def ResetView(self): |
|
904 |
self.Blocks = {}
|
|
905 |
self.Wires = {}
|
|
906 |
self.Comments = {}
|
|
907 |
self.Subscribed = {}
|
|
908 |
self.SelectedElement = None |
|
909 |
self.HighlightedElement = None |
|
910 |
self.ToolTipElement = None |
|
911 |
||
912 |
def Flush(self): |
|
|
1205
638d1d430d24
Fixed bug Viewer not refreshed when debugging
Laurent Bessard
parents:
1204
diff
changeset
|
913 |
self.UnsubscribeAllDataConsumers(tick=False) |
| 814 | 914 |
for block in self.Blocks.itervalues(): |
915 |
block.Flush() |
|
|
1205
638d1d430d24
Fixed bug Viewer not refreshed when debugging
Laurent Bessard
parents:
1204
diff
changeset
|
916 |
|
| 814 | 917 |
# Remove all elements |
918 |
def CleanView(self): |
|
919 |
for block in self.Blocks.itervalues(): |
|
920 |
block.Clean() |
|
921 |
self.ResetView() |
|
922 |
||
923 |
# Changes Viewer mode |
|
924 |
def SetMode(self, mode): |
|
925 |
if self.Mode != mode or mode == MODE_SELECTION: |
|
926 |
if self.Mode == MODE_MOTION: |
|
927 |
wx.CallAfter(self.Editor.SetCursor, wx.NullCursor) |
|
928 |
self.Mode = mode |
|
929 |
self.SavedMode = False |
|
930 |
else: |
|
931 |
self.SavedMode = True |
|
932 |
# Reset selection |
|
933 |
if self.Mode != MODE_SELECTION and self.SelectedElement: |
|
934 |
self.SelectedElement.SetSelected(False) |
|
935 |
self.SelectedElement = None |
|
936 |
if self.Mode == MODE_MOTION: |
|
937 |
wx.CallAfter(self.Editor.SetCursor, wx.StockCursor(wx.CURSOR_HAND)) |
|
938 |
self.SavedMode = True |
|
939 |
||
940 |
# Return current drawing mode |
|
941 |
def GetDrawingMode(self): |
|
942 |
return self.ParentWindow.GetDrawingMode() |
|
943 |
||
944 |
# Buffer the last model state |
|
945 |
def RefreshBuffer(self): |
|
946 |
self.Controler.BufferProject() |
|
947 |
if self.ParentWindow: |
|
948 |
self.ParentWindow.RefreshTitle() |
|
949 |
self.ParentWindow.RefreshFileMenu() |
|
950 |
self.ParentWindow.RefreshEditMenu() |
|
951 |
||
952 |
def StartBuffering(self): |
|
953 |
if not self.Buffering: |
|
954 |
self.Buffering = True |
|
955 |
self.Controler.StartBuffering() |
|
956 |
if self.ParentWindow: |
|
957 |
self.ParentWindow.RefreshTitle() |
|
958 |
self.ParentWindow.RefreshFileMenu() |
|
959 |
self.ParentWindow.RefreshEditMenu() |
|
960 |
||
961 |
def ResetBuffer(self): |
|
962 |
if self.Buffering: |
|
963 |
self.Controler.EndBuffering() |
|
964 |
self.Buffering = False |
|
965 |
||
966 |
def GetBufferState(self): |
|
967 |
if not self.Debug: |
|
968 |
return self.Controler.GetBufferState() |
|
969 |
return False, False |
|
970 |
||
971 |
def Undo(self): |
|
972 |
if not self.Debug: |
|
973 |
self.Controler.LoadPrevious() |
|
974 |
self.ParentWindow.CloseTabsWithoutModel() |
|
975 |
||
976 |
def Redo(self): |
|
977 |
if not self.Debug: |
|
978 |
self.Controler.LoadNext() |
|
979 |
self.ParentWindow.CloseTabsWithoutModel() |
|
980 |
||
981 |
def HasNoModel(self): |
|
982 |
if not self.Debug: |
|
983 |
return self.Controler.GetEditedElement(self.TagName) is None |
|
984 |
return False |
|
985 |
||
986 |
# Refresh the current scaling |
|
987 |
def RefreshScaling(self, refresh=True): |
|
988 |
properties = self.Controler.GetProjectProperties(self.Debug) |
|
989 |
scaling = properties["scaling"][self.CurrentLanguage] |
|
990 |
if scaling[0] != 0 and scaling[1] != 0: |
|
991 |
self.Scaling = scaling |
|
992 |
if self.DrawGrid: |
|
993 |
width = max(2, int(scaling[0] * self.ViewScale[0])) |
|
994 |
height = max(2, int(scaling[1] * self.ViewScale[1])) |
|
995 |
bitmap = wx.EmptyBitmap(width, height) |
|
996 |
dc = wx.MemoryDC(bitmap) |
|
997 |
dc.SetBackground(wx.Brush(self.Editor.GetBackgroundColour())) |
|
998 |
dc.Clear() |
|
999 |
dc.SetPen(MiterPen(wx.Colour(180, 180, 180))) |
|
1000 |
dc.DrawPoint(0, 0) |
|
1001 |
self.GridBrush = wx.BrushFromBitmap(bitmap) |
|
1002 |
else: |
|
1003 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
|
1004 |
else: |
|
1005 |
self.Scaling = None |
|
1006 |
self.GridBrush = wx.TRANSPARENT_BRUSH |
|
1007 |
page_size = properties["pageSize"] |
|
1008 |
if page_size != (0, 0): |
|
1009 |
self.PageSize = map(int, page_size) |
|
1010 |
self.PagePen = MiterPen(wx.Colour(180, 180, 180)) |
|
1011 |
else: |
|
1012 |
self.PageSize = None |
|
1013 |
self.PagePen = wx.TRANSPARENT_PEN |
|
1014 |
if refresh: |
|
1015 |
self.RefreshVisibleElements() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1016 |
self.Editor.Refresh(False) |
| 814 | 1017 |
|
1018 |
||
1019 |
#------------------------------------------------------------------------------- |
|
1020 |
# Refresh functions |
|
1021 |
#------------------------------------------------------------------------------- |
|
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1022 |
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1023 |
VALUE_TRANSLATION = {True: _("Active"), False: _("Inactive")}
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1024 |
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1025 |
def SetValue(self, value): |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1026 |
if self.Value != value: |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1027 |
self.Value = value |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1028 |
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1029 |
xstart, ystart = self.GetViewStart() |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1030 |
window_size = self.Editor.GetClientSize() |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1031 |
refresh_rect = self.GetRedrawRect() |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1032 |
if (xstart * SCROLLBAR_UNIT <= refresh_rect.x + refresh_rect.width and |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1033 |
xstart * SCROLLBAR_UNIT + window_size[0] >= refresh_rect.x and |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1034 |
ystart * SCROLLBAR_UNIT <= refresh_rect.y + refresh_rect.height and |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1035 |
ystart * SCROLLBAR_UNIT + window_size[1] >= refresh_rect.y): |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1036 |
self.ElementNeedRefresh(self) |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1037 |
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1038 |
def GetRedrawRect(self): |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1039 |
dc = self.GetLogicalDC() |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1040 |
ipw, iph = dc.GetTextExtent(_("Debug: %s") % self.InstancePath)
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1041 |
vw, vh = 0, 0 |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1042 |
for value in self.VALUE_TRANSLATION.itervalues(): |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1043 |
w, h = dc.GetTextExtent("(%s)" % value)
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1044 |
vw = max(vw, w) |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1045 |
vh = max(vh, h) |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1046 |
return wx.Rect(ipw + 4, 2, vw, vh) |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1047 |
|
| 814 | 1048 |
def ElementNeedRefresh(self, element): |
1049 |
self.ElementRefreshList_lock.acquire() |
|
1050 |
self.ElementRefreshList.append(element) |
|
1051 |
self.ElementRefreshList_lock.release() |
|
1052 |
||
1053 |
def RefreshNewData(self): |
|
1054 |
refresh_rect = None |
|
1055 |
self.ElementRefreshList_lock.acquire() |
|
1056 |
for element in self.ElementRefreshList: |
|
1057 |
if refresh_rect is None: |
|
1058 |
refresh_rect = element.GetRedrawRect() |
|
1059 |
else: |
|
1060 |
refresh_rect.Union(element.GetRedrawRect()) |
|
1061 |
self.ElementRefreshList = [] |
|
1062 |
self.ElementRefreshList_lock.release() |
|
1063 |
||
1064 |
if refresh_rect is not None: |
|
1065 |
self.RefreshRect(self.GetScrolledRect(refresh_rect), False) |
|
1066 |
else: |
|
1067 |
DebugViewer.RefreshNewData(self) |
|
|
1089
5cd1f8df71aa
Fixed bug when transferring program and a output located variable is forced
Laurent Bessard
parents:
1069
diff
changeset
|
1068 |
|
|
1176
f4b434672204
Moved and rewrote DebugViewer and DebusDataConsumer classes
Laurent Bessard
parents:
1170
diff
changeset
|
1069 |
def SubscribeAllDataConsumers(self): |
|
1201
3907f10efcf4
Fixed bug Viewer not refreshed when debugging
Laurent Bessard
parents:
1176
diff
changeset
|
1070 |
self.RefreshView() |
|
1176
f4b434672204
Moved and rewrote DebugViewer and DebusDataConsumer classes
Laurent Bessard
parents:
1170
diff
changeset
|
1071 |
DebugViewer.SubscribeAllDataConsumers(self) |
|
1205
638d1d430d24
Fixed bug Viewer not refreshed when debugging
Laurent Bessard
parents:
1204
diff
changeset
|
1072 |
|
| 814 | 1073 |
# Refresh Viewer elements |
1074 |
def RefreshView(self, variablepanel=True, selection=None): |
|
1075 |
EditorPanel.RefreshView(self, variablepanel) |
|
1076 |
||
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1077 |
if self.TagName.split("::")[0] == "A":
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1078 |
self.AddDataConsumer("%s.Q" % self.InstancePath.upper(), self)
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
1079 |
|
| 814 | 1080 |
if self.ToolTipElement is not None: |
|
1170
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
1081 |
self.ToolTipElement.DestroyToolTip() |
| 814 | 1082 |
self.ToolTipElement = None |
1083 |
||
1084 |
self.Inhibit(True) |
|
1085 |
self.current_id = 0 |
|
1086 |
# Start by reseting Viewer |
|
1087 |
self.Flush() |
|
1088 |
self.ResetView() |
|
1089 |
self.ResetBuffer() |
|
1090 |
instance = {}
|
|
1091 |
# List of ids of already loaded blocks |
|
1092 |
ids = [] |
|
1093 |
# Load Blocks until they are all loaded |
|
1094 |
while instance is not None: |
|
1095 |
instance = self.Controler.GetEditedElementInstanceInfos(self.TagName, exclude = ids, debug = self.Debug) |
|
1096 |
if instance is not None: |
|
1097 |
self.loadInstance(instance, ids, selection) |
|
|
1226
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1098 |
|
|
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1099 |
if (selection is not None and |
| 1229 | 1100 |
isinstance(self.SelectedElement, Graphic_Group)): |
|
1226
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1101 |
self.SelectedElement.RefreshWireExclusion() |
|
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1102 |
self.SelectedElement.RefreshBoundingBox() |
|
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1103 |
|
| 814 | 1104 |
self.RefreshScrollBars() |
1105 |
||
1106 |
for wire in self.Wires: |
|
1107 |
if not wire.IsConnectedCompatible(): |
|
1108 |
wire.SetValid(False) |
|
1109 |
if self.Debug: |
|
1110 |
iec_path = self.GetElementIECPath(wire) |
|
1111 |
if iec_path is None: |
|
1112 |
block = wire.EndConnected.GetParentBlock() |
|
1113 |
if isinstance(block, LD_PowerRail): |
|
1114 |
wire.SetValue(True) |
|
1115 |
elif self.AddDataConsumer(iec_path.upper(), wire) is None: |
|
1116 |
wire.SetValue("undefined")
|
|
1117 |
||
1118 |
if self.Debug: |
|
1119 |
for block in self.Blocks.itervalues(): |
|
1120 |
block.SpreadCurrent() |
|
|
1166
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1121 |
if isinstance(block, FBD_Block): |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1122 |
for output_connector in block.GetConnectors()["outputs"]: |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1123 |
if len(output_connector.GetWires()) == 0: |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1124 |
iec_path = self.GetElementIECPath(output_connector) |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1125 |
if iec_path is not None: |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1126 |
self.AddDataConsumer(iec_path.upper(), output_connector) |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1127 |
else: |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1128 |
iec_path = self.GetElementIECPath(block) |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1129 |
if iec_path is not None: |
|
2ed9675be08d
Added support for displaying value of unconnected block connectors in debug
Laurent Bessard
parents:
1141
diff
changeset
|
1130 |
self.AddDataConsumer(iec_path.upper(), block) |
| 814 | 1131 |
|
1132 |
self.Inhibit(False) |
|
1133 |
self.RefreshVisibleElements() |
|
1134 |
self.ShowHighlights() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1135 |
self.Editor.Refresh(False) |
| 814 | 1136 |
|
1137 |
def GetPreviousSteps(self, connectors): |
|
1138 |
steps = [] |
|
1139 |
for connector in connectors: |
|
1140 |
for wire, handle in connector.GetWires(): |
|
1141 |
previous = wire.GetOtherConnected(connector).GetParentBlock() |
|
1142 |
if isinstance(previous, SFC_Step): |
|
1143 |
steps.append(previous.GetName()) |
|
1144 |
elif isinstance(previous, SFC_Divergence) and previous.GetType() in [SIMULTANEOUS_CONVERGENCE, SELECTION_DIVERGENCE]: |
|
1145 |
connectors = previous.GetConnectors() |
|
1146 |
steps.extend(self.GetPreviousSteps(connectors["inputs"])) |
|
1147 |
return steps |
|
1148 |
||
1149 |
def GetNextSteps(self, connectors): |
|
1150 |
steps = [] |
|
1151 |
for connector in connectors: |
|
1152 |
for wire, handle in connector.GetWires(): |
|
1153 |
next = wire.GetOtherConnected(connector).GetParentBlock() |
|
1154 |
if isinstance(next, SFC_Step): |
|
1155 |
steps.append(next.GetName()) |
|
1156 |
elif isinstance(next, SFC_Jump): |
|
1157 |
steps.append(next.GetTarget()) |
|
1158 |
elif isinstance(next, SFC_Divergence) and next.GetType() in [SIMULTANEOUS_DIVERGENCE, SELECTION_CONVERGENCE]: |
|
1159 |
connectors = next.GetConnectors() |
|
1160 |
steps.extend(self.GetNextSteps(connectors["outputs"])) |
|
1161 |
return steps |
|
1162 |
||
1163 |
def GetMaxSize(self): |
|
1164 |
maxx = maxy = 0 |
|
1165 |
for element in self.GetElements(): |
|
1166 |
bbox = element.GetBoundingBox() |
|
1167 |
maxx = max(maxx, bbox.x + bbox.width) |
|
1168 |
maxy = max(maxy, bbox.y + bbox.height) |
|
1169 |
return maxx, maxy |
|
1170 |
||
1171 |
def RefreshScrollBars(self, width_incr=0, height_incr=0): |
|
1172 |
xstart, ystart = self.GetViewStart() |
|
1173 |
window_size = self.Editor.GetClientSize() |
|
1174 |
maxx, maxy = self.GetMaxSize() |
|
1175 |
maxx = max(maxx + WINDOW_BORDER, (xstart * SCROLLBAR_UNIT + window_size[0]) / self.ViewScale[0]) |
|
1176 |
maxy = max(maxy + WINDOW_BORDER, (ystart * SCROLLBAR_UNIT + window_size[1]) / self.ViewScale[1]) |
|
1177 |
if self.rubberBand.IsShown(): |
|
1178 |
extent = self.rubberBand.GetCurrentExtent() |
|
1179 |
maxx = max(maxx, extent.x + extent.width) |
|
1180 |
maxy = max(maxy, extent.y + extent.height) |
|
1181 |
maxx = int(maxx * self.ViewScale[0]) |
|
1182 |
maxy = int(maxy * self.ViewScale[1]) |
|
1183 |
self.Editor.SetScrollbars(SCROLLBAR_UNIT, SCROLLBAR_UNIT, |
|
1184 |
round(maxx / SCROLLBAR_UNIT) + width_incr, round(maxy / SCROLLBAR_UNIT) + height_incr, |
|
1185 |
xstart, ystart, True) |
|
1186 |
||
1187 |
def EnsureVisible(self, block): |
|
1188 |
xstart, ystart = self.GetViewStart() |
|
1189 |
window_size = self.Editor.GetClientSize() |
|
1190 |
block_bbx = block.GetBoundingBox() |
|
1191 |
||
1192 |
screen_minx, screen_miny = xstart * SCROLLBAR_UNIT, ystart * SCROLLBAR_UNIT |
|
1193 |
screen_maxx, screen_maxy = screen_minx + window_size[0], screen_miny + window_size[1] |
|
1194 |
block_minx = int(block_bbx.x * self.ViewScale[0]) |
|
1195 |
block_miny = int(block_bbx.y * self.ViewScale[1]) |
|
1196 |
block_maxx = int(round((block_bbx.x + block_bbx.width) * self.ViewScale[0])) |
|
1197 |
block_maxy = int(round((block_bbx.y + block_bbx.height) * self.ViewScale[1])) |
|
1198 |
||
1199 |
xpos, ypos = xstart, ystart |
|
1200 |
if block_minx < screen_minx and block_maxx < screen_maxx: |
|
1201 |
xpos -= (screen_minx - block_minx) / SCROLLBAR_UNIT + 1 |
|
1202 |
elif block_maxx > screen_maxx and block_minx > screen_minx: |
|
1203 |
xpos += (block_maxx - screen_maxx) / SCROLLBAR_UNIT + 1 |
|
1204 |
if block_miny < screen_miny and block_maxy < screen_maxy: |
|
1205 |
ypos -= (screen_miny - block_miny) / SCROLLBAR_UNIT + 1 |
|
1206 |
elif block_maxy > screen_maxy and block_miny > screen_miny: |
|
1207 |
ypos += (block_maxy - screen_maxy) / SCROLLBAR_UNIT + 1 |
|
1208 |
self.Scroll(xpos, ypos) |
|
1209 |
||
1210 |
def SelectInGroup(self, element): |
|
1211 |
element.SetSelected(True) |
|
1212 |
if self.SelectedElement is None: |
|
1213 |
self.SelectedElement = element |
|
1214 |
elif isinstance(self.SelectedElement, Graphic_Group): |
|
|
1226
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1215 |
self.SelectedElement.AddElement(element) |
| 814 | 1216 |
else: |
1217 |
group = Graphic_Group(self) |
|
|
1226
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1218 |
group.AddElement(self.SelectedElement) |
|
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1219 |
group.AddElement(element) |
| 814 | 1220 |
self.SelectedElement = group |
1221 |
||
1222 |
# Load instance from given informations |
|
1223 |
def loadInstance(self, instance, ids, selection): |
|
1224 |
ids.append(instance["id"]) |
|
1225 |
self.current_id = max(self.current_id, instance["id"]) |
|
1226 |
creation_function = ElementCreationFunctions.get(instance["type"], None) |
|
1227 |
connectors = {"inputs" : [], "outputs" : []}
|
|
1228 |
specific_values = instance["specific_values"] |
|
1229 |
if creation_function is not None: |
|
1230 |
element = creation_function(self, instance["id"], specific_values) |
|
1231 |
if isinstance(element, SFC_Step): |
|
1232 |
if len(instance["inputs"]) > 0: |
|
1233 |
element.AddInput() |
|
1234 |
else: |
|
1235 |
element.RemoveInput() |
|
1236 |
if len(instance["outputs"]) > 0: |
|
1237 |
element.AddOutput() |
|
1238 |
if isinstance(element, SFC_Transition) and specific_values["condition_type"] == "connection": |
|
1239 |
connector = element.GetConditionConnector() |
|
|
896
899ca8809528
Fixed bug when copying transition and connected FBD or LD diagram. Wire between the new transition and new FBD or LD diagram was not selected.
Laurent Bessard
parents:
891
diff
changeset
|
1240 |
self.CreateWires(connector, instance["id"], specific_values["connection"]["links"], ids, selection) |
| 814 | 1241 |
else: |
1242 |
executionControl = False |
|
1243 |
for input in instance["inputs"]: |
|
1244 |
if input["negated"]: |
|
1245 |
connectors["inputs"].append((input["name"], None, "negated")) |
|
1246 |
elif input["edge"]: |
|
1247 |
connectors["inputs"].append((input["name"], None, input["edge"])) |
|
1248 |
else: |
|
1249 |
connectors["inputs"].append((input["name"], None, "none")) |
|
1250 |
for output in instance["outputs"]: |
|
1251 |
if output["negated"]: |
|
1252 |
connectors["outputs"].append((output["name"], None, "negated")) |
|
1253 |
elif output["edge"]: |
|
1254 |
connectors["outputs"].append((output["name"], None, output["edge"])) |
|
1255 |
else: |
|
1256 |
connectors["outputs"].append((output["name"], None, "none")) |
|
1257 |
if len(connectors["inputs"]) > 0 and connectors["inputs"][0][0] == "EN": |
|
1258 |
connectors["inputs"].pop(0) |
|
1259 |
executionControl = True |
|
1260 |
if len(connectors["outputs"]) > 0 and connectors["outputs"][0][0] == "ENO": |
|
1261 |
connectors["outputs"].pop(0) |
|
1262 |
executionControl = True |
|
1263 |
if specific_values["name"] is None: |
|
1264 |
specific_values["name"] = "" |
|
1265 |
element = FBD_Block(self, instance["type"], specific_values["name"], |
|
1266 |
instance["id"], len(connectors["inputs"]), |
|
1267 |
connectors=connectors, executionControl=executionControl, |
|
1268 |
executionOrder=specific_values["executionOrder"]) |
|
1269 |
if isinstance(element, Comment): |
|
1270 |
self.AddComment(element) |
|
1271 |
else: |
|
1272 |
self.AddBlock(element) |
|
1273 |
connectors = element.GetConnectors() |
|
|
832
b2609a8e4cb6
Fix bug when loading FBD schema with a loop in block connections
laurent
parents:
828
diff
changeset
|
1274 |
element.SetPosition(instance["x"], instance["y"]) |
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
1275 |
element.SetSize(instance["width"], instance["height"]) |
|
832
b2609a8e4cb6
Fix bug when loading FBD schema with a loop in block connections
laurent
parents:
828
diff
changeset
|
1276 |
for i, output_connector in enumerate(instance["outputs"]): |
|
1141
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1277 |
if isinstance(element, FBD_Block): |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1278 |
connector = element.GetConnector( |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1279 |
wx.Point(*output_connector["position"]), |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1280 |
output_name = output_connector["name"]) |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1281 |
elif i < len(connectors["outputs"]): |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1282 |
connector = connectors["outputs"][i] |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1283 |
else: |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1284 |
connector = None |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1285 |
if connector is not None: |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1286 |
if output_connector.get("negated", False):
|
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1287 |
connector.SetNegated(True) |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1288 |
if output_connector.get("edge", "none") != "none":
|
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1289 |
connector.SetEdge(output_connector["edge"]) |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1290 |
if connectors["outputs"].index(connector) == i: |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1291 |
connector.SetPosition(wx.Point(*output_connector["position"])) |
| 814 | 1292 |
for i, input_connector in enumerate(instance["inputs"]): |
|
1141
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1293 |
if isinstance(element, FBD_Block): |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1294 |
connector = element.GetConnector( |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1295 |
wx.Point(*input_connector["position"]), |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1296 |
input_name = input_connector["name"]) |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1297 |
elif i < len(connectors["inputs"]): |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1298 |
connector = connectors["inputs"][i] |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1299 |
else: |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1300 |
connector = None |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1301 |
if connector is not None: |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1302 |
if connectors["inputs"].index(connector) == i: |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1303 |
connector.SetPosition(wx.Point(*input_connector["position"])) |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1304 |
if input_connector.get("negated", False):
|
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1305 |
connector.SetNegated(True) |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1306 |
if input_connector.get("edge", "none") != "none":
|
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1307 |
connector.SetEdge(input_connector["edge"]) |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1308 |
if not self.CreateWires(connector, instance["id"], input_connector["links"], ids, selection): |
|
5069a28486b9
Fixed bug connection disappear when removing variable from interface of an already used POU
Laurent Bessard
parents:
1135
diff
changeset
|
1309 |
element.RefreshModel() |
|
1130
f96e0254f0ce
Fixed loading of Blocks in Viewer when block interface have changed
Laurent Bessard
parents:
1123
diff
changeset
|
1310 |
element.RefreshConnectors() |
| 814 | 1311 |
if selection is not None and selection[0].get(instance["id"], False): |
1312 |
self.SelectInGroup(element) |
|
1313 |
||
1314 |
def CreateWires(self, start_connector, id, links, ids, selection=None): |
|
|
1135
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1315 |
links_connected = True |
| 814 | 1316 |
for link in links: |
1317 |
refLocalId = link["refLocalId"] |
|
|
1135
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1318 |
if refLocalId is None: |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1319 |
links_connected = False |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1320 |
continue |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1321 |
|
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1322 |
if refLocalId not in ids: |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1323 |
new_instance = self.Controler.GetEditedElementInstanceInfos(self.TagName, refLocalId, debug = self.Debug) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1324 |
if new_instance is not None: |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1325 |
self.loadInstance(new_instance, ids, selection) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1326 |
|
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1327 |
connected = self.FindElementById(refLocalId) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1328 |
if connected is None: |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1329 |
links_connected = False |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1330 |
continue |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1331 |
|
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1332 |
points = link["points"] |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1333 |
end_connector = connected.GetConnector(wx.Point(points[-1][0], points[-1][1]), link["formalParameter"]) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1334 |
if end_connector is not None: |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1335 |
wire = Wire(self) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1336 |
wire.SetPoints(points) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1337 |
start_connector.Connect((wire, 0), False) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1338 |
end_connector.Connect((wire, -1), False) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1339 |
wire.ConnectStartPoint(None, start_connector) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1340 |
wire.ConnectEndPoint(None, end_connector) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1341 |
connected.RefreshConnectors() |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1342 |
self.AddWire(wire) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1343 |
if selection is not None and (\ |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1344 |
selection[1].get((id, refLocalId), False) or \ |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1345 |
selection[1].get((refLocalId, id), False)): |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1346 |
self.SelectInGroup(wire) |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1347 |
else: |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1348 |
links_connected = False |
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1349 |
|
|
519a21ddbc40
Added support for updating model when broken connection is detected in Viewer
Laurent Bessard
parents:
1133
diff
changeset
|
1350 |
return links_connected |
|
1130
f96e0254f0ce
Fixed loading of Blocks in Viewer when block interface have changed
Laurent Bessard
parents:
1123
diff
changeset
|
1351 |
|
| 814 | 1352 |
def IsOfType(self, type, reference): |
1353 |
return self.Controler.IsOfType(type, reference, self.Debug) |
|
1354 |
||
1355 |
def IsEndType(self, type): |
|
1356 |
return self.Controler.IsEndType(type) |
|
1357 |
||
1358 |
def GetBlockType(self, type, inputs = None): |
|
1359 |
return self.Controler.GetBlockType(type, inputs, self.Debug) |
|
1360 |
||
1361 |
#------------------------------------------------------------------------------- |
|
1362 |
# Search Element functions |
|
1363 |
#------------------------------------------------------------------------------- |
|
1364 |
||
1365 |
def FindBlock(self, event): |
|
1366 |
dc = self.GetLogicalDC() |
|
1367 |
pos = event.GetLogicalPosition(dc) |
|
1368 |
for block in self.Blocks.itervalues(): |
|
1369 |
if block.HitTest(pos) or block.TestHandle(event) != (0, 0): |
|
1370 |
return block |
|
1371 |
return None |
|
1372 |
||
1373 |
def FindWire(self, event): |
|
1374 |
dc = self.GetLogicalDC() |
|
1375 |
pos = event.GetLogicalPosition(dc) |
|
1376 |
for wire in self.Wires: |
|
1377 |
if wire.HitTest(pos) or wire.TestHandle(event) != (0, 0): |
|
1378 |
return wire |
|
1379 |
return None |
|
1380 |
||
1381 |
def FindElement(self, event, exclude_group = False, connectors = True): |
|
1382 |
dc = self.GetLogicalDC() |
|
1383 |
pos = event.GetLogicalPosition(dc) |
|
1384 |
if self.SelectedElement and not (exclude_group and isinstance(self.SelectedElement, Graphic_Group)): |
|
1385 |
if self.SelectedElement.HitTest(pos, connectors) or self.SelectedElement.TestHandle(event) != (0, 0): |
|
1386 |
return self.SelectedElement |
|
1387 |
for element in self.GetElements(): |
|
1388 |
if element.HitTest(pos, connectors) or element.TestHandle(event) != (0, 0): |
|
1389 |
return element |
|
1390 |
return None |
|
1391 |
||
1392 |
def FindBlockConnector(self, pos, direction = None, exclude = None): |
|
1393 |
for block in self.Blocks.itervalues(): |
|
1394 |
result = block.TestConnector(pos, direction, exclude) |
|
1395 |
if result: |
|
1396 |
return result |
|
1397 |
return None |
|
1398 |
||
1399 |
def FindElementById(self, id): |
|
1400 |
block = self.Blocks.get(id, None) |
|
1401 |
if block is not None: |
|
1402 |
return block |
|
1403 |
comment = self.Comments.get(id, None) |
|
1404 |
if comment is not None: |
|
1405 |
return comment |
|
1406 |
return None |
|
1407 |
||
1408 |
def SearchElements(self, bbox): |
|
1409 |
elements = [] |
|
1410 |
for element in self.GetElements(): |
|
1411 |
if element.IsInSelection(bbox): |
|
1412 |
elements.append(element) |
|
1413 |
return elements |
|
1414 |
||
1415 |
def SelectAll(self): |
|
1416 |
if self.SelectedElement is not None: |
|
1417 |
self.SelectedElement.SetSelected(False) |
|
1418 |
self.SelectedElement = Graphic_Group(self) |
|
|
1226
93e7a8abce5e
Fixed lag when selecting all elements using CTRL+A or after paste a lot of blocks
Laurent Bessard
parents:
1225
diff
changeset
|
1419 |
self.SelectedElement.SetElements(self.GetElements()) |
| 814 | 1420 |
self.SelectedElement.SetSelected(True) |
1421 |
||
1422 |
#------------------------------------------------------------------------------- |
|
1423 |
# Popup menu functions |
|
1424 |
#------------------------------------------------------------------------------- |
|
1425 |
||
1426 |
def GetForceVariableMenuFunction(self, iec_path, element): |
|
1427 |
iec_type = self.GetDataType(iec_path) |
|
1428 |
def ForceVariableFunction(event): |
|
1429 |
if iec_type is not None: |
|
1430 |
dialog = ForceVariableDialog(self.ParentWindow, iec_type, str(element.GetValue())) |
|
1431 |
if dialog.ShowModal() == wx.ID_OK: |
|
1432 |
self.ParentWindow.AddDebugVariable(iec_path) |
|
1433 |
self.ForceDataValue(iec_path, dialog.GetValue()) |
|
1434 |
return ForceVariableFunction |
|
1435 |
||
1436 |
def GetReleaseVariableMenuFunction(self, iec_path): |
|
1437 |
def ReleaseVariableFunction(event): |
|
1438 |
self.ReleaseDataValue(iec_path) |
|
1439 |
return ReleaseVariableFunction |
|
1440 |
||
|
857
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1441 |
def GetChangeVariableTypeMenuFunction(self, type): |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1442 |
def ChangeVariableTypeMenu(event): |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1443 |
self.ChangeVariableType(self.SelectedElement, type) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1444 |
return ChangeVariableTypeMenu |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1445 |
|
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1446 |
def GetChangeConnectionTypeMenuFunction(self, type): |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1447 |
def ChangeConnectionTypeMenu(event): |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1448 |
self.ChangeConnectionType(self.SelectedElement, type) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1449 |
return ChangeConnectionTypeMenu |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1450 |
|
| 814 | 1451 |
def PopupForceMenu(self): |
1452 |
iec_path = self.GetElementIECPath(self.SelectedElement) |
|
1453 |
if iec_path is not None: |
|
1454 |
menu = wx.Menu(title='') |
|
1455 |
new_id = wx.NewId() |
|
1456 |
AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Force value"))
|
|
1457 |
self.Bind(wx.EVT_MENU, self.GetForceVariableMenuFunction(iec_path.upper(), self.SelectedElement), id=new_id) |
|
1458 |
new_id = wx.NewId() |
|
1459 |
AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=_("Release value"))
|
|
1460 |
self.Bind(wx.EVT_MENU, self.GetReleaseVariableMenuFunction(iec_path.upper()), id=new_id) |
|
1461 |
if self.SelectedElement.IsForced(): |
|
1462 |
menu.Enable(new_id, True) |
|
1463 |
else: |
|
1464 |
menu.Enable(new_id, False) |
|
1465 |
self.Editor.PopupMenu(menu) |
|
1466 |
menu.Destroy() |
|
1467 |
||
1468 |
def PopupBlockMenu(self, connector = None): |
|
1469 |
menu = wx.Menu(title='') |
|
1470 |
if connector is not None and connector.IsCompatible("BOOL"):
|
|
1471 |
self.AddBlockPinMenuItems(menu, connector) |
|
1472 |
else: |
|
1473 |
edit = self.SelectedElement.GetType() in self.Controler.GetProjectPouNames(self.Debug) |
|
1474 |
self.AddDefaultMenuItems(menu, block=True, edit=edit) |
|
1475 |
self.Editor.PopupMenu(menu) |
|
1476 |
menu.Destroy() |
|
1477 |
||
|
857
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1478 |
def PopupVariableMenu(self): |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1479 |
menu = wx.Menu(title='') |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1480 |
variable_type = self.SelectedElement.GetType() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1481 |
for type_label, type in [(_("Input"), INPUT),
|
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1482 |
(_("Output"), OUTPUT),
|
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1483 |
(_("InOut"), INOUT)]:
|
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1484 |
new_id = wx.NewId() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1485 |
AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_RADIO, text=type_label) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1486 |
self.Bind(wx.EVT_MENU, self.GetChangeVariableTypeMenuFunction(type), id=new_id) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1487 |
if type == variable_type: |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1488 |
menu.Check(new_id, True) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1489 |
menu.AppendSeparator() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1490 |
self.AddDefaultMenuItems(menu, block=True) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1491 |
self.Editor.PopupMenu(menu) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1492 |
menu.Destroy() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1493 |
|
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1494 |
def PopupConnectionMenu(self): |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1495 |
menu = wx.Menu(title='') |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1496 |
connection_type = self.SelectedElement.GetType() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1497 |
for type_label, type in [(_("Connector"), CONNECTOR),
|
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1498 |
(_("Continuation"), CONTINUATION)]:
|
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1499 |
new_id = wx.NewId() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1500 |
AppendMenu(menu, help='', id=new_id, kind=wx.ITEM_RADIO, text=type_label) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1501 |
self.Bind(wx.EVT_MENU, self.GetChangeConnectionTypeMenuFunction(type), id=new_id) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1502 |
if type == connection_type: |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1503 |
menu.Check(new_id, True) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1504 |
menu.AppendSeparator() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1505 |
self.AddDefaultMenuItems(menu, block=True) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1506 |
self.Editor.PopupMenu(menu) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1507 |
menu.Destroy() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
1508 |
|
| 814 | 1509 |
def PopupWireMenu(self, delete=True): |
1510 |
menu = wx.Menu(title='') |
|
|
1263
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1511 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1512 |
# If Check that wire can be replace by connections or abort |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1513 |
connected = self.SelectedElement.GetConnected() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1514 |
start_connector = ( |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1515 |
self.SelectedElement.GetEndConnected() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1516 |
if self.SelectedElement.GetStartConnected() in connected |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1517 |
else self.SelectedElement.GetStartConnected()) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1518 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1519 |
self.AddWireMenuItems(menu, delete, |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1520 |
start_connector.GetDirection() == EAST and |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1521 |
not isinstance(start_connector.GetParentBlock(), SFC_Step)) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1522 |
|
| 814 | 1523 |
menu.AppendSeparator() |
1524 |
self.AddDefaultMenuItems(menu, block=True) |
|
1525 |
self.Editor.PopupMenu(menu) |
|
1526 |
menu.Destroy() |
|
1527 |
||
1528 |
def PopupDivergenceMenu(self, connector): |
|
1529 |
menu = wx.Menu(title='') |
|
1530 |
self.AddDivergenceMenuItems(menu, connector) |
|
1531 |
menu.AppendSeparator() |
|
1532 |
self.AddDefaultMenuItems(menu, block=True) |
|
1533 |
self.Editor.PopupMenu(menu) |
|
1534 |
menu.Destroy() |
|
1535 |
||
1536 |
def PopupGroupMenu(self): |
|
1537 |
menu = wx.Menu(title='') |
|
1538 |
align_menu = wx.Menu(title='') |
|
1539 |
self.AddAlignmentMenuItems(align_menu) |
|
1540 |
menu.AppendMenu(-1, _(u'Alignment'), align_menu) |
|
1541 |
menu.AppendSeparator() |
|
1542 |
self.AddDefaultMenuItems(menu, block=True) |
|
1543 |
self.Editor.PopupMenu(menu) |
|
1544 |
menu.Destroy() |
|
1545 |
||
1546 |
def PopupDefaultMenu(self, block=True): |
|
1547 |
menu = wx.Menu(title='') |
|
1548 |
self.AddDefaultMenuItems(menu, block=block) |
|
1549 |
self.Editor.PopupMenu(menu) |
|
1550 |
menu.Destroy() |
|
1551 |
||
1552 |
#------------------------------------------------------------------------------- |
|
1553 |
# Menu items functions |
|
1554 |
#------------------------------------------------------------------------------- |
|
1555 |
||
1556 |
def OnAlignLeftMenu(self, event): |
|
1557 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
|
1558 |
self.SelectedElement.AlignElements(ALIGN_LEFT, None) |
|
1559 |
self.RefreshBuffer() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1560 |
self.Editor.Refresh(False) |
| 814 | 1561 |
|
1562 |
def OnAlignCenterMenu(self, event): |
|
1563 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
|
1564 |
self.SelectedElement.AlignElements(ALIGN_CENTER, None) |
|
1565 |
self.RefreshBuffer() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1566 |
self.Editor.Refresh(False) |
| 814 | 1567 |
|
1568 |
def OnAlignRightMenu(self, event): |
|
1569 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
|
1570 |
self.SelectedElement.AlignElements(ALIGN_RIGHT, None) |
|
1571 |
self.RefreshBuffer() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1572 |
self.Editor.Refresh(False) |
| 814 | 1573 |
|
1574 |
def OnAlignTopMenu(self, event): |
|
1575 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
|
1576 |
self.SelectedElement.AlignElements(None, ALIGN_TOP) |
|
1577 |
self.RefreshBuffer() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1578 |
self.Editor.Refresh(False) |
| 814 | 1579 |
|
1580 |
def OnAlignMiddleMenu(self, event): |
|
1581 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
|
1582 |
self.SelectedElement.AlignElements(None, ALIGN_MIDDLE) |
|
1583 |
self.RefreshBuffer() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1584 |
self.Editor.Refresh(False) |
| 814 | 1585 |
|
1586 |
def OnAlignBottomMenu(self, event): |
|
1587 |
if self.SelectedElement is not None and isinstance(self.SelectedElement, Graphic_Group): |
|
1588 |
self.SelectedElement.AlignElements(None, ALIGN_BOTTOM) |
|
1589 |
self.RefreshBuffer() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1590 |
self.Editor.Refresh(False) |
| 814 | 1591 |
|
1592 |
def OnNoModifierMenu(self, event): |
|
1593 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
|
1594 |
self.SelectedElement.SetConnectorNegated(False) |
|
1595 |
self.SelectedElement.Refresh() |
|
1596 |
self.RefreshBuffer() |
|
1597 |
||
1598 |
def OnNegatedMenu(self, event): |
|
1599 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
|
1600 |
self.SelectedElement.SetConnectorNegated(True) |
|
1601 |
self.SelectedElement.Refresh() |
|
1602 |
self.RefreshBuffer() |
|
1603 |
||
1604 |
def OnRisingEdgeMenu(self, event): |
|
1605 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
|
1606 |
self.SelectedElement.SetConnectorEdge("rising")
|
|
1607 |
self.SelectedElement.Refresh() |
|
1608 |
self.RefreshBuffer() |
|
1609 |
||
1610 |
def OnFallingEdgeMenu(self, event): |
|
1611 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
|
1612 |
self.SelectedElement.SetConnectorEdge("falling")
|
|
1613 |
self.SelectedElement.Refresh() |
|
1614 |
self.RefreshBuffer() |
|
1615 |
||
1616 |
def OnAddSegmentMenu(self, event): |
|
1617 |
if self.SelectedElement is not None and self.IsWire(self.SelectedElement): |
|
1618 |
self.SelectedElement.AddSegment() |
|
1619 |
self.SelectedElement.Refresh() |
|
1620 |
||
1621 |
def OnDeleteSegmentMenu(self, event): |
|
1622 |
if self.SelectedElement is not None and self.IsWire(self.SelectedElement): |
|
1623 |
self.SelectedElement.DeleteSegment() |
|
1624 |
self.SelectedElement.Refresh() |
|
|
1263
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1625 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1626 |
def OnReplaceWireMenu(self, event): |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1627 |
# Check that selected element is a wire before applying replace |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1628 |
if (self.SelectedElement is not None and |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1629 |
self.IsWire(self.SelectedElement)): |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1630 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1631 |
# Get wire redraw bbox to erase it from screen |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1632 |
wire = self.SelectedElement |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1633 |
redraw_rect = wire.GetRedrawRect() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1634 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1635 |
# Get connector at both ends of wire |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1636 |
connected = wire.GetConnected() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1637 |
if wire.GetStartConnected() in connected: |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1638 |
start_connector = wire.GetEndConnected() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1639 |
end_connector = wire.GetStartConnected() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1640 |
wire.UnConnectStartPoint() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1641 |
point_to_connect = 0 |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1642 |
else: |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1643 |
start_connector = wire.GetStartConnected() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1644 |
end_connector = wire.GetEndConnected() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1645 |
wire.UnConnectEndPoint() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1646 |
point_to_connect = -1 |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1647 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1648 |
# Get a new default connection name |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1649 |
connection_name = self.Controler.GenerateNewName( |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1650 |
self.TagName, None, "Connection%d", 0) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1651 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1652 |
# Create a connector to connect to wire |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1653 |
id = self.GetNewId() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1654 |
connection = FBD_Connector(self, CONNECTOR, connection_name, id) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1655 |
connection.SetSize(*self.GetScaledSize(*connection.GetMinSize())) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1656 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1657 |
# Calculate position of connector at the right of start connector |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1658 |
connector = connection.GetConnectors()["inputs"][0] |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1659 |
rel_pos = connector.GetRelPosition() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1660 |
direction = connector.GetDirection() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1661 |
start_point = start_connector.GetPosition(False) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1662 |
end_point = (start_point[0] + LD_WIRE_SIZE, start_point[1]) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1663 |
connection.SetPosition(end_point[0] - rel_pos[0], |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1664 |
end_point[1] - rel_pos[1]) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1665 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1666 |
# Connect connector to wire |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1667 |
connector.Connect((wire, point_to_connect)) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1668 |
if point_to_connect == 0: |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1669 |
wire.SetPoints([end_point, start_point]) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1670 |
else: |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1671 |
wire.SetPoints([start_point, end_point]) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1672 |
# Update redraw bbox with new wire trace so that it will be redraw |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1673 |
# on screen |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1674 |
redraw_rect.Union(wire.GetRedrawRect()) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1675 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1676 |
# Add connector to Viewer and model |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1677 |
self.AddBlock(connection) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1678 |
self.Controler.AddEditedElementConnection(self.TagName, id, |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1679 |
CONNECTOR) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1680 |
connection.RefreshModel() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1681 |
# Update redraw bbox with new connector bbox so that it will be |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1682 |
# drawn on screen |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1683 |
redraw_rect.Union(connection.GetRedrawRect()) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1684 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1685 |
# Add new continuation |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1686 |
id = self.GetNewId() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1687 |
connection = FBD_Connector(self, CONTINUATION, connection_name, id) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1688 |
connection.SetSize(*self.GetScaledSize(*connection.GetMinSize())) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1689 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1690 |
# Calculate position of connection at the left of end connector |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1691 |
connector = connection.GetConnectors()["outputs"][0] |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1692 |
rel_pos = connector.GetRelPosition() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1693 |
direction = connector.GetDirection() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1694 |
end_point = end_connector.GetPosition(False) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1695 |
start_point = (end_point[0] - LD_WIRE_SIZE, end_point[1]) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1696 |
connection.SetPosition(start_point[0] - rel_pos[0], |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1697 |
start_point[1] - rel_pos[1]) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1698 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1699 |
# Add Wire to Viewer and connect it to blocks |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1700 |
new_wire = Wire(self, |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1701 |
[wx.Point(*start_point), connector.GetDirection()], |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1702 |
[wx.Point(*end_point), end_connector.GetDirection()]) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1703 |
self.AddWire(new_wire) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1704 |
connector.Connect((new_wire, 0), False) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1705 |
end_connector.Connect((new_wire, -1), False) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1706 |
new_wire.ConnectStartPoint(None, connector) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1707 |
new_wire.ConnectEndPoint(None, end_connector) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1708 |
# Update redraw bbox with new wire bbox so that it will be drawn on |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1709 |
# screen |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1710 |
redraw_rect.Union(new_wire.GetRedrawRect()) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1711 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1712 |
# Add connection to Viewer and model |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1713 |
self.AddBlock(connection) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1714 |
self.Controler.AddEditedElementConnection(self.TagName, id, |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1715 |
CONTINUATION) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1716 |
connection.RefreshModel() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1717 |
# Update redraw bbox with new connection bbox so that it will be |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1718 |
# drawn on screen |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1719 |
redraw_rect.Union(connection.GetRedrawRect()) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1720 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1721 |
# Refresh model for new wire |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1722 |
end_connector.RefreshParentBlock() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1723 |
|
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1724 |
# Redraw |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1725 |
self.RefreshBuffer() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1726 |
self.RefreshScrollBars() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1727 |
self.RefreshVisibleElements() |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1728 |
self.RefreshRect(self.GetScrolledRect(redraw_rect), False) |
|
895605ccac70
Added support for replacing a wire by two connections
Laurent Bessard
parents:
1260
diff
changeset
|
1729 |
|
| 814 | 1730 |
def OnAddBranchMenu(self, event): |
1731 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
|
1732 |
self.AddDivergenceBranch(self.SelectedElement) |
|
1733 |
||
1734 |
def OnDeleteBranchMenu(self, event): |
|
1735 |
if self.SelectedElement is not None and self.IsBlock(self.SelectedElement): |
|
1736 |
self.RemoveDivergenceBranch(self.SelectedElement) |
|
1737 |
||
1738 |
def OnEditBlockMenu(self, event): |
|
1739 |
if self.SelectedElement is not None: |
|
1740 |
self.ParentWindow.EditProjectElement(ITEM_POU, "P::%s"%self.SelectedElement.GetType()) |
|
1741 |
||
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
1742 |
def OnAdjustBlockSizeMenu(self, event): |
|
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
1743 |
if self.SelectedElement is not None: |
|
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
1744 |
movex, movey = self.SelectedElement.SetBestSize(self.Scaling) |
|
872
6aadbde5f41e
Fix bug when adjusting block size, block informations was not saved when using control + shift + double click
Laurent Bessard
parents:
857
diff
changeset
|
1745 |
self.SelectedElement.RefreshModel(True) |
|
6aadbde5f41e
Fix bug when adjusting block size, block informations was not saved when using control + shift + double click
Laurent Bessard
parents:
857
diff
changeset
|
1746 |
self.RefreshBuffer() |
|
6aadbde5f41e
Fix bug when adjusting block size, block informations was not saved when using control + shift + double click
Laurent Bessard
parents:
857
diff
changeset
|
1747 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
1748 |
|
| 814 | 1749 |
def OnDeleteMenu(self, event): |
1750 |
if self.SelectedElement is not None: |
|
1751 |
self.SelectedElement.Delete() |
|
1752 |
self.SelectedElement = None |
|
1753 |
self.RefreshBuffer() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
1754 |
self.Editor.Refresh(False) |
| 814 | 1755 |
|
1756 |
def OnClearExecutionOrderMenu(self, event): |
|
1757 |
self.Controler.ClearEditedElementExecutionOrder(self.TagName) |
|
1758 |
self.RefreshBuffer() |
|
1759 |
self.RefreshView() |
|
1760 |
||
1761 |
def OnResetExecutionOrderMenu(self, event): |
|
1762 |
self.Controler.ResetEditedElementExecutionOrder(self.TagName) |
|
1763 |
self.RefreshBuffer() |
|
1764 |
self.RefreshView() |
|
1765 |
||
1766 |
def GetAddMenuCallBack(self, func, *args): |
|
1767 |
def AddMenuCallBack(event): |
|
1768 |
wx.CallAfter(func, self.rubberBand.GetCurrentExtent(), *args) |
|
1769 |
return AddMenuCallBack |
|
1770 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1771 |
def GetAddToWireMenuCallBack(self, func, *args): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1772 |
args += (self.SelectedElement,) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1773 |
def AddToWireMenuCallBack(event): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1774 |
func(wx.Rect(0, 0, 0, 0), *args) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1775 |
return AddToWireMenuCallBack |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1776 |
|
| 814 | 1777 |
def GetClipboardCallBack(self, func): |
1778 |
def ClipboardCallback(event): |
|
1779 |
wx.CallAfter(func) |
|
1780 |
return ClipboardCallback |
|
1781 |
||
1782 |
#------------------------------------------------------------------------------- |
|
1783 |
# Mouse event functions |
|
1784 |
#------------------------------------------------------------------------------- |
|
1785 |
||
1786 |
def OnViewerMouseEvent(self, event): |
|
| 1224 | 1787 |
self.ResetBuffer() |
| 1228 | 1788 |
if event.Leaving() and self.ToolTipElement is not None: |
| 1224 | 1789 |
self.ToolTipElement.DestroyToolTip() |
| 1228 | 1790 |
elif (not event.Entering() and |
| 1224 | 1791 |
gettime() - self.LastToolTipCheckTime > REFRESH_PERIOD): |
1792 |
self.LastToolTipCheckTime = gettime() |
|
| 814 | 1793 |
element = None |
1794 |
if not event.Leaving() and not event.LeftUp() and not event.LeftDClick(): |
|
|
1170
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
1795 |
dc = self.GetLogicalDC() |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
1796 |
pos = event.GetLogicalPosition(dc) |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
1797 |
element = self.FindBlockConnector(pos) |
| 1224 | 1798 |
if element is None or len(element.GetWires()) > 0: |
|
1170
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
1799 |
element = self.FindElement(event, True, False) |
| 1228 | 1800 |
if self.ToolTipElement is not None: |
1801 |
self.ToolTipElement.DestroyToolTip() |
|
| 814 | 1802 |
self.ToolTipElement = element |
1803 |
if self.ToolTipElement is not None: |
|
1804 |
tooltip_pos = self.Editor.ClientToScreen(event.GetPosition()) |
|
1805 |
tooltip_pos.x += 10 |
|
1806 |
tooltip_pos.y += 10 |
|
|
1170
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
1807 |
self.ToolTipElement.DisplayToolTip(tooltip_pos) |
| 814 | 1808 |
event.Skip() |
1809 |
||
1810 |
def OnViewerLeftDown(self, event): |
|
1811 |
self.Editor.CaptureMouse() |
|
|
1273
921858d68a13
Fix refresh bug when scrolling Viewer while dragging graphic element or rubberband
Laurent Bessard
parents:
1263
diff
changeset
|
1812 |
self.StartMousePos = event.GetPosition() |
| 814 | 1813 |
if self.Mode == MODE_SELECTION: |
1814 |
dc = self.GetLogicalDC() |
|
1815 |
pos = event.GetLogicalPosition(dc) |
|
1816 |
if event.ShiftDown() and not event.ControlDown() and self.SelectedElement is not None: |
|
1817 |
element = self.FindElement(event, True) |
|
1818 |
if element is not None: |
|
1819 |
if isinstance(self.SelectedElement, Graphic_Group): |
|
1820 |
self.SelectedElement.SetSelected(False) |
|
1821 |
self.SelectedElement.SelectElement(element) |
|
1822 |
elif self.SelectedElement is not None: |
|
1823 |
group = Graphic_Group(self) |
|
1824 |
group.SelectElement(self.SelectedElement) |
|
1825 |
group.SelectElement(element) |
|
1826 |
self.SelectedElement = group |
|
1827 |
elements = self.SelectedElement.GetElements() |
|
1828 |
if len(elements) == 0: |
|
1829 |
self.SelectedElement = element |
|
1830 |
elif len(elements) == 1: |
|
1831 |
self.SelectedElement = elements[0] |
|
1832 |
self.SelectedElement.SetSelected(True) |
|
1833 |
else: |
|
1834 |
self.rubberBand.Reset() |
|
1835 |
self.rubberBand.OnLeftDown(event, dc, self.Scaling) |
|
1836 |
else: |
|
1837 |
element = self.FindElement(event) |
|
1838 |
if not self.Debug and (element is None or element.TestHandle(event) == (0, 0)): |
|
1839 |
connector = self.FindBlockConnector(pos) |
|
1840 |
else: |
|
1841 |
connector = None |
|
1842 |
if not self.Debug and self.DrawingWire: |
|
1843 |
self.DrawingWire = False |
|
1844 |
if self.SelectedElement is not None: |
|
1845 |
if element is None or element.TestHandle(event) == (0, 0): |
|
1846 |
connector = self.FindBlockConnector(pos, self.SelectedElement.GetConnectionDirection()) |
|
1847 |
if connector is not None: |
|
1848 |
event.Dragging = lambda : True |
|
1849 |
self.SelectedElement.OnMotion(event, dc, self.Scaling) |
|
1850 |
if self.SelectedElement.EndConnected is not None: |
|
1851 |
self.SelectedElement.ResetPoints() |
|
1852 |
self.SelectedElement.GeneratePoints() |
|
1853 |
self.SelectedElement.RefreshModel() |
|
1854 |
self.SelectedElement.SetSelected(True) |
|
1855 |
element = self.SelectedElement |
|
1856 |
self.RefreshBuffer() |
|
1857 |
else: |
|
1858 |
rect = self.SelectedElement.GetRedrawRect() |
|
1859 |
self.SelectedElement.Delete() |
|
1860 |
self.SelectedElement = None |
|
1861 |
element = None |
|
1862 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
|
1863 |
elif not self.Debug and connector is not None and not event.ControlDown(): |
|
1864 |
self.DrawingWire = True |
|
1865 |
scaled_pos = GetScaledEventPosition(event, dc, self.Scaling) |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1866 |
directions = {
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1867 |
EAST: [EAST, WEST], |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1868 |
WEST: [WEST, EAST], |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1869 |
NORTH: [NORTH, SOUTH], |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1870 |
SOUTH: [SOUTH, NORTH]}[connector.GetDirection()] |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1871 |
wire = Wire(self, *map(list, zip( |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1872 |
[wx.Point(pos.x, pos.y), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1873 |
wx.Point(scaled_pos.x, scaled_pos.y)], |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1874 |
directions))) |
| 814 | 1875 |
wire.oldPos = scaled_pos |
1876 |
wire.Handle = (HANDLE_POINT, 0) |
|
1877 |
wire.ProcessDragging(0, 0, event, None) |
|
1878 |
wire.Handle = (HANDLE_POINT, 1) |
|
1879 |
self.AddWire(wire) |
|
1880 |
if self.SelectedElement is not None: |
|
1881 |
self.SelectedElement.SetSelected(False) |
|
1882 |
self.SelectedElement = wire |
|
1883 |
if self.HighlightedElement is not None: |
|
1884 |
self.HighlightedElement.SetHighlighted(False) |
|
1885 |
self.HighlightedElement = wire |
|
1886 |
self.RefreshVisibleElements() |
|
1887 |
self.SelectedElement.SetHighlighted(True) |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1888 |
self.SelectedElement.StartConnected.HighlightParentBlock(True) |
| 814 | 1889 |
else: |
1890 |
if self.SelectedElement is not None and self.SelectedElement != element: |
|
1891 |
self.SelectedElement.SetSelected(False) |
|
1892 |
self.SelectedElement = None |
|
1893 |
if element is not None: |
|
1894 |
self.SelectedElement = element |
|
1895 |
if self.Debug: |
|
1896 |
Graphic_Element.OnLeftDown(self.SelectedElement, event, dc, self.Scaling) |
|
1897 |
else: |
|
1898 |
self.SelectedElement.OnLeftDown(event, dc, self.Scaling) |
|
1899 |
self.SelectedElement.Refresh() |
|
1900 |
else: |
|
1901 |
self.rubberBand.Reset() |
|
1902 |
self.rubberBand.OnLeftDown(event, dc, self.Scaling) |
|
1903 |
elif self.Mode in [MODE_BLOCK, MODE_VARIABLE, MODE_CONNECTION, MODE_COMMENT, |
|
1904 |
MODE_CONTACT, MODE_COIL, MODE_POWERRAIL, MODE_INITIALSTEP, |
|
1905 |
MODE_STEP, MODE_TRANSITION, MODE_DIVERGENCE, MODE_JUMP, MODE_ACTION]: |
|
1906 |
self.rubberBand.Reset() |
|
1907 |
self.rubberBand.OnLeftDown(event, self.GetLogicalDC(), self.Scaling) |
|
1908 |
elif self.Mode == MODE_MOTION: |
|
1909 |
self.StartScreenPos = self.GetScrollPos(wx.HORIZONTAL), self.GetScrollPos(wx.VERTICAL) |
|
1910 |
event.Skip() |
|
1911 |
||
1912 |
def OnViewerLeftUp(self, event): |
|
1913 |
self.StartMousePos = None |
|
1914 |
if self.rubberBand.IsShown(): |
|
1915 |
if self.Mode == MODE_SELECTION: |
|
1916 |
new_elements = self.SearchElements(self.rubberBand.GetCurrentExtent()) |
|
1917 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
1918 |
if event.ShiftDown() and self.SelectedElement is not None: |
|
1919 |
if isinstance(self.SelectedElement, Graphic_Group): |
|
1920 |
elements = self.SelectedElement.GetElements() |
|
1921 |
else: |
|
1922 |
elements = [self.SelectedElement] |
|
1923 |
for element in elements: |
|
1924 |
if element not in new_elements: |
|
1925 |
new_elements.append(element) |
|
1926 |
if len(new_elements) == 1: |
|
1927 |
self.SelectedElement = new_elements[0] |
|
1928 |
self.SelectedElement.SetSelected(True) |
|
1929 |
elif len(new_elements) > 1: |
|
1930 |
self.SelectedElement = Graphic_Group(self) |
|
1931 |
self.SelectedElement.SetElements(new_elements) |
|
1932 |
self.SelectedElement.SetSelected(True) |
|
1933 |
else: |
|
1934 |
bbox = self.rubberBand.GetCurrentExtent() |
|
1935 |
self.rubberBand.OnLeftUp(event, self.GetLogicalDC(), self.Scaling) |
|
1936 |
if self.Mode == MODE_BLOCK: |
|
1937 |
wx.CallAfter(self.AddNewBlock, bbox) |
|
1938 |
elif self.Mode == MODE_VARIABLE: |
|
1939 |
wx.CallAfter(self.AddNewVariable, bbox) |
|
1940 |
elif self.Mode == MODE_CONNECTION: |
|
1941 |
wx.CallAfter(self.AddNewConnection, bbox) |
|
1942 |
elif self.Mode == MODE_COMMENT: |
|
1943 |
wx.CallAfter(self.AddNewComment, bbox) |
|
1944 |
elif self.Mode == MODE_CONTACT: |
|
1945 |
wx.CallAfter(self.AddNewContact, bbox) |
|
1946 |
elif self.Mode == MODE_COIL: |
|
1947 |
wx.CallAfter(self.AddNewCoil, bbox) |
|
1948 |
elif self.Mode == MODE_POWERRAIL: |
|
1949 |
wx.CallAfter(self.AddNewPowerRail, bbox) |
|
1950 |
elif self.Mode == MODE_INITIALSTEP: |
|
1951 |
wx.CallAfter(self.AddNewStep, bbox, True) |
|
1952 |
elif self.Mode == MODE_STEP: |
|
1953 |
wx.CallAfter(self.AddNewStep, bbox, False) |
|
1954 |
elif self.Mode == MODE_TRANSITION: |
|
1955 |
wx.CallAfter(self.AddNewTransition, bbox) |
|
1956 |
elif self.Mode == MODE_DIVERGENCE: |
|
1957 |
wx.CallAfter(self.AddNewDivergence, bbox) |
|
1958 |
elif self.Mode == MODE_JUMP: |
|
1959 |
wx.CallAfter(self.AddNewJump, bbox) |
|
1960 |
elif self.Mode == MODE_ACTION: |
|
1961 |
wx.CallAfter(self.AddNewActionBlock, bbox) |
|
1962 |
elif self.Mode == MODE_SELECTION and self.SelectedElement is not None: |
|
1963 |
dc = self.GetLogicalDC() |
|
1964 |
if not self.Debug and self.DrawingWire: |
|
1965 |
pos = event.GetLogicalPosition(dc) |
|
1966 |
connector = self.FindBlockConnector(pos, self.SelectedElement.GetConnectionDirection()) |
|
1967 |
if self.SelectedElement.EndConnected is not None: |
|
1968 |
self.DrawingWire = False |
|
1969 |
self.SelectedElement.StartConnected.HighlightParentBlock(False) |
|
1970 |
self.SelectedElement.EndConnected.HighlightParentBlock(False) |
|
1971 |
self.SelectedElement.ResetPoints() |
|
1972 |
self.SelectedElement.OnMotion(event, dc, self.Scaling) |
|
1973 |
self.SelectedElement.GeneratePoints() |
|
1974 |
self.SelectedElement.RefreshModel() |
|
1975 |
self.SelectedElement.SetSelected(True) |
|
1976 |
self.SelectedElement.HighlightPoint(pos) |
|
1977 |
self.RefreshBuffer() |
|
1978 |
elif connector is None or self.SelectedElement.GetDragging(): |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1979 |
start_connector = self.SelectedElement.GetStartConnected() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1980 |
start_direction = start_connector.GetDirection() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1981 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1982 |
items = [] |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1983 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1984 |
if self.CurrentLanguage == "SFC" and start_direction == SOUTH: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1985 |
items.extend([ |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1986 |
(_(u'Initial Step'), self.GetAddToWireMenuCallBack(self.AddNewStep, True)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1987 |
(_(u'Step'), self.GetAddToWireMenuCallBack(self.AddNewStep, False)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1988 |
(_(u'Transition'), self.GetAddToWireMenuCallBack(self.AddNewTransition, False)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1989 |
(_(u'Divergence'), self.GetAddToWireMenuCallBack(self.AddNewDivergence)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1990 |
(_(u'Jump'), self.GetAddToWireMenuCallBack(self.AddNewJump)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1991 |
]) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1992 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1993 |
elif start_direction == EAST: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1994 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1995 |
if isinstance(start_connector.GetParentBlock(), SFC_Step): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1996 |
items.append( |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1997 |
(_(u'Action Block'), self.GetAddToWireMenuCallBack(self.AddNewActionBlock)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1998 |
) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
1999 |
else: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2000 |
items.extend([ |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2001 |
(_(u'Block'), self.GetAddToWireMenuCallBack(self.AddNewBlock)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2002 |
(_(u'Variable'), self.GetAddToWireMenuCallBack(self.AddNewVariable, True)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2003 |
(_(u'Connection'), self.GetAddToWireMenuCallBack(self.AddNewConnection)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2004 |
]) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2005 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2006 |
if self.CurrentLanguage != "FBD": |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2007 |
items.append( |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2008 |
(_(u'Contact'), self.GetAddToWireMenuCallBack(self.AddNewContact)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2009 |
) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2010 |
if self.CurrentLanguage == "LD": |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2011 |
items.extend([ |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2012 |
(_(u'Coil'), self.GetAddToWireMenuCallBack(self.AddNewCoil)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2013 |
(_(u'Power Rail'), self.GetAddToWireMenuCallBack(self.AddNewPowerRail)), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2014 |
]) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2015 |
if self.CurrentLanguage == "SFC": |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2016 |
items.append( |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2017 |
(_(u'Transition'), self.GetAddToWireMenuCallBack(self.AddNewTransition, True)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2018 |
) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2019 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2020 |
if len(items) > 0: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2021 |
if self.Editor.HasCapture(): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2022 |
self.Editor.ReleaseMouse() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2023 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2024 |
# Popup contextual menu |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2025 |
menu = wx.Menu() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2026 |
self.AddMenuItems(menu, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2027 |
[(wx.NewId(), wx.ITEM_NORMAL, text, '', callback) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2028 |
for text, callback in items]) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2029 |
self.PopupMenu(menu) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2030 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2031 |
self.SelectedElement.StartConnected.HighlightParentBlock(False) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2032 |
if self.DrawingWire: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2033 |
self.DrawingWire = False |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2034 |
rect = self.SelectedElement.GetRedrawRect() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2035 |
wire = self.SelectedElement |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2036 |
self.SelectedElement = self.SelectedElement.StartConnected.GetParentBlock() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2037 |
self.SelectedElement.SetSelected(True) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2038 |
rect.Union(self.SelectedElement.GetRedrawRect()) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2039 |
wire.Delete() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2040 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2041 |
else: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2042 |
self.SelectedElement.SetSelected(True) |
|
1260
11903e79ce66
Fixed bug when adding block into Viewer and added wire validity after adding block with wire drop support
Laurent Bessard
parents:
1259
diff
changeset
|
2043 |
if not self.SelectedElement.IsConnectedCompatible(): |
|
11903e79ce66
Fixed bug when adding block into Viewer and added wire validity after adding block with wire drop support
Laurent Bessard
parents:
1259
diff
changeset
|
2044 |
self.SelectedElement.SetValid(False) |
| 814 | 2045 |
else: |
2046 |
if self.Debug: |
|
2047 |
Graphic_Element.OnLeftUp(self.SelectedElement, event, dc, self.Scaling) |
|
2048 |
else: |
|
2049 |
self.SelectedElement.OnLeftUp(event, dc, self.Scaling) |
|
2050 |
wx.CallAfter(self.SetCurrentCursor, 0) |
|
2051 |
elif self.Mode == MODE_MOTION: |
|
2052 |
self.StartScreenPos = None |
|
2053 |
if self.Mode != MODE_SELECTION and not self.SavedMode: |
|
2054 |
wx.CallAfter(self.ParentWindow.ResetCurrentMode) |
|
2055 |
if self.Editor.HasCapture(): |
|
2056 |
self.Editor.ReleaseMouse() |
|
2057 |
event.Skip() |
|
2058 |
||
2059 |
def OnViewerMiddleDown(self, event): |
|
2060 |
self.Editor.CaptureMouse() |
|
2061 |
self.StartMousePos = event.GetPosition() |
|
2062 |
self.StartScreenPos = self.GetScrollPos(wx.HORIZONTAL), self.GetScrollPos(wx.VERTICAL) |
|
2063 |
event.Skip() |
|
2064 |
||
2065 |
def OnViewerMiddleUp(self, event): |
|
2066 |
self.StartMousePos = None |
|
2067 |
self.StartScreenPos = None |
|
2068 |
if self.Editor.HasCapture(): |
|
2069 |
self.Editor.ReleaseMouse() |
|
2070 |
event.Skip() |
|
2071 |
||
2072 |
def OnViewerRightDown(self, event): |
|
2073 |
self.Editor.CaptureMouse() |
|
2074 |
if self.Mode == MODE_SELECTION: |
|
2075 |
element = self.FindElement(event) |
|
2076 |
if self.SelectedElement is not None and self.SelectedElement != element: |
|
2077 |
self.SelectedElement.SetSelected(False) |
|
2078 |
self.SelectedElement = None |
|
2079 |
if element is not None: |
|
2080 |
self.SelectedElement = element |
|
2081 |
if self.Debug: |
|
2082 |
Graphic_Element.OnRightDown(self.SelectedElement, event, self.GetLogicalDC(), self.Scaling) |
|
2083 |
else: |
|
2084 |
self.SelectedElement.OnRightDown(event, self.GetLogicalDC(), self.Scaling) |
|
2085 |
self.SelectedElement.Refresh() |
|
2086 |
event.Skip() |
|
2087 |
||
2088 |
def OnViewerRightUp(self, event): |
|
2089 |
dc = self.GetLogicalDC() |
|
2090 |
self.rubberBand.Reset() |
|
2091 |
self.rubberBand.OnLeftDown(event, dc, self.Scaling) |
|
2092 |
self.rubberBand.OnLeftUp(event, dc, self.Scaling) |
|
2093 |
if self.SelectedElement is not None: |
|
2094 |
if self.Debug: |
|
2095 |
Graphic_Element.OnRightUp(self.SelectedElement, event, self.GetLogicalDC(), self.Scaling) |
|
2096 |
else: |
|
2097 |
self.SelectedElement.OnRightUp(event, self.GetLogicalDC(), self.Scaling) |
|
2098 |
wx.CallAfter(self.SetCurrentCursor, 0) |
|
2099 |
elif not self.Debug: |
|
2100 |
self.PopupDefaultMenu(False) |
|
2101 |
if self.Editor.HasCapture(): |
|
2102 |
self.Editor.ReleaseMouse() |
|
2103 |
event.Skip() |
|
2104 |
||
2105 |
def OnViewerLeftDClick(self, event): |
|
|
1170
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2106 |
element = self.FindElement(event) |
| 814 | 2107 |
if self.Mode == MODE_SELECTION and element is not None: |
2108 |
if self.SelectedElement is not None and self.SelectedElement != element: |
|
2109 |
self.SelectedElement.SetSelected(False) |
|
2110 |
if self.HighlightedElement is not None and self.HighlightedElement != element: |
|
2111 |
self.HighlightedElement.SetHighlighted(False) |
|
2112 |
||
2113 |
self.SelectedElement = element |
|
2114 |
self.HighlightedElement = element |
|
2115 |
self.SelectedElement.SetHighlighted(True) |
|
2116 |
||
2117 |
if self.Debug: |
|
|
820
d981fe154c36
Fix bug when Dclick on step and actionBlock in debug mode
laurent
parents:
814
diff
changeset
|
2118 |
if isinstance(self.SelectedElement, FBD_Block): |
|
1170
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2119 |
dc = self.GetLogicalDC() |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2120 |
pos = event.GetLogicalPosition(dc) |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2121 |
connector = self.SelectedElement.TestConnector(pos, EAST) |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2122 |
if connector is not None and len(connector.GetWires()) == 0: |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2123 |
iec_path = self.GetElementIECPath(connector) |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2124 |
if iec_path is not None: |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2125 |
self.ParentWindow.OpenDebugViewer( |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2126 |
ITEM_VAR_LOCAL, iec_path, connector.GetType()) |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2127 |
else: |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2128 |
instance_type = self.SelectedElement.GetType() |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2129 |
pou_type = {
|
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2130 |
"program": ITEM_PROGRAM, |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2131 |
"functionBlock": ITEM_FUNCTIONBLOCK, |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2132 |
}.get(self.Controler.GetPouType(instance_type)) |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2133 |
if pou_type is not None and instance_type in self.Controler.GetProjectPouNames(self.Debug): |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2134 |
self.ParentWindow.OpenDebugViewer(pou_type, |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2135 |
"%s.%s"%(self.GetInstancePath(True), self.SelectedElement.GetName()), |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2136 |
self.Controler.ComputePouName(instance_type)) |
| 814 | 2137 |
else: |
2138 |
iec_path = self.GetElementIECPath(self.SelectedElement) |
|
2139 |
if iec_path is not None: |
|
2140 |
if isinstance(self.SelectedElement, Wire): |
|
2141 |
if self.SelectedElement.EndConnected is not None: |
|
|
885
fc91d3718b74
Fix bug multiple graph viewer tab displaying values of the same variable can be opened
Laurent Bessard
parents:
882
diff
changeset
|
2142 |
self.ParentWindow.OpenDebugViewer(ITEM_VAR_LOCAL, iec_path, |
|
fc91d3718b74
Fix bug multiple graph viewer tab displaying values of the same variable can be opened
Laurent Bessard
parents:
882
diff
changeset
|
2143 |
self.SelectedElement.EndConnected.GetType()) |
| 814 | 2144 |
else: |
|
885
fc91d3718b74
Fix bug multiple graph viewer tab displaying values of the same variable can be opened
Laurent Bessard
parents:
882
diff
changeset
|
2145 |
self.ParentWindow.OpenDebugViewer(ITEM_VAR_LOCAL, iec_path, "BOOL") |
| 814 | 2146 |
elif event.ControlDown() and not event.ShiftDown(): |
|
857
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2147 |
if not isinstance(self.SelectedElement, Graphic_Group): |
|
882
3c6ce0a5ab2c
Fix bug when double click while pressing CTRL on other elements than blocks
Laurent Bessard
parents:
872
diff
changeset
|
2148 |
if isinstance(self.SelectedElement, FBD_Block): |
|
3c6ce0a5ab2c
Fix bug when double click while pressing CTRL on other elements than blocks
Laurent Bessard
parents:
872
diff
changeset
|
2149 |
instance_type = self.SelectedElement.GetType() |
|
3c6ce0a5ab2c
Fix bug when double click while pressing CTRL on other elements than blocks
Laurent Bessard
parents:
872
diff
changeset
|
2150 |
else: |
|
3c6ce0a5ab2c
Fix bug when double click while pressing CTRL on other elements than blocks
Laurent Bessard
parents:
872
diff
changeset
|
2151 |
instance_type = None |
|
3c6ce0a5ab2c
Fix bug when double click while pressing CTRL on other elements than blocks
Laurent Bessard
parents:
872
diff
changeset
|
2152 |
if instance_type in self.Controler.GetProjectPouNames(self.Debug): |
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
2153 |
self.ParentWindow.EditProjectElement(ITEM_POU, |
|
882
3c6ce0a5ab2c
Fix bug when double click while pressing CTRL on other elements than blocks
Laurent Bessard
parents:
872
diff
changeset
|
2154 |
self.Controler.ComputePouName(instance_type)) |
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
2155 |
else: |
|
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
2156 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
| 814 | 2157 |
elif event.ControlDown() and event.ShiftDown(): |
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
2158 |
movex, movey = self.SelectedElement.SetBestSize(self.Scaling) |
|
872
6aadbde5f41e
Fix bug when adjusting block size, block informations was not saved when using control + shift + double click
Laurent Bessard
parents:
857
diff
changeset
|
2159 |
self.SelectedElement.RefreshModel() |
|
6aadbde5f41e
Fix bug when adjusting block size, block informations was not saved when using control + shift + double click
Laurent Bessard
parents:
857
diff
changeset
|
2160 |
self.RefreshBuffer() |
|
6aadbde5f41e
Fix bug when adjusting block size, block informations was not saved when using control + shift + double click
Laurent Bessard
parents:
857
diff
changeset
|
2161 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
| 814 | 2162 |
else: |
2163 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
|
2164 |
event.Skip() |
|
2165 |
||
2166 |
def OnViewerMotion(self, event): |
|
2167 |
if self.Editor.HasCapture() and not event.Dragging(): |
|
2168 |
return |
|
2169 |
refresh = False |
|
2170 |
dc = self.GetLogicalDC() |
|
2171 |
pos = GetScaledEventPosition(event, dc, self.Scaling) |
|
2172 |
if event.MiddleIsDown() or self.Mode == MODE_MOTION: |
|
2173 |
if self.StartMousePos is not None and self.StartScreenPos is not None: |
|
2174 |
new_pos = event.GetPosition() |
|
2175 |
xmax = self.GetScrollRange(wx.HORIZONTAL) - self.GetScrollThumb(wx.HORIZONTAL) |
|
2176 |
ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL) |
|
2177 |
scrollx = max(0, self.StartScreenPos[0] - (new_pos[0] - self.StartMousePos[0]) / SCROLLBAR_UNIT) |
|
2178 |
scrolly = max(0, self.StartScreenPos[1] - (new_pos[1] - self.StartMousePos[1]) / SCROLLBAR_UNIT) |
|
2179 |
if scrollx > xmax or scrolly > ymax: |
|
2180 |
self.RefreshScrollBars(max(0, scrollx - xmax), max(0, scrolly - ymax)) |
|
2181 |
self.Scroll(scrollx, scrolly) |
|
2182 |
else: |
|
2183 |
self.Scroll(scrollx, scrolly) |
|
2184 |
self.RefreshScrollBars() |
|
2185 |
self.RefreshVisibleElements() |
|
2186 |
else: |
|
| 1224 | 2187 |
if (not event.Dragging() and |
2188 |
gettime() - self.LastHighlightCheckTime > REFRESH_PERIOD): |
|
2189 |
self.LastHighlightCheckTime = gettime() |
|
| 814 | 2190 |
highlighted = self.FindElement(event, connectors=False) |
2191 |
if self.HighlightedElement is not None and self.HighlightedElement != highlighted: |
|
2192 |
self.HighlightedElement.SetHighlighted(False) |
|
2193 |
self.HighlightedElement = None |
|
2194 |
if highlighted is not None: |
|
|
1225
ed8a89171a6c
Fixed removing display of wire point in debug Viewer
Laurent Bessard
parents:
1224
diff
changeset
|
2195 |
if not self.Debug and isinstance(highlighted, (Wire, Graphic_Group)): |
| 814 | 2196 |
highlighted.HighlightPoint(pos) |
2197 |
if self.HighlightedElement != highlighted: |
|
2198 |
highlighted.SetHighlighted(True) |
|
2199 |
self.HighlightedElement = highlighted |
|
2200 |
if self.rubberBand.IsShown(): |
|
2201 |
self.rubberBand.OnMotion(event, dc, self.Scaling) |
|
2202 |
elif not self.Debug and self.Mode == MODE_SELECTION and self.SelectedElement is not None: |
|
2203 |
if self.DrawingWire: |
|
2204 |
connector = self.FindBlockConnector(pos, self.SelectedElement.GetConnectionDirection(), self.SelectedElement.EndConnected) |
|
2205 |
if not connector or self.SelectedElement.EndConnected == None: |
|
2206 |
self.SelectedElement.ResetPoints() |
|
2207 |
movex, movey = self.SelectedElement.OnMotion(event, dc, self.Scaling) |
|
2208 |
self.SelectedElement.GeneratePoints() |
|
2209 |
if movex != 0 or movey != 0: |
|
2210 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
|
|
1225
ed8a89171a6c
Fixed removing display of wire point in debug Viewer
Laurent Bessard
parents:
1224
diff
changeset
|
2211 |
elif not self.Debug: |
| 814 | 2212 |
self.SelectedElement.HighlightPoint(pos) |
2213 |
else: |
|
2214 |
movex, movey = self.SelectedElement.OnMotion(event, dc, self.Scaling) |
|
2215 |
if movex != 0 or movey != 0: |
|
2216 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
|
|
1069
880ec628d490
Fixed refresh bugs when drag'n dropping of group of elements
Laurent Bessard
parents:
1057
diff
changeset
|
2217 |
self.RefreshVisibleElements() |
| 814 | 2218 |
elif self.Debug and self.StartMousePos is not None and event.Dragging(): |
2219 |
pos = event.GetPosition() |
|
2220 |
if abs(self.StartMousePos.x - pos.x) > 5 or abs(self.StartMousePos.y - pos.y) > 5: |
|
|
1170
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2221 |
element = self.SelectedElement |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2222 |
if isinstance(self.SelectedElement, FBD_Block): |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2223 |
dc = self.GetLogicalDC() |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2224 |
connector = self.SelectedElement.TestConnector( |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2225 |
wx.Point(dc.DeviceToLogicalX(self.StartMousePos.x), |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2226 |
dc.DeviceToLogicalY(self.StartMousePos.y))) |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2227 |
if connector is not None: |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2228 |
element = connector |
|
074e46cdedbc
Added support for displaying ToolTip, starting drag'n drop and Double click on Block connectors when debugging
Laurent Bessard
parents:
1166
diff
changeset
|
2229 |
iec_path = self.GetElementIECPath(element) |
| 814 | 2230 |
if iec_path is not None: |
2231 |
self.StartMousePos = None |
|
2232 |
if self.HighlightedElement is not None: |
|
2233 |
self.HighlightedElement.SetHighlighted(False) |
|
2234 |
self.HighlightedElement = None |
|
2235 |
data = wx.TextDataObject(str((iec_path, "debug"))) |
|
2236 |
dragSource = wx.DropSource(self.Editor) |
|
2237 |
dragSource.SetData(data) |
|
2238 |
dragSource.DoDragDrop() |
|
|
908
50a8192fbb23
Fixed bug with mouse capture not released in graphic Viewers in debug mode when drag'n dropping wire variable to DebugVariablePanel
Laurent Bessard
parents:
896
diff
changeset
|
2239 |
if self.Editor.HasCapture(): |
|
50a8192fbb23
Fixed bug with mouse capture not released in graphic Viewers in debug mode when drag'n dropping wire variable to DebugVariablePanel
Laurent Bessard
parents:
896
diff
changeset
|
2240 |
self.Editor.ReleaseMouse() |
|
50a8192fbb23
Fixed bug with mouse capture not released in graphic Viewers in debug mode when drag'n dropping wire variable to DebugVariablePanel
Laurent Bessard
parents:
896
diff
changeset
|
2241 |
wx.CallAfter(self.SetCurrentCursor, 0) |
| 814 | 2242 |
self.UpdateScrollPos(event) |
2243 |
event.Skip() |
|
2244 |
||
2245 |
def OnLeaveViewer(self, event): |
|
2246 |
if self.SelectedElement is not None and self.SelectedElement.GetDragging(): |
|
2247 |
event.Skip() |
|
2248 |
elif self.HighlightedElement is not None: |
|
2249 |
self.HighlightedElement.SetHighlighted(False) |
|
2250 |
self.HighlightedElement = None |
|
2251 |
event.Skip() |
|
2252 |
||
2253 |
def UpdateScrollPos(self, event): |
|
2254 |
if (event.Dragging() and self.SelectedElement is not None) or self.rubberBand.IsShown(): |
|
2255 |
position = event.GetPosition() |
|
2256 |
move_window = wx.Point() |
|
2257 |
window_size = self.Editor.GetClientSize() |
|
2258 |
xstart, ystart = self.GetViewStart() |
|
2259 |
if position.x < SCROLL_ZONE and xstart > 0: |
|
2260 |
move_window.x = -1 |
|
2261 |
elif position.x > window_size[0] - SCROLL_ZONE: |
|
2262 |
move_window.x = 1 |
|
2263 |
if position.y < SCROLL_ZONE and ystart > 0: |
|
2264 |
move_window.y = -1 |
|
2265 |
elif position.y > window_size[1] - SCROLL_ZONE: |
|
2266 |
move_window.y = 1 |
|
2267 |
if move_window.x != 0 or move_window.y != 0: |
|
2268 |
self.RefreshVisibleElements(xp = xstart + move_window.x, yp = ystart + move_window.y) |
|
2269 |
self.Scroll(xstart + move_window.x, ystart + move_window.y) |
|
2270 |
self.RefreshScrollBars(move_window.x, move_window.y) |
|
2271 |
||
2272 |
#------------------------------------------------------------------------------- |
|
2273 |
# Keyboard event functions |
|
2274 |
#------------------------------------------------------------------------------- |
|
2275 |
||
2276 |
ARROW_KEY_MOVE = {
|
|
2277 |
wx.WXK_LEFT: (-1, 0), |
|
2278 |
wx.WXK_RIGHT: (1, 0), |
|
2279 |
wx.WXK_UP: (0, -1), |
|
2280 |
wx.WXK_DOWN: (0, 1), |
|
2281 |
} |
|
2282 |
||
2283 |
def OnChar(self, event): |
|
2284 |
xpos, ypos = self.GetScrollPos(wx.HORIZONTAL), self.GetScrollPos(wx.VERTICAL) |
|
2285 |
xmax = self.GetScrollRange(wx.HORIZONTAL) - self.GetScrollThumb(wx.HORIZONTAL) |
|
2286 |
ymax = self.GetScrollRange(wx.VERTICAL) - self.GetScrollThumb(wx.VERTICAL) |
|
2287 |
keycode = event.GetKeyCode() |
|
2288 |
if self.Scaling is not None: |
|
2289 |
scaling = self.Scaling |
|
2290 |
else: |
|
2291 |
scaling = (8, 8) |
|
2292 |
if not self.Debug and keycode == wx.WXK_DELETE and self.SelectedElement is not None: |
|
2293 |
rect = self.SelectedElement.GetRedrawRect(1, 1) |
|
2294 |
self.SelectedElement.Delete() |
|
2295 |
self.SelectedElement = None |
|
2296 |
self.RefreshBuffer() |
|
2297 |
self.RefreshScrollBars() |
|
2298 |
wx.CallAfter(self.SetCurrentCursor, 0) |
|
2299 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
|
2300 |
elif not self.Debug and keycode == wx.WXK_RETURN and self.SelectedElement is not None: |
|
2301 |
self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) |
|
2302 |
elif self.ARROW_KEY_MOVE.has_key(keycode): |
|
2303 |
move = self.ARROW_KEY_MOVE[keycode] |
|
2304 |
if event.ControlDown() and event.ShiftDown(): |
|
2305 |
self.Scroll({-1: 0, 0: xpos, 1: xmax}[move[0]],
|
|
2306 |
{-1: 0, 0: ypos, 1: ymax}[move[1]])
|
|
2307 |
self.RefreshVisibleElements() |
|
2308 |
elif event.ControlDown(): |
|
2309 |
self.Scroll(xpos + move[0], ypos + move[1]) |
|
2310 |
self.RefreshScrollBars() |
|
2311 |
self.RefreshVisibleElements() |
|
2312 |
elif not self.Debug and self.SelectedElement is not None: |
|
2313 |
movex, movey = move |
|
2314 |
if not event.AltDown() or event.ShiftDown(): |
|
2315 |
movex *= scaling[0] |
|
2316 |
movey *= scaling[1] |
|
2317 |
if event.ShiftDown() and not event.AltDown(): |
|
2318 |
movex *= 10 |
|
2319 |
movey *= 10 |
|
2320 |
self.SelectedElement.Move(movex, movey) |
|
2321 |
self.StartBuffering() |
|
2322 |
self.SelectedElement.RefreshModel() |
|
2323 |
self.RefreshScrollBars() |
|
|
1042
6dbdc6844eb9
Fixed refresh bug when moving selected elements
Laurent Bessard
parents:
980
diff
changeset
|
2324 |
self.RefreshVisibleElements() |
| 814 | 2325 |
self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(movex, movey)), False) |
2326 |
elif not self.Debug and keycode == wx.WXK_SPACE and self.SelectedElement is not None and self.SelectedElement.Dragging: |
|
2327 |
if self.IsBlock(self.SelectedElement) or self.IsComment(self.SelectedElement): |
|
2328 |
block = self.CopyBlock(self.SelectedElement, wx.Point(*self.SelectedElement.GetPosition())) |
|
2329 |
event = wx.MouseEvent() |
|
2330 |
event.m_x, event.m_y = self.Editor.ScreenToClient(wx.GetMousePosition()) |
|
2331 |
dc = self.GetLogicalDC() |
|
2332 |
self.SelectedElement.OnLeftUp(event, dc, self.Scaling) |
|
2333 |
self.SelectedElement.SetSelected(False) |
|
2334 |
block.OnLeftDown(event, dc, self.Scaling) |
|
2335 |
self.SelectedElement = block |
|
2336 |
self.SelectedElement.SetSelected(True) |
|
2337 |
self.RefreshVariablePanel() |
|
2338 |
self.RefreshVisibleElements() |
|
2339 |
else: |
|
2340 |
event.Skip() |
|
2341 |
elif keycode == ord("+"):
|
|
2342 |
self.SetScale(self.CurrentScale + 1) |
|
2343 |
self.ParentWindow.RefreshDisplayMenu() |
|
2344 |
elif keycode == ord("-"):
|
|
2345 |
self.SetScale(self.CurrentScale - 1) |
|
2346 |
self.ParentWindow.RefreshDisplayMenu() |
|
2347 |
else: |
|
2348 |
event.Skip() |
|
2349 |
||
2350 |
#------------------------------------------------------------------------------- |
|
2351 |
# Model adding functions from Drop Target |
|
2352 |
#------------------------------------------------------------------------------- |
|
2353 |
||
2354 |
def AddVariableBlock(self, x, y, scaling, var_class, var_name, var_type): |
|
2355 |
id = self.GetNewId() |
|
2356 |
variable = FBD_Variable(self, var_class, var_name, var_type, id) |
|
2357 |
width, height = variable.GetMinSize() |
|
2358 |
if scaling is not None: |
|
2359 |
x = round(float(x) / float(scaling[0])) * scaling[0] |
|
2360 |
y = round(float(y) / float(scaling[1])) * scaling[1] |
|
2361 |
width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0] |
|
2362 |
height = round(float(height) / float(scaling[1]) + 0.5) * scaling[1] |
|
2363 |
variable.SetPosition(x, y) |
|
2364 |
variable.SetSize(width, height) |
|
2365 |
self.AddBlock(variable) |
|
2366 |
self.Controler.AddEditedElementVariable(self.GetTagName(), id, var_class) |
|
2367 |
self.RefreshVariableModel(variable) |
|
2368 |
self.RefreshBuffer() |
|
2369 |
self.RefreshScrollBars() |
|
2370 |
self.RefreshVisibleElements() |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
2371 |
self.Editor.Refresh(False) |
| 814 | 2372 |
|
2373 |
#------------------------------------------------------------------------------- |
|
2374 |
# Model adding functions |
|
2375 |
#------------------------------------------------------------------------------- |
|
2376 |
||
2377 |
def GetScaledSize(self, width, height): |
|
2378 |
if self.Scaling is not None: |
|
2379 |
width = round(float(width) / float(self.Scaling[0]) + 0.4) * self.Scaling[0] |
|
2380 |
height = round(float(height) / float(self.Scaling[1]) + 0.4) * self.Scaling[1] |
|
2381 |
return width, height |
|
2382 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2383 |
def AddNewElement(self, element, bbox, wire=None, connector=None): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2384 |
min_width, min_height = (element.GetMinSize(True) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2385 |
if isinstance(element, (LD_PowerRail, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2386 |
SFC_Divergence)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2387 |
else element.GetMinSize()) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2388 |
element.SetSize(*self.GetScaledSize( |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2389 |
max(bbox.width, min_width), max(bbox.height, min_height))) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2390 |
if wire is not None: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2391 |
if connector is None: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2392 |
connector = element.GetConnectors()["inputs"][0] |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2393 |
point = wire.GetPoint(-1) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2394 |
rel_pos = connector.GetRelPosition() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2395 |
direction = connector.GetDirection() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2396 |
element.SetPosition( |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2397 |
point[0] - rel_pos[0] - direction[0] * CONNECTOR_SIZE, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2398 |
point[1] - rel_pos[1] - direction[1] * CONNECTOR_SIZE, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2399 |
) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2400 |
connector.Connect((wire, -1)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2401 |
wire.Refresh() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2402 |
self.DrawingWire = False |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2403 |
else: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2404 |
element.SetPosition(bbox.x, bbox.y) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2405 |
self.AddBlock(element) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2406 |
element.RefreshModel() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2407 |
self.RefreshBuffer() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2408 |
self.RefreshScrollBars() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2409 |
self.RefreshVisibleElements() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2410 |
element.Refresh() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2411 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2412 |
def AddNewBlock(self, bbox, wire=None): |
|
1236
a5d1d2a2f366
Added support for default function block name in FBDBlockDialog
Laurent Bessard
parents:
1233
diff
changeset
|
2413 |
dialog = FBDBlockDialog(self.ParentWindow, self.Controler, self.TagName) |
| 814 | 2414 |
dialog.SetPreviewFont(self.GetFont()) |
| 1244 | 2415 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
| 814 | 2416 |
if dialog.ShowModal() == wx.ID_OK: |
2417 |
id = self.GetNewId() |
|
2418 |
values = dialog.GetValues() |
|
2419 |
values.setdefault("name", "")
|
|
2420 |
block = FBD_Block(self, values["type"], values["name"], id, |
|
2421 |
values["extension"], values["inputs"], |
|
2422 |
executionControl = values["executionControl"], |
|
2423 |
executionOrder = values["executionOrder"]) |
|
|
1260
11903e79ce66
Fixed bug when adding block into Viewer and added wire validity after adding block with wire drop support
Laurent Bessard
parents:
1259
diff
changeset
|
2424 |
self.Controler.AddEditedElementBlock(self.TagName, id, values["type"], values.get("name", None))
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2425 |
connector = None |
| 1287 | 2426 |
if wire is not None: |
2427 |
for input_connector in block.GetConnectors()["inputs"]: |
|
2428 |
if input_connector.IsCompatible( |
|
2429 |
wire.GetStartConnectedType()): |
|
2430 |
connector = input_connector |
|
2431 |
break |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2432 |
self.AddNewElement(block, bbox, wire, connector) |
| 814 | 2433 |
dialog.Destroy() |
2434 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2435 |
def AddNewVariable(self, bbox, exclude_input=False, wire=None): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2436 |
dialog = FBDVariableDialog(self.ParentWindow, self.Controler, self.TagName, exclude_input) |
| 814 | 2437 |
dialog.SetPreviewFont(self.GetFont()) |
| 1244 | 2438 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
| 814 | 2439 |
if dialog.ShowModal() == wx.ID_OK: |
2440 |
id = self.GetNewId() |
|
2441 |
values = dialog.GetValues() |
|
| 1247 | 2442 |
variable = FBD_Variable(self, values["class"], values["expression"], values["var_type"], id) |
|
1248
2f08985625c0
Fixed bug FBD variable execution not set when newly created
Laurent Bessard
parents:
1247
diff
changeset
|
2443 |
variable.SetExecutionOrder(values["executionOrder"]) |
| 1244 | 2444 |
self.Controler.AddEditedElementVariable(self.TagName, id, values["class"]) |
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2445 |
self.AddNewElement(variable, bbox, wire) |
| 814 | 2446 |
dialog.Destroy() |
2447 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2448 |
def AddNewConnection(self, bbox, wire=None): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2449 |
if wire is not None: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2450 |
values = {
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2451 |
"type": CONNECTOR, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2452 |
"name": self.Controler.GenerateNewName( |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2453 |
self.TagName, None, "Connection%d", 0)} |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2454 |
else: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2455 |
dialog = ConnectionDialog(self.ParentWindow, self.Controler, self.TagName) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2456 |
dialog.SetPreviewFont(self.GetFont()) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2457 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2458 |
values = (dialog.GetValues() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2459 |
if dialog.ShowModal() == wx.ID_OK |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2460 |
else None) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2461 |
dialog.Destroy() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2462 |
if values is not None: |
| 814 | 2463 |
id = self.GetNewId() |
2464 |
connection = FBD_Connector(self, values["type"], values["name"], id) |
|
2465 |
self.Controler.AddEditedElementConnection(self.TagName, id, values["type"]) |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2466 |
self.AddNewElement(connection, bbox, wire) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2467 |
|
| 814 | 2468 |
def AddNewComment(self, bbox): |
| 1245 | 2469 |
dialog = wx.TextEntryDialog(self.ParentWindow, |
2470 |
_("Edit comment"),
|
|
2471 |
_("Please enter comment text"),
|
|
2472 |
"", wx.OK|wx.CANCEL|wx.TE_MULTILINE) |
|
| 814 | 2473 |
dialog.SetClientSize(wx.Size(400, 200)) |
2474 |
if dialog.ShowModal() == wx.ID_OK: |
|
2475 |
value = dialog.GetValue() |
|
2476 |
id = self.GetNewId() |
|
2477 |
comment = Comment(self, value, id) |
|
2478 |
comment.SetPosition(bbox.x, bbox.y) |
|
2479 |
min_width, min_height = comment.GetMinSize() |
|
2480 |
comment.SetSize(*self.GetScaledSize(max(min_width,bbox.width),max(min_height,bbox.height))) |
|
2481 |
self.AddComment(comment) |
|
2482 |
self.Controler.AddEditedElementComment(self.TagName, id) |
|
2483 |
self.RefreshCommentModel(comment) |
|
2484 |
self.RefreshBuffer() |
|
2485 |
self.RefreshScrollBars() |
|
2486 |
self.RefreshVisibleElements() |
|
2487 |
comment.Refresh() |
|
2488 |
dialog.Destroy() |
|
2489 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2490 |
def AddNewContact(self, bbox, wire=None): |
| 1246 | 2491 |
dialog = LDElementDialog(self.ParentWindow, self.Controler, self.TagName, "contact") |
| 814 | 2492 |
dialog.SetPreviewFont(self.GetFont()) |
| 1246 | 2493 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
| 814 | 2494 |
if dialog.ShowModal() == wx.ID_OK: |
2495 |
id = self.GetNewId() |
|
2496 |
values = dialog.GetValues() |
|
| 1246 | 2497 |
contact = LD_Contact(self, values["modifier"], values["variable"], id) |
| 814 | 2498 |
self.Controler.AddEditedElementContact(self.TagName, id) |
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2499 |
self.AddNewElement(contact, bbox, wire) |
| 814 | 2500 |
dialog.Destroy() |
2501 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2502 |
def AddNewCoil(self, bbox, wire=None): |
| 1246 | 2503 |
dialog = LDElementDialog(self.ParentWindow, self.Controler, self.TagName, "coil") |
| 814 | 2504 |
dialog.SetPreviewFont(self.GetFont()) |
| 1246 | 2505 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
| 814 | 2506 |
if dialog.ShowModal() == wx.ID_OK: |
2507 |
id = self.GetNewId() |
|
2508 |
values = dialog.GetValues() |
|
| 1246 | 2509 |
coil = LD_Coil(self, values["modifier"], values["variable"], id) |
| 814 | 2510 |
self.Controler.AddEditedElementCoil(self.TagName, id) |
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2511 |
self.AddNewElement(coil, bbox, wire) |
| 814 | 2512 |
dialog.Destroy() |
2513 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2514 |
def AddNewPowerRail(self, bbox, wire=None): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2515 |
if wire is not None: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2516 |
values = {
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2517 |
"type": RIGHTRAIL, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2518 |
"pin_number": 1} |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2519 |
else: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2520 |
dialog = LDPowerRailDialog(self.ParentWindow, self.Controler, self.TagName) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2521 |
dialog.SetPreviewFont(self.GetFont()) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2522 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2523 |
values = (dialog.GetValues() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2524 |
if dialog.ShowModal() == wx.ID_OK |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2525 |
else None) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2526 |
dialog.Destroy() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2527 |
if values is not None: |
| 814 | 2528 |
id = self.GetNewId() |
| 1249 | 2529 |
powerrail = LD_PowerRail(self, values["type"], id, values["pin_number"]) |
| 814 | 2530 |
self.Controler.AddEditedElementPowerRail(self.TagName, id, values["type"]) |
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2531 |
self.AddNewElement(powerrail, bbox, wire) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2532 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2533 |
def AddNewStep(self, bbox, initial=False, wire=None): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2534 |
if wire is not None: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2535 |
values = {
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2536 |
"name": self.Controler.GenerateNewName( |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2537 |
self.TagName, None, "Step%d", 0), |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2538 |
"input": True, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2539 |
"output": False, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2540 |
"action":False} |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2541 |
else: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2542 |
dialog = SFCStepDialog(self.ParentWindow, self.Controler, self.TagName, initial) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2543 |
dialog.SetPreviewFont(self.GetFont()) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2544 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2545 |
values = (dialog.GetValues() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2546 |
if dialog.ShowModal() == wx.ID_OK |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2547 |
else None) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2548 |
dialog.Destroy() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2549 |
if values is not None: |
| 814 | 2550 |
id = self.GetNewId() |
2551 |
step = SFC_Step(self, values["name"], initial, id) |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2552 |
self.Controler.AddEditedElementStep(self.TagName, id) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2553 |
for connector in ["input", "output", "action"]: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2554 |
getattr(step, ("Add"
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2555 |
if values[connector] |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2556 |
else "Remove") + connector.capitalize())() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2557 |
self.AddNewElement(step, bbox, wire) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2558 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2559 |
def AddNewTransition(self, bbox, connection=False, wire=None): |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2560 |
if wire is not None and connection: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2561 |
values = {
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2562 |
"type": "connection", |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2563 |
"value": None, |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2564 |
"priority": 0} |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2565 |
else: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2566 |
dialog = SFCTransitionDialog(self.ParentWindow, self.Controler, self.TagName, self.GetDrawingMode() == FREEDRAWING_MODE) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2567 |
dialog.SetPreviewFont(self.GetFont()) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2568 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2569 |
values = (dialog.GetValues() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2570 |
if dialog.ShowModal() == wx.ID_OK |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2571 |
else None) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2572 |
dialog.Destroy() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2573 |
if values is not None: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2574 |
id = self.GetNewId() |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2575 |
transition = SFC_Transition(self, values["type"], values["value"], values["priority"], id) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2576 |
self.Controler.AddEditedElementTransition(self.TagName, id) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2577 |
if connection: |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2578 |
connector = transition.GetConditionConnector() |
| 814 | 2579 |
else: |
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2580 |
connector = transition.GetConnectors()["inputs"][0] |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2581 |
self.AddNewElement(transition, bbox, wire, connector) |
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2582 |
|
|
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2583 |
def AddNewDivergence(self, bbox, wire=None): |
| 1251 | 2584 |
dialog = SFCDivergenceDialog(self.ParentWindow, self.Controler, self.TagName) |
| 814 | 2585 |
dialog.SetPreviewFont(self.GetFont()) |
| 1251 | 2586 |
dialog.SetMinElementSize((bbox.width, bbox.height)) |
| 814 | 2587 |
if dialog.ShowModal() == wx.ID_OK: |
2588 |
id = self.GetNewId() |
|
2589 |
values = dialog.GetValues() |
|
2590 |
divergence = SFC_Divergence(self, values["type"], values["number"], id) |
|
2591 |
self.Controler.AddEditedElementDivergence(self.TagName, id, values["type"]) |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2592 |
self.AddNewElement(divergence, bbox, wire) |
| 814 | 2593 |
dialog.Destroy() |
2594 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2595 |
def AddNewJump(self, bbox, wire=None): |
| 814 | 2596 |
choices = [] |
2597 |
for block in self.Blocks.itervalues(): |
|
2598 |
if isinstance(block, SFC_Step): |
|
2599 |
choices.append(block.GetName()) |
|
2600 |
dialog = wx.SingleChoiceDialog(self.ParentWindow, |
|
2601 |
_("Add a new jump"), _("Please choose a target"),
|
|
2602 |
choices, wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL) |
|
2603 |
if dialog.ShowModal() == wx.ID_OK: |
|
2604 |
id = self.GetNewId() |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2605 |
jump = SFC_Jump(self, dialog.GetStringSelection(), id) |
| 814 | 2606 |
self.Controler.AddEditedElementJump(self.TagName, id) |
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2607 |
self.AddNewElement(jump, bbox, wire) |
| 814 | 2608 |
dialog.Destroy() |
2609 |
||
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2610 |
def AddNewActionBlock(self, bbox, wire=None): |
| 814 | 2611 |
dialog = ActionBlockDialog(self.ParentWindow) |
2612 |
dialog.SetQualifierList(self.Controler.GetQualifierTypes()) |
|
2613 |
dialog.SetActionList(self.Controler.GetEditedElementActions(self.TagName, self.Debug)) |
|
2614 |
dialog.SetVariableList(self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)) |
|
2615 |
if dialog.ShowModal() == wx.ID_OK: |
|
2616 |
id = self.GetNewId() |
|
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2617 |
actionblock = SFC_ActionBlock(self, dialog.GetValues(), id) |
| 814 | 2618 |
self.Controler.AddEditedElementActionBlock(self.TagName, id) |
|
1259
8350222a81c3
Added support for adding graphic element when dropping wire in midair
Laurent Bessard
parents:
1252
diff
changeset
|
2619 |
self.AddNewElement(actionblock, bbox, wire) |
| 814 | 2620 |
dialog.Destroy() |
2621 |
||
2622 |
#------------------------------------------------------------------------------- |
|
2623 |
# Edit element content functions |
|
2624 |
#------------------------------------------------------------------------------- |
|
2625 |
||
2626 |
def EditBlockContent(self, block): |
|
|
1236
a5d1d2a2f366
Added support for default function block name in FBDBlockDialog
Laurent Bessard
parents:
1233
diff
changeset
|
2627 |
dialog = FBDBlockDialog(self.ParentWindow, self.Controler, self.TagName) |
| 814 | 2628 |
dialog.SetPreviewFont(self.GetFont()) |
| 1244 | 2629 |
dialog.SetMinElementSize(block.GetSize()) |
| 814 | 2630 |
old_values = {"name" : block.GetName(),
|
2631 |
"type" : block.GetType(), |
|
2632 |
"extension" : block.GetExtension(), |
|
2633 |
"inputs" : block.GetInputTypes(), |
|
2634 |
"executionControl" : block.GetExecutionControl(), |
|
2635 |
"executionOrder" : block.GetExecutionOrder()} |
|
2636 |
dialog.SetValues(old_values) |
|
2637 |
if dialog.ShowModal() == wx.ID_OK: |
|
2638 |
new_values = dialog.GetValues() |
|
2639 |
rect = block.GetRedrawRect(1, 1) |
|
2640 |
if "name" in new_values: |
|
2641 |
block.SetName(new_values["name"]) |
|
2642 |
else: |
|
2643 |
block.SetName("")
|
|
2644 |
block.SetSize(*self.GetScaledSize(new_values["width"], new_values["height"])) |
|
2645 |
block.SetType(new_values["type"], new_values["extension"], executionControl = new_values["executionControl"]) |
|
2646 |
block.SetExecutionOrder(new_values["executionOrder"]) |
|
2647 |
rect = rect.Union(block.GetRedrawRect()) |
|
2648 |
self.RefreshBlockModel(block) |
|
2649 |
self.RefreshBuffer() |
|
2650 |
if old_values["executionOrder"] != new_values["executionOrder"]: |
|
2651 |
self.RefreshView(selection=({block.GetId(): True}, {}))
|
|
2652 |
else: |
|
2653 |
self.RefreshScrollBars() |
|
2654 |
self.RefreshVisibleElements() |
|
2655 |
block.Refresh(rect) |
|
2656 |
self.RefreshVariablePanel() |
|
2657 |
self.ParentWindow.RefreshPouInstanceVariablesPanel() |
|
2658 |
dialog.Destroy() |
|
2659 |
||
2660 |
def EditVariableContent(self, variable): |
|
| 1244 | 2661 |
dialog = FBDVariableDialog(self.ParentWindow, self.Controler, self.TagName) |
| 814 | 2662 |
dialog.SetPreviewFont(self.GetFont()) |
| 1244 | 2663 |
dialog.SetMinElementSize(variable.GetSize()) |
2664 |
old_values = {"expression" : variable.GetName(), "class" : variable.GetType(),
|
|
2665 |
"executionOrder" : variable.GetExecutionOrder()} |
|
| 814 | 2666 |
dialog.SetValues(old_values) |
2667 |
if dialog.ShowModal() == wx.ID_OK: |
|
2668 |
new_values = dialog.GetValues() |
|
2669 |
rect = variable.GetRedrawRect(1, 1) |
|
| 1244 | 2670 |
variable.SetName(new_values["expression"]) |
2671 |
variable.SetType(new_values["class"], new_values["var_type"]) |
|
| 814 | 2672 |
variable.SetSize(*self.GetScaledSize(new_values["width"], new_values["height"])) |
2673 |
variable.SetExecutionOrder(new_values["executionOrder"]) |
|
2674 |
rect = rect.Union(variable.GetRedrawRect()) |
|
| 1244 | 2675 |
if old_values["class"] != new_values["class"]: |
| 814 | 2676 |
id = variable.GetId() |
2677 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
|
| 1244 | 2678 |
self.Controler.AddEditedElementVariable(self.TagName, id, new_values["class"]) |
| 814 | 2679 |
self.RefreshVariableModel(variable) |
2680 |
self.RefreshBuffer() |
|
2681 |
if old_values["executionOrder"] != new_values["executionOrder"]: |
|
2682 |
self.RefreshView(selection=({variable.GetId(): True}, {}))
|
|
2683 |
else: |
|
2684 |
self.RefreshVisibleElements() |
|
2685 |
self.RefreshScrollBars() |
|
2686 |
variable.Refresh(rect) |
|
2687 |
dialog.Destroy() |
|
2688 |
||
2689 |
def EditConnectionContent(self, connection): |
|
| 1245 | 2690 |
dialog = ConnectionDialog(self.ParentWindow, self.Controler, self.TagName, True) |
| 814 | 2691 |
dialog.SetPreviewFont(self.GetFont()) |
| 1245 | 2692 |
dialog.SetMinElementSize(connection.GetSize()) |
| 814 | 2693 |
values = {"name" : connection.GetName(), "type" : connection.GetType()}
|
2694 |
dialog.SetValues(values) |
|
|
856
b64e436f000e
Adding button in ConnectionDialog to propagate connection name modification to all connections with the same name in POU
Laurent Bessard
parents:
852
diff
changeset
|
2695 |
result = dialog.ShowModal() |
|
b64e436f000e
Adding button in ConnectionDialog to propagate connection name modification to all connections with the same name in POU
Laurent Bessard
parents:
852
diff
changeset
|
2696 |
dialog.Destroy() |
|
b64e436f000e
Adding button in ConnectionDialog to propagate connection name modification to all connections with the same name in POU
Laurent Bessard
parents:
852
diff
changeset
|
2697 |
if result in [wx.ID_OK, wx.ID_YESTOALL]: |
| 814 | 2698 |
old_type = connection.GetType() |
2699 |
old_name = connection.GetName() |
|
2700 |
values = dialog.GetValues() |
|
2701 |
rect = connection.GetRedrawRect(1, 1) |
|
2702 |
connection.SetName(values["name"]) |
|
2703 |
connection.SetType(values["type"]) |
|
2704 |
connection.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
|
2705 |
rect = rect.Union(connection.GetRedrawRect()) |
|
2706 |
if old_type != values["type"]: |
|
2707 |
id = connection.GetId() |
|
2708 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
|
2709 |
self.Controler.AddEditedElementConnection(self.TagName, id, values["type"]) |
|
2710 |
self.RefreshConnectionModel(connection) |
|
|
856
b64e436f000e
Adding button in ConnectionDialog to propagate connection name modification to all connections with the same name in POU
Laurent Bessard
parents:
852
diff
changeset
|
2711 |
if old_name != values["name"] and result == wx.ID_YESTOALL: |
| 814 | 2712 |
self.Controler.UpdateEditedElementUsedVariable(self.TagName, old_name, values["name"]) |
|
852
1009f956d2ee
Fix support for adjusting block size to block minimum size and to Viewer scaling
Laurent Bessard
parents:
832
diff
changeset
|
2713 |
self.RefreshBuffer() |
| 814 | 2714 |
self.RefreshView(selection=({connection.GetId(): True}, {}))
|
2715 |
else: |
|
|
856
b64e436f000e
Adding button in ConnectionDialog to propagate connection name modification to all connections with the same name in POU
Laurent Bessard
parents:
852
diff
changeset
|
2716 |
self.RefreshBuffer() |
| 814 | 2717 |
self.RefreshScrollBars() |
2718 |
self.RefreshVisibleElements() |
|
2719 |
connection.Refresh(rect) |
|
|
856
b64e436f000e
Adding button in ConnectionDialog to propagate connection name modification to all connections with the same name in POU
Laurent Bessard
parents:
852
diff
changeset
|
2720 |
|
| 814 | 2721 |
def EditContactContent(self, contact): |
| 1246 | 2722 |
dialog = LDElementDialog(self.ParentWindow, self.Controler, self.TagName, "contact") |
| 814 | 2723 |
dialog.SetPreviewFont(self.GetFont()) |
| 1246 | 2724 |
dialog.SetMinElementSize(contact.GetSize()) |
2725 |
dialog.SetValues({"variable" : contact.GetName(),
|
|
2726 |
"modifier" : contact.GetType()}) |
|
| 814 | 2727 |
if dialog.ShowModal() == wx.ID_OK: |
2728 |
values = dialog.GetValues() |
|
2729 |
rect = contact.GetRedrawRect(1, 1) |
|
| 1246 | 2730 |
contact.SetName(values["variable"]) |
2731 |
contact.SetType(values["modifier"]) |
|
| 814 | 2732 |
contact.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
2733 |
rect = rect.Union(contact.GetRedrawRect()) |
|
2734 |
self.RefreshContactModel(contact) |
|
2735 |
self.RefreshBuffer() |
|
2736 |
self.RefreshScrollBars() |
|
2737 |
self.RefreshVisibleElements() |
|
2738 |
contact.Refresh(rect) |
|
2739 |
dialog.Destroy() |
|
2740 |
||
2741 |
def EditCoilContent(self, coil): |
|
| 1246 | 2742 |
dialog = LDElementDialog(self.ParentWindow, self.Controler, self.TagName, "coil") |
| 814 | 2743 |
dialog.SetPreviewFont(self.GetFont()) |
| 1246 | 2744 |
dialog.SetMinElementSize(coil.GetSize()) |
2745 |
dialog.SetValues({"variable" : coil.GetName(),
|
|
2746 |
"modifier" : coil.GetType()}) |
|
| 814 | 2747 |
if dialog.ShowModal() == wx.ID_OK: |
2748 |
values = dialog.GetValues() |
|
2749 |
rect = coil.GetRedrawRect(1, 1) |
|
| 1246 | 2750 |
coil.SetName(values["variable"]) |
2751 |
coil.SetType(values["modifier"]) |
|
| 814 | 2752 |
coil.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
2753 |
rect = rect.Union(coil.GetRedrawRect()) |
|
2754 |
self.RefreshCoilModel(coil) |
|
2755 |
self.RefreshBuffer() |
|
2756 |
self.RefreshScrollBars() |
|
2757 |
self.RefreshVisibleElements() |
|
2758 |
coil.Refresh(rect) |
|
2759 |
dialog.Destroy() |
|
2760 |
||
2761 |
def EditPowerRailContent(self, powerrail): |
|
| 1249 | 2762 |
dialog = LDPowerRailDialog(self.ParentWindow, self.Controler, self.TagName) |
| 814 | 2763 |
dialog.SetPreviewFont(self.GetFont()) |
| 1249 | 2764 |
dialog.SetMinElementSize(powerrail.GetSize()) |
2765 |
powerrail_type = powerrail.GetType() |
|
2766 |
dialog.SetValues({
|
|
2767 |
"type": powerrail.GetType(), |
|
2768 |
"pin_number": len(powerrail.GetConnectors()[ |
|
2769 |
("outputs" if powerrail_type == LEFTRAIL else "inputs")])})
|
|
| 814 | 2770 |
if dialog.ShowModal() == wx.ID_OK: |
2771 |
values = dialog.GetValues() |
|
2772 |
rect = powerrail.GetRedrawRect(1, 1) |
|
| 1249 | 2773 |
powerrail.SetType(values["type"], values["pin_number"]) |
| 814 | 2774 |
powerrail.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
2775 |
rect = rect.Union(powerrail.GetRedrawRect()) |
|
| 1249 | 2776 |
if powerrail_type != values["type"]: |
| 814 | 2777 |
id = powerrail.GetId() |
2778 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
|
2779 |
self.Controler.AddEditedElementPowerRail(self.TagName, id, values["type"]) |
|
2780 |
self.RefreshPowerRailModel(powerrail) |
|
2781 |
self.RefreshBuffer() |
|
2782 |
self.RefreshScrollBars() |
|
2783 |
self.RefreshVisibleElements() |
|
2784 |
powerrail.Refresh(rect) |
|
2785 |
dialog.Destroy() |
|
2786 |
||
2787 |
def EditStepContent(self, step): |
|
|
1250
7e6de17c687a
Rewrite SFCStepDialog and factorize code for creating common dialog sizers
Laurent Bessard
parents:
1249
diff
changeset
|
2788 |
dialog = SFCStepDialog(self.ParentWindow, self.Controler, self.TagName, step.GetInitial()) |
| 814 | 2789 |
dialog.SetPreviewFont(self.GetFont()) |
|
1250
7e6de17c687a
Rewrite SFCStepDialog and factorize code for creating common dialog sizers
Laurent Bessard
parents:
1249
diff
changeset
|
2790 |
dialog.SetMinElementSize(step.GetSize()) |
| 814 | 2791 |
connectors = step.GetConnectors() |
|
1250
7e6de17c687a
Rewrite SFCStepDialog and factorize code for creating common dialog sizers
Laurent Bessard
parents:
1249
diff
changeset
|
2792 |
dialog.SetValues({
|
|
7e6de17c687a
Rewrite SFCStepDialog and factorize code for creating common dialog sizers
Laurent Bessard
parents:
1249
diff
changeset
|
2793 |
"name" : step.GetName(), |
|
7e6de17c687a
Rewrite SFCStepDialog and factorize code for creating common dialog sizers
Laurent Bessard
parents:
1249
diff
changeset
|
2794 |
"input": len(connectors["inputs"]) > 0, |
|
7e6de17c687a
Rewrite SFCStepDialog and factorize code for creating common dialog sizers
Laurent Bessard
parents:
1249
diff
changeset
|
2795 |
"output": len(connectors["outputs"]) > 0, |
|
7e6de17c687a
Rewrite SFCStepDialog and factorize code for creating common dialog sizers
Laurent Bessard
parents:
1249
diff
changeset
|
2796 |
"action": step.GetActionConnector() != None}) |
| 814 | 2797 |
if dialog.ShowModal() == wx.ID_OK: |
2798 |
values = dialog.GetValues() |
|
2799 |
rect = step.GetRedrawRect(1, 1) |
|
2800 |
step.SetName(values["name"]) |
|
2801 |
if values["input"]: |
|
2802 |
step.AddInput() |
|
2803 |
else: |
|
2804 |
step.RemoveInput() |
|
2805 |
if values["output"]: |
|
2806 |
step.AddOutput() |
|
2807 |
else: |
|
2808 |
step.RemoveOutput() |
|
2809 |
if values["action"]: |
|
2810 |
step.AddAction() |
|
2811 |
else: |
|
2812 |
step.RemoveAction() |
|
2813 |
step.UpdateSize(*self.GetScaledSize(values["width"], values["height"])) |
|
2814 |
rect = rect.Union(step.GetRedrawRect()) |
|
2815 |
self.RefreshStepModel(step) |
|
2816 |
self.RefreshBuffer() |
|
2817 |
self.RefreshScrollBars() |
|
2818 |
self.RefreshVisibleElements() |
|
2819 |
step.Refresh(rect) |
|
2820 |
||
2821 |
def EditTransitionContent(self, transition): |
|
| 1252 | 2822 |
dialog = SFCTransitionDialog(self.ParentWindow, self.Controler, self.TagName, self.GetDrawingMode() == FREEDRAWING_MODE) |
| 814 | 2823 |
dialog.SetPreviewFont(self.GetFont()) |
| 1252 | 2824 |
dialog.SetMinElementSize(transition.GetSize()) |
| 814 | 2825 |
dialog.SetValues({"type":transition.GetType(),"value":transition.GetCondition(), "priority":transition.GetPriority()})
|
2826 |
if dialog.ShowModal() == wx.ID_OK: |
|
2827 |
values = dialog.GetValues() |
|
2828 |
rect = transition.GetRedrawRect(1, 1) |
|
2829 |
transition.SetType(values["type"],values["value"]) |
|
2830 |
transition.SetPriority(values["priority"]) |
|
2831 |
rect = rect.Union(transition.GetRedrawRect()) |
|
2832 |
self.RefreshTransitionModel(transition) |
|
2833 |
self.RefreshBuffer() |
|
2834 |
self.RefreshScrollBars() |
|
2835 |
self.RefreshVisibleElements() |
|
2836 |
transition.Refresh(rect) |
|
2837 |
dialog.Destroy() |
|
2838 |
||
2839 |
def EditJumpContent(self, jump): |
|
2840 |
choices = [] |
|
2841 |
for block in self.Blocks.itervalues(): |
|
2842 |
if isinstance(block, SFC_Step): |
|
2843 |
choices.append(block.GetName()) |
|
2844 |
dialog = wx.SingleChoiceDialog(self.ParentWindow, |
|
2845 |
_("Edit jump target"), _("Please choose a target"),
|
|
2846 |
choices, wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL) |
|
2847 |
dialog.SetSelection(choices.index(jump.GetTarget())) |
|
2848 |
if dialog.ShowModal() == wx.ID_OK: |
|
2849 |
value = dialog.GetStringSelection() |
|
2850 |
rect = jump.GetRedrawRect(1, 1) |
|
2851 |
jump.SetTarget(value) |
|
2852 |
rect = rect.Union(jump.GetRedrawRect()) |
|
2853 |
self.RefreshJumpModel(jump) |
|
2854 |
self.RefreshBuffer() |
|
2855 |
self.RefreshScrollBars() |
|
2856 |
self.RefreshVisibleElements() |
|
2857 |
jump.Refresh(rect) |
|
2858 |
dialog.Destroy() |
|
2859 |
||
2860 |
def EditActionBlockContent(self, actionblock): |
|
2861 |
dialog = ActionBlockDialog(self.ParentWindow) |
|
2862 |
dialog.SetQualifierList(self.Controler.GetQualifierTypes()) |
|
2863 |
dialog.SetActionList(self.Controler.GetEditedElementActions(self.TagName, self.Debug)) |
|
2864 |
dialog.SetVariableList(self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)) |
|
2865 |
dialog.SetValues(actionblock.GetActions()) |
|
2866 |
if dialog.ShowModal() == wx.ID_OK: |
|
2867 |
actions = dialog.GetValues() |
|
2868 |
rect = actionblock.GetRedrawRect(1, 1) |
|
2869 |
actionblock.SetActions(actions) |
|
2870 |
actionblock.SetSize(*self.GetScaledSize(*actionblock.GetSize())) |
|
2871 |
rect = rect.Union(actionblock.GetRedrawRect()) |
|
2872 |
self.RefreshActionBlockModel(actionblock) |
|
2873 |
self.RefreshBuffer() |
|
2874 |
self.RefreshScrollBars() |
|
2875 |
self.RefreshVisibleElements() |
|
2876 |
actionblock.Refresh(rect) |
|
2877 |
dialog.Destroy() |
|
2878 |
||
2879 |
def EditCommentContent(self, comment): |
|
| 1245 | 2880 |
dialog = wx.TextEntryDialog(self.ParentWindow, |
2881 |
_("Edit comment"),
|
|
2882 |
_("Please enter comment text"),
|
|
2883 |
comment.GetContent(), |
|
2884 |
wx.OK|wx.CANCEL|wx.TE_MULTILINE) |
|
| 814 | 2885 |
dialog.SetClientSize(wx.Size(400, 200)) |
2886 |
if dialog.ShowModal() == wx.ID_OK: |
|
2887 |
value = dialog.GetValue() |
|
2888 |
rect = comment.GetRedrawRect(1, 1) |
|
2889 |
comment.SetContent(value) |
|
2890 |
comment.SetSize(*self.GetScaledSize(*comment.GetSize())) |
|
2891 |
rect = rect.Union(comment.GetRedrawRect()) |
|
2892 |
self.RefreshCommentModel(comment) |
|
2893 |
self.RefreshBuffer() |
|
2894 |
self.RefreshScrollBars() |
|
2895 |
self.RefreshVisibleElements() |
|
2896 |
comment.Refresh(rect) |
|
2897 |
dialog.Destroy() |
|
2898 |
||
2899 |
#------------------------------------------------------------------------------- |
|
2900 |
# Model update functions |
|
2901 |
#------------------------------------------------------------------------------- |
|
2902 |
||
2903 |
def RefreshBlockModel(self, block): |
|
2904 |
blockid = block.GetId() |
|
2905 |
infos = {}
|
|
2906 |
infos["type"] = block.GetType() |
|
2907 |
infos["name"] = block.GetName() |
|
2908 |
if self.CurrentLanguage == "FBD": |
|
2909 |
infos["executionOrder"] = block.GetExecutionOrder() |
|
2910 |
infos["x"], infos["y"] = block.GetPosition() |
|
2911 |
infos["width"], infos["height"] = block.GetSize() |
|
2912 |
infos["connectors"] = block.GetConnectors() |
|
2913 |
self.Controler.SetEditedElementBlockInfos(self.TagName, blockid, infos) |
|
2914 |
||
|
857
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2915 |
def ChangeVariableType(self, variable, new_type): |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2916 |
old_type = variable.GetType() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2917 |
rect = variable.GetRedrawRect(1, 1) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2918 |
if old_type != new_type: |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2919 |
variable.SetType(new_type, variable.GetValueType()) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2920 |
id = variable.GetId() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2921 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2922 |
self.Controler.AddEditedElementVariable(self.TagName, id, new_type) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2923 |
self.RefreshVariableModel(variable) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2924 |
self.RefreshBuffer() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2925 |
self.RefreshVisibleElements() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2926 |
self.RefreshScrollBars() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2927 |
variable.Refresh(rect.Union(variable.GetRedrawRect())) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2928 |
|
| 814 | 2929 |
def RefreshVariableModel(self, variable): |
2930 |
variableid = variable.GetId() |
|
2931 |
infos = {}
|
|
2932 |
infos["name"] = variable.GetName() |
|
2933 |
if self.CurrentLanguage == "FBD": |
|
2934 |
infos["executionOrder"] = variable.GetExecutionOrder() |
|
2935 |
infos["x"], infos["y"] = variable.GetPosition() |
|
2936 |
infos["width"], infos["height"] = variable.GetSize() |
|
2937 |
infos["connectors"] = variable.GetConnectors() |
|
2938 |
self.Controler.SetEditedElementVariableInfos(self.TagName, variableid, infos) |
|
2939 |
||
|
857
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2940 |
def ChangeConnectionType(self, connection, new_type): |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2941 |
old_type = connection.GetType() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2942 |
rect = connection.GetRedrawRect(1, 1) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2943 |
if old_type != new_type: |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2944 |
connection.SetType(new_type) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2945 |
id = connection.GetId() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2946 |
self.Controler.RemoveEditedElementInstance(self.TagName, id) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2947 |
self.Controler.AddEditedElementConnection(self.TagName, id, new_type) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2948 |
self.RefreshConnectionModel(connection) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2949 |
self.RefreshBuffer() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2950 |
self.RefreshScrollBars() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2951 |
self.RefreshVisibleElements() |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2952 |
connection.Refresh(rect.Union(connection.GetRedrawRect())) |
|
9695969796d0
Adding support for quickly changing variable and connection type
Laurent Bessard
parents:
856
diff
changeset
|
2953 |
|
| 814 | 2954 |
def RefreshConnectionModel(self, connection): |
2955 |
connectionid = connection.GetId() |
|
2956 |
infos = {}
|
|
2957 |
infos["name"] = connection.GetName() |
|
2958 |
infos["x"], infos["y"] = connection.GetPosition() |
|
2959 |
infos["width"], infos["height"] = connection.GetSize() |
|
2960 |
infos["connector"] = connection.GetConnector() |
|
2961 |
self.Controler.SetEditedElementConnectionInfos(self.TagName, connectionid, infos) |
|
2962 |
||
2963 |
def RefreshCommentModel(self, comment): |
|
2964 |
commentid = comment.GetId() |
|
2965 |
infos = {}
|
|
2966 |
infos["content"] = comment.GetContent() |
|
2967 |
infos["x"], infos["y"] = comment.GetPosition() |
|
2968 |
infos["width"], infos["height"] = comment.GetSize() |
|
2969 |
self.Controler.SetEditedElementCommentInfos(self.TagName, commentid, infos) |
|
2970 |
||
2971 |
def RefreshPowerRailModel(self, powerrail): |
|
2972 |
powerrailid = powerrail.GetId() |
|
2973 |
infos = {}
|
|
2974 |
infos["x"], infos["y"] = powerrail.GetPosition() |
|
2975 |
infos["width"], infos["height"] = powerrail.GetSize() |
|
2976 |
infos["connectors"] = powerrail.GetConnectors() |
|
2977 |
self.Controler.SetEditedElementPowerRailInfos(self.TagName, powerrailid, infos) |
|
2978 |
||
2979 |
def RefreshContactModel(self, contact): |
|
2980 |
contactid = contact.GetId() |
|
2981 |
infos = {}
|
|
2982 |
infos["name"] = contact.GetName() |
|
2983 |
infos["type"] = contact.GetType() |
|
2984 |
infos["x"], infos["y"] = contact.GetPosition() |
|
2985 |
infos["width"], infos["height"] = contact.GetSize() |
|
2986 |
infos["connectors"] = contact.GetConnectors() |
|
2987 |
self.Controler.SetEditedElementContactInfos(self.TagName, contactid, infos) |
|
2988 |
||
2989 |
def RefreshCoilModel(self, coil): |
|
2990 |
coilid = coil.GetId() |
|
2991 |
infos = {}
|
|
2992 |
infos["name"] = coil.GetName() |
|
2993 |
infos["type"] = coil.GetType() |
|
2994 |
infos["x"], infos["y"] = coil.GetPosition() |
|
2995 |
infos["width"], infos["height"] = coil.GetSize() |
|
2996 |
infos["connectors"] = coil.GetConnectors() |
|
2997 |
self.Controler.SetEditedElementCoilInfos(self.TagName, coilid, infos) |
|
2998 |
||
2999 |
def RefreshStepModel(self, step): |
|
3000 |
stepid = step.GetId() |
|
3001 |
infos = {}
|
|
3002 |
infos["name"] = step.GetName() |
|
3003 |
infos["initial"] = step.GetInitial() |
|
3004 |
infos["x"], infos["y"] = step.GetPosition() |
|
3005 |
infos["width"], infos["height"] = step.GetSize() |
|
3006 |
infos["connectors"] = step.GetConnectors() |
|
3007 |
infos["action"] = step.GetActionConnector() |
|
3008 |
self.Controler.SetEditedElementStepInfos(self.TagName, stepid, infos) |
|
3009 |
||
3010 |
def RefreshTransitionModel(self, transition): |
|
3011 |
transitionid = transition.GetId() |
|
3012 |
infos = {}
|
|
3013 |
infos["type"] = transition.GetType() |
|
3014 |
infos["priority"] = transition.GetPriority() |
|
3015 |
infos["condition"] = transition.GetCondition() |
|
3016 |
infos["x"], infos["y"] = transition.GetPosition() |
|
3017 |
infos["width"], infos["height"] = transition.GetSize() |
|
3018 |
infos["connectors"] = transition.GetConnectors() |
|
3019 |
infos["connection"] = transition.GetConditionConnector() |
|
3020 |
self.Controler.SetEditedElementTransitionInfos(self.TagName, transitionid, infos) |
|
3021 |
||
3022 |
def RefreshDivergenceModel(self, divergence): |
|
3023 |
divergenceid = divergence.GetId() |
|
3024 |
infos = {}
|
|
3025 |
infos["x"], infos["y"] = divergence.GetPosition() |
|
3026 |
infos["width"], infos["height"] = divergence.GetSize() |
|
3027 |
infos["connectors"] = divergence.GetConnectors() |
|
3028 |
self.Controler.SetEditedElementDivergenceInfos(self.TagName, divergenceid, infos) |
|
3029 |
||
3030 |
def RefreshJumpModel(self, jump): |
|
3031 |
jumpid = jump.GetId() |
|
3032 |
infos = {}
|
|
3033 |
infos["target"] = jump.GetTarget() |
|
3034 |
infos["x"], infos["y"] = jump.GetPosition() |
|
3035 |
infos["width"], infos["height"] = jump.GetSize() |
|
3036 |
infos["connector"] = jump.GetConnector() |
|
3037 |
self.Controler.SetEditedElementJumpInfos(self.TagName, jumpid, infos) |
|
3038 |
||
3039 |
def RefreshActionBlockModel(self, actionblock): |
|
3040 |
actionblockid = actionblock.GetId() |
|
3041 |
infos = {}
|
|
3042 |
infos["actions"] = actionblock.GetActions() |
|
3043 |
infos["x"], infos["y"] = actionblock.GetPosition() |
|
3044 |
infos["width"], infos["height"] = actionblock.GetSize() |
|
3045 |
infos["connector"] = actionblock.GetConnector() |
|
3046 |
self.Controler.SetEditedElementActionBlockInfos(self.TagName, actionblockid, infos) |
|
3047 |
||
3048 |
||
3049 |
#------------------------------------------------------------------------------- |
|
3050 |
# Model delete functions |
|
3051 |
#------------------------------------------------------------------------------- |
|
3052 |
||
3053 |
||
3054 |
def DeleteBlock(self, block): |
|
3055 |
elements = [] |
|
3056 |
for output in block.GetConnectors()["outputs"]: |
|
3057 |
for element in output.GetConnectedBlocks(): |
|
3058 |
if element not in elements: |
|
3059 |
elements.append(element) |
|
3060 |
block.Clean() |
|
3061 |
self.RemoveBlock(block) |
|
3062 |
self.Controler.RemoveEditedElementInstance(self.TagName, block.GetId()) |
|
3063 |
for element in elements: |
|
3064 |
element.RefreshModel() |
|
3065 |
wx.CallAfter(self.RefreshVariablePanel) |
|
3066 |
wx.CallAfter(self.ParentWindow.RefreshPouInstanceVariablesPanel) |
|
3067 |
||
3068 |
def DeleteVariable(self, variable): |
|
3069 |
connectors = variable.GetConnectors() |
|
3070 |
if len(connectors["outputs"]) > 0: |
|
3071 |
elements = connectors["outputs"][0].GetConnectedBlocks() |
|
3072 |
else: |
|
3073 |
elements = [] |
|
3074 |
variable.Clean() |
|
3075 |
self.RemoveBlock(variable) |
|
3076 |
self.Controler.RemoveEditedElementInstance(self.TagName, variable.GetId()) |
|
3077 |
for element in elements: |
|
3078 |
element.RefreshModel() |
|
3079 |
||
3080 |
def DeleteConnection(self, connection): |
|
3081 |
if connection.GetType() == CONTINUATION: |
|
3082 |
elements = connection.GetConnector().GetConnectedBlocks() |
|
3083 |
else: |
|
3084 |
elements = [] |
|
3085 |
connection.Clean() |
|
3086 |
self.RemoveBlock(connection) |
|
3087 |
self.Controler.RemoveEditedElementInstance(self.TagName, connection.GetId()) |
|
3088 |
for element in elements: |
|
3089 |
element.RefreshModel() |
|
3090 |
||
3091 |
def DeleteComment(self, comment): |
|
3092 |
self.RemoveComment(comment) |
|
3093 |
self.Controler.RemoveEditedElementInstance(self.TagName, comment.GetId()) |
|
3094 |
||
3095 |
def DeleteWire(self, wire): |
|
3096 |
if wire in self.Wires: |
|
3097 |
connected = wire.GetConnected() |
|
3098 |
wire.Clean() |
|
3099 |
self.RemoveWire(wire) |
|
3100 |
for connector in connected: |
|
3101 |
connector.RefreshParentBlock() |
|
3102 |
||
3103 |
def DeleteContact(self, contact): |
|
3104 |
connectors = contact.GetConnectors() |
|
3105 |
elements = connectors["outputs"][0].GetConnectedBlocks() |
|
3106 |
contact.Clean() |
|
3107 |
self.RemoveBlock(contact) |
|
3108 |
self.Controler.RemoveEditedElementInstance(self.TagName, contact.GetId()) |
|
3109 |
for element in elements: |
|
3110 |
element.RefreshModel() |
|
3111 |
||
3112 |
def DeleteCoil(self, coil): |
|
3113 |
connectors = coil.GetConnectors() |
|
3114 |
elements = connectors["outputs"][0].GetConnectedBlocks() |
|
3115 |
coil.Clean() |
|
3116 |
self.RemoveBlock(coil) |
|
3117 |
self.Controler.RemoveEditedElementInstance(self.TagName, coil.GetId()) |
|
3118 |
for element in elements: |
|
3119 |
element.RefreshModel() |
|
3120 |
||
3121 |
def DeletePowerRail(self, powerrail): |
|
3122 |
elements = [] |
|
3123 |
if powerrail.GetType() == LEFTRAIL: |
|
3124 |
connectors = powerrail.GetConnectors() |
|
3125 |
for connector in connectors["outputs"]: |
|
3126 |
for element in connector.GetConnectedBlocks(): |
|
3127 |
if element not in elements: |
|
3128 |
elements.append(element) |
|
3129 |
powerrail.Clean() |
|
3130 |
self.RemoveBlock(powerrail) |
|
3131 |
self.Controler.RemoveEditedElementInstance(self.TagName, powerrail.GetId()) |
|
3132 |
for element in elements: |
|
3133 |
element.RefreshModel() |
|
3134 |
||
3135 |
def DeleteStep(self, step): |
|
3136 |
elements = [] |
|
3137 |
connectors = step.GetConnectors() |
|
3138 |
action_connector = step.GetActionConnector() |
|
3139 |
if len(connectors["outputs"]) > 0: |
|
3140 |
for element in connectors["outputs"][0].GetConnectedBlocks(): |
|
3141 |
if element not in elements: |
|
3142 |
elements.append(element) |
|
3143 |
if action_connector is not None: |
|
3144 |
for element in action_connector.GetConnectedBlocks(): |
|
3145 |
if element not in elements: |
|
3146 |
elements.append(element) |
|
3147 |
step.Clean() |
|
3148 |
self.RemoveBlock(step) |
|
3149 |
self.Controler.RemoveEditedElementInstance(self.TagName, step.GetId()) |
|
3150 |
for element in elements: |
|
3151 |
element.RefreshModel() |
|
3152 |
||
3153 |
def DeleteTransition(self, transition): |
|
3154 |
elements = [] |
|
3155 |
connectors = transition.GetConnectors() |
|
3156 |
for element in connectors["outputs"][0].GetConnectedBlocks(): |
|
3157 |
if element not in elements: |
|
3158 |
elements.append(element) |
|
3159 |
transition.Clean() |
|
3160 |
self.RemoveBlock(transition) |
|
3161 |
self.Controler.RemoveEditedElementInstance(self.TagName, transition.GetId()) |
|
3162 |
for element in elements: |
|
3163 |
element.RefreshModel() |
|
3164 |
||
3165 |
def DeleteDivergence(self, divergence): |
|
3166 |
elements = [] |
|
3167 |
connectors = divergence.GetConnectors() |
|
3168 |
for output in connectors["outputs"]: |
|
3169 |
for element in output.GetConnectedBlocks(): |
|
3170 |
if element not in elements: |
|
3171 |
elements.append(element) |
|
3172 |
divergence.Clean() |
|
3173 |
self.RemoveBlock(divergence) |
|
3174 |
self.Controler.RemoveEditedElementInstance(self.TagName, divergence.GetId()) |
|
3175 |
for element in elements: |
|
3176 |
element.RefreshModel() |
|
3177 |
||
3178 |
def DeleteJump(self, jump): |
|
3179 |
jump.Clean() |
|
3180 |
self.RemoveBlock(jump) |
|
3181 |
self.Controler.RemoveEditedElementInstance(self.TagName, jump.GetId()) |
|
3182 |
||
3183 |
def DeleteActionBlock(self, actionblock): |
|
3184 |
actionblock.Clean() |
|
3185 |
self.RemoveBlock(actionblock) |
|
3186 |
self.Controler.RemoveEditedElementInstance(self.TagName, actionblock.GetId()) |
|
3187 |
||
3188 |
||
3189 |
#------------------------------------------------------------------------------- |
|
3190 |
# Editing functions |
|
3191 |
#------------------------------------------------------------------------------- |
|
3192 |
||
3193 |
def Cut(self): |
|
3194 |
if not self.Debug and (self.IsBlock(self.SelectedElement) or self.IsComment(self.SelectedElement) or isinstance(self.SelectedElement, Graphic_Group)): |
|
3195 |
blocks, wires = self.SelectedElement.GetDefinition() |
|
3196 |
text = self.Controler.GetEditedElementInstancesCopy(self.TagName, blocks, wires, self.Debug) |
|
3197 |
self.ParentWindow.SetCopyBuffer(text) |
|
3198 |
rect = self.SelectedElement.GetRedrawRect(1, 1) |
|
3199 |
self.SelectedElement.Delete() |
|
3200 |
self.SelectedElement = None |
|
3201 |
self.RefreshBuffer() |
|
3202 |
self.RefreshScrollBars() |
|
3203 |
self.RefreshVariablePanel() |
|
3204 |
self.ParentWindow.RefreshPouInstanceVariablesPanel() |
|
3205 |
self.RefreshRect(self.GetScrolledRect(rect), False) |
|
3206 |
||
3207 |
def Copy(self): |
|
3208 |
if not self.Debug and (self.IsBlock(self.SelectedElement) or self.IsComment(self.SelectedElement) or isinstance(self.SelectedElement, Graphic_Group)): |
|
3209 |
blocks, wires = self.SelectedElement.GetDefinition() |
|
3210 |
text = self.Controler.GetEditedElementInstancesCopy(self.TagName, blocks, wires, self.Debug) |
|
3211 |
self.ParentWindow.SetCopyBuffer(text) |
|
3212 |
||
3213 |
def Paste(self, bbx=None): |
|
3214 |
if not self.Debug: |
|
3215 |
element = self.ParentWindow.GetCopyBuffer() |
|
3216 |
if bbx is None: |
|
3217 |
mouse_pos = self.Editor.ScreenToClient(wx.GetMousePosition()) |
|
3218 |
middle = wx.Rect(0, 0, *self.Editor.GetClientSize()).InsideXY(mouse_pos.x, mouse_pos.y) |
|
3219 |
if middle: |
|
3220 |
x, y = self.CalcUnscrolledPosition(mouse_pos.x, mouse_pos.y) |
|
3221 |
else: |
|
3222 |
x, y = self.CalcUnscrolledPosition(0, 0) |
|
3223 |
new_pos = [int(x / self.ViewScale[0]), int(y / self.ViewScale[1])] |
|
3224 |
else: |
|
3225 |
middle = True |
|
3226 |
new_pos = [bbx.x, bbx.y] |
|
3227 |
result = self.Controler.PasteEditedElementInstances(self.TagName, element, new_pos, middle, self.Debug) |
|
3228 |
if not isinstance(result, (StringType, UnicodeType)): |
|
3229 |
self.RefreshBuffer() |
|
3230 |
self.RefreshView(selection=result) |
|
3231 |
self.RefreshVariablePanel() |
|
3232 |
self.ParentWindow.RefreshPouInstanceVariablesPanel() |
|
3233 |
else: |
|
3234 |
message = wx.MessageDialog(self.Editor, result, "Error", wx.OK|wx.ICON_ERROR) |
|
3235 |
message.ShowModal() |
|
3236 |
message.Destroy() |
|
3237 |
||
3238 |
def CanAddElement(self, block): |
|
3239 |
if isinstance(block, Graphic_Group): |
|
3240 |
return block.CanAddBlocks(self) |
|
3241 |
elif self.CurrentLanguage == "SFC": |
|
3242 |
return True |
|
3243 |
elif self.CurrentLanguage == "LD" and not isinstance(block, (SFC_Step, SFC_Transition, SFC_Divergence, SFC_Jump, SFC_ActionBlock)): |
|
3244 |
return True |
|
3245 |
elif self.CurrentLanguage == "FBD" and isinstance(block, (FBD_Block, FBD_Variable, FBD_Connector, Comment)): |
|
3246 |
return True |
|
3247 |
return False |
|
3248 |
||
3249 |
def GenerateNewName(self, element=None, blocktype=None, exclude={}):
|
|
3250 |
if element is not None and isinstance(element, SFC_Step): |
|
3251 |
format = "Step%d" |
|
3252 |
else: |
|
3253 |
if element is not None: |
|
3254 |
blocktype = element.GetType() |
|
3255 |
if blocktype is None: |
|
3256 |
blocktype = "Block" |
|
3257 |
format = "%s%%d" % blocktype |
|
|
1122
84de51ab40d2
Adding support for using current selected variable for generate newly added variable informations in VariablePanel
Laurent Bessard
parents:
1089
diff
changeset
|
3258 |
return self.Controler.GenerateNewName(self.TagName, |
|
84de51ab40d2
Adding support for using current selected variable for generate newly added variable informations in VariablePanel
Laurent Bessard
parents:
1089
diff
changeset
|
3259 |
None, |
|
84de51ab40d2
Adding support for using current selected variable for generate newly added variable informations in VariablePanel
Laurent Bessard
parents:
1089
diff
changeset
|
3260 |
format, |
|
84de51ab40d2
Adding support for using current selected variable for generate newly added variable informations in VariablePanel
Laurent Bessard
parents:
1089
diff
changeset
|
3261 |
exclude=exclude, |
|
84de51ab40d2
Adding support for using current selected variable for generate newly added variable informations in VariablePanel
Laurent Bessard
parents:
1089
diff
changeset
|
3262 |
debug=self.Debug) |
| 814 | 3263 |
|
3264 |
def IsNamedElement(self, element): |
|
3265 |
return isinstance(element, FBD_Block) and element.GetName() != "" or isinstance(element, SFC_Step) |
|
3266 |
||
3267 |
def CopyBlock(self, element, pos): |
|
3268 |
if isinstance(element, Graphic_Group): |
|
3269 |
block = element.Clone(self, pos=pos) |
|
3270 |
else: |
|
|
891
39f355a535d8
Fix bug when copying transition and the connected FBD or LD diagram
Laurent Bessard
parents:
885
diff
changeset
|
3271 |
new_id = self.GetNewId() |
| 814 | 3272 |
if self.IsNamedElement(element): |
3273 |
name = self.GenerateNewName(element) |
|
|
891
39f355a535d8
Fix bug when copying transition and the connected FBD or LD diagram
Laurent Bessard
parents:
885
diff
changeset
|
3274 |
block = element.Clone(self, new_id, name, pos) |
| 814 | 3275 |
else: |
3276 |
name = None |
|
|
891
39f355a535d8
Fix bug when copying transition and the connected FBD or LD diagram
Laurent Bessard
parents:
885
diff
changeset
|
3277 |
block = element.Clone(self, new_id, pos=pos) |
| 814 | 3278 |
self.AddBlockInModel(block) |
3279 |
return block |
|
3280 |
||
3281 |
def AddBlockInModel(self, block): |
|
3282 |
if isinstance(block, Comment): |
|
3283 |
self.AddComment(block) |
|
3284 |
self.Controler.AddEditedElementComment(self.TagName, block.GetId()) |
|
3285 |
self.RefreshCommentModel(block) |
|
3286 |
else: |
|
3287 |
self.AddBlock(block) |
|
3288 |
if isinstance(block, FBD_Block): |
|
3289 |
self.Controler.AddEditedElementBlock(self.TagName, block.GetId(), block.GetType(), block.GetName()) |
|
3290 |
self.RefreshBlockModel(block) |
|
3291 |
elif isinstance(block, FBD_Variable): |
|
3292 |
self.Controler.AddEditedElementVariable(self.TagName, block.GetId(), block.GetType()) |
|
3293 |
self.RefreshVariableModel(block) |
|
3294 |
elif isinstance(block, FBD_Connector): |
|
3295 |
self.Controler.AddEditedElementConnection(self.TagName, block.GetId(), block.GetType()) |
|
3296 |
self.RefreshConnectionModel(block) |
|
3297 |
elif isinstance(block, LD_Contact): |
|
3298 |
self.Controler.AddEditedElementContact(self.TagName, block.GetId()) |
|
3299 |
self.RefreshContactModel(block) |
|
3300 |
elif isinstance(block, LD_Coil): |
|
3301 |
self.Controler.AddEditedElementCoil(self.TagName, block.GetId()) |
|
3302 |
self.RefreshCoilModel(block) |
|
3303 |
elif isinstance(block, LD_PowerRail): |
|
3304 |
self.Controler.AddEditedElementPowerRail(self.TagName, block.GetId(), block.GetType()) |
|
3305 |
self.RefreshPowerRailModel(block) |
|
3306 |
elif isinstance(block, SFC_Step): |
|
3307 |
self.Controler.AddEditedElementStep(self.TagName, block.GetId()) |
|
3308 |
self.RefreshStepModel(block) |
|
3309 |
elif isinstance(block, SFC_Transition): |
|
3310 |
self.Controler.AddEditedElementTransition(self.TagName, block.GetId()) |
|
3311 |
self.RefreshTransitionModel(block) |
|
3312 |
elif isinstance(block, SFC_Divergence): |
|
3313 |
self.Controler.AddEditedElementDivergence(self.TagName, block.GetId(), block.GetType()) |
|
3314 |
self.RefreshDivergenceModel(block) |
|
3315 |
elif isinstance(block, SFC_Jump): |
|
3316 |
self.Controler.AddEditedElementJump(self.TagName, block.GetId()) |
|
3317 |
self.RefreshJumpModel(block) |
|
3318 |
elif isinstance(block, SFC_ActionBlock): |
|
3319 |
self.Controler.AddEditedElementActionBlock(self.TagName, block.GetId()) |
|
3320 |
self.RefreshActionBlockModel(block) |
|
3321 |
||
3322 |
#------------------------------------------------------------------------------- |
|
3323 |
# Find and Replace functions |
|
3324 |
#------------------------------------------------------------------------------- |
|
3325 |
||
3326 |
def Find(self, direction, search_params): |
|
3327 |
if self.SearchParams != search_params: |
|
3328 |
self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT) |
|
3329 |
||
3330 |
self.SearchParams = search_params |
|
3331 |
criteria = {
|
|
3332 |
"raw_pattern": search_params["find_pattern"], |
|
3333 |
"pattern": re.compile(search_params["find_pattern"]), |
|
3334 |
"case_sensitive": search_params["case_sensitive"], |
|
3335 |
"regular_expression": search_params["regular_expression"], |
|
3336 |
"filter": "all"} |
|
3337 |
||
3338 |
self.SearchResults = [] |
|
3339 |
blocks = [] |
|
3340 |
for infos, start, end, text in self.Controler.SearchInPou(self.TagName, criteria, self.Debug): |
|
3341 |
if infos[1] in ["var_local", "var_input", "var_output", "var_inout"]: |
|
3342 |
self.SearchResults.append((infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT)) |
|
3343 |
else: |
|
3344 |
block = self.Blocks.get(infos[2]) |
|
3345 |
if block is not None: |
|
3346 |
blocks.append((block, (infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT))) |
|
3347 |
blocks.sort(sort_blocks) |
|
3348 |
self.SearchResults.extend([infos for block, infos in blocks]) |
|
|
1057
3837e165b3f9
Added support for search in PythonEditor and IECCodeViewer
Laurent Bessard
parents:
1042
diff
changeset
|
3349 |
self.CurrentFindHighlight = None |
| 814 | 3350 |
|
3351 |
if len(self.SearchResults) > 0: |
|
3352 |
if self.CurrentFindHighlight is not None: |
|
3353 |
old_idx = self.SearchResults.index(self.CurrentFindHighlight) |
|
3354 |
if self.SearchParams["wrap"]: |
|
3355 |
idx = (old_idx + direction) % len(self.SearchResults) |
|
3356 |
else: |
|
3357 |
idx = max(0, min(old_idx + direction, len(self.SearchResults) - 1)) |
|
3358 |
if idx != old_idx: |
|
3359 |
self.RemoveHighlight(*self.CurrentFindHighlight) |
|
3360 |
self.CurrentFindHighlight = self.SearchResults[idx] |
|
3361 |
self.AddHighlight(*self.CurrentFindHighlight) |
|
3362 |
else: |
|
3363 |
self.CurrentFindHighlight = self.SearchResults[0] |
|
3364 |
self.AddHighlight(*self.CurrentFindHighlight) |
|
3365 |
||
3366 |
else: |
|
3367 |
if self.CurrentFindHighlight is not None: |
|
3368 |
self.RemoveHighlight(*self.CurrentFindHighlight) |
|
3369 |
self.CurrentFindHighlight = None |
|
3370 |
||
3371 |
#------------------------------------------------------------------------------- |
|
3372 |
# Highlights showing functions |
|
3373 |
#------------------------------------------------------------------------------- |
|
3374 |
||
3375 |
def OnRefreshHighlightsTimer(self, event): |
|
3376 |
self.RefreshView() |
|
3377 |
event.Skip() |
|
3378 |
||
3379 |
def ClearHighlights(self, highlight_type=None): |
|
3380 |
EditorPanel.ClearHighlights(self, highlight_type) |
|
3381 |
||
3382 |
if highlight_type is None: |
|
3383 |
self.Highlights = [] |
|
3384 |
else: |
|
3385 |
self.Highlights = [(infos, start, end, highlight) for (infos, start, end, highlight) in self.Highlights if highlight != highlight_type] |
|
3386 |
self.RefreshView() |
|
3387 |
||
3388 |
def AddHighlight(self, infos, start, end, highlight_type): |
|
3389 |
EditorPanel.AddHighlight(self, infos, start, end, highlight_type) |
|
3390 |
||
3391 |
self.Highlights.append((infos, start, end, highlight_type)) |
|
3392 |
if infos[0] not in ["var_local", "var_input", "var_output", "var_inout"]: |
|
3393 |
block = self.Blocks.get(infos[1]) |
|
3394 |
if block is not None: |
|
3395 |
self.EnsureVisible(block) |
|
3396 |
self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True) |
|
3397 |
||
3398 |
def RemoveHighlight(self, infos, start, end, highlight_type): |
|
3399 |
EditorPanel.RemoveHighlight(self, infos, start, end, highlight_type) |
|
3400 |
||
3401 |
if (infos, start, end, highlight_type) in self.Highlights: |
|
3402 |
self.Highlights.remove((infos, start, end, highlight_type)) |
|
3403 |
self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True) |
|
3404 |
||
3405 |
def ShowHighlights(self): |
|
3406 |
for infos, start, end, highlight_type in self.Highlights: |
|
3407 |
if infos[0] in ["comment", "io_variable", "block", "connector", "coil", "contact", "step", "transition", "jump", "action_block"]: |
|
3408 |
block = self.FindElementById(infos[1]) |
|
3409 |
if block is not None: |
|
3410 |
block.AddHighlight(infos[2:], start, end, highlight_type) |
|
3411 |
||
3412 |
#------------------------------------------------------------------------------- |
|
3413 |
# Drawing functions |
|
3414 |
#------------------------------------------------------------------------------- |
|
3415 |
||
3416 |
def OnScrollWindow(self, event): |
|
|
1273
921858d68a13
Fix refresh bug when scrolling Viewer while dragging graphic element or rubberband
Laurent Bessard
parents:
1263
diff
changeset
|
3417 |
if self.Editor.HasCapture() and self.StartMousePos is not None: |
| 814 | 3418 |
return |
3419 |
if wx.Platform == '__WXMSW__': |
|
3420 |
wx.CallAfter(self.RefreshVisibleElements) |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
3421 |
self.Editor.Freeze() |
|
1208
d22fcdfae8d0
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1205
diff
changeset
|
3422 |
wx.CallAfter(self.Editor.Thaw) |
| 814 | 3423 |
elif event.GetOrientation() == wx.HORIZONTAL: |
3424 |
self.RefreshVisibleElements(xp = event.GetPosition()) |
|
3425 |
else: |
|
3426 |
self.RefreshVisibleElements(yp = event.GetPosition()) |
|
|
1203
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3427 |
|
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3428 |
# Handle scroll in debug to fully redraw area and ensuring |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3429 |
# instance path is fully draw without flickering |
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
3430 |
if self.Debug and wx.Platform != '__WXMSW__': |
|
1203
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3431 |
x, y = self.GetViewStart() |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3432 |
if event.GetOrientation() == wx.HORIZONTAL: |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3433 |
self.Scroll(event.GetPosition(), y) |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3434 |
else: |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3435 |
self.Scroll(x, event.GetPosition()) |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3436 |
else: |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3437 |
event.Skip() |
| 814 | 3438 |
|
3439 |
def OnScrollStop(self, event): |
|
3440 |
self.RefreshScrollBars() |
|
3441 |
event.Skip() |
|
3442 |
||
3443 |
def OnMouseWheelWindow(self, event): |
|
3444 |
if self.StartMousePos is None or self.StartScreenPos is None: |
|
3445 |
rotation = event.GetWheelRotation() / event.GetWheelDelta() |
|
3446 |
if event.ShiftDown(): |
|
3447 |
x, y = self.GetViewStart() |
|
3448 |
xp = max(0, min(x - rotation * 3, self.Editor.GetVirtualSize()[0] / self.Editor.GetScrollPixelsPerUnit()[0])) |
|
3449 |
self.RefreshVisibleElements(xp = xp) |
|
3450 |
self.Scroll(xp, y) |
|
3451 |
elif event.ControlDown(): |
|
3452 |
dc = self.GetLogicalDC() |
|
3453 |
self.SetScale(self.CurrentScale + rotation, mouse_event = event) |
|
3454 |
self.ParentWindow.RefreshDisplayMenu() |
|
3455 |
else: |
|
3456 |
x, y = self.GetViewStart() |
|
3457 |
yp = max(0, min(y - rotation * 3, self.Editor.GetVirtualSize()[1] / self.Editor.GetScrollPixelsPerUnit()[1])) |
|
3458 |
self.RefreshVisibleElements(yp = yp) |
|
3459 |
self.Scroll(x, yp) |
|
|
1204
8a620b460b49
Fixed support for drawing instance path at a fixed position in Viewer debug mode on Windows
Laurent Bessard
parents:
1203
diff
changeset
|
3460 |
|
| 814 | 3461 |
def OnMoveWindow(self, event): |
3462 |
self.RefreshScrollBars() |
|
3463 |
self.RefreshVisibleElements() |
|
3464 |
event.Skip() |
|
3465 |
||
3466 |
def DoDrawing(self, dc, printing = False): |
|
3467 |
if printing: |
|
3468 |
if getattr(dc, "printing", False): |
|
3469 |
font = wx.Font(self.GetFont().GetPointSize(), wx.MODERN, wx.NORMAL, wx.NORMAL) |
|
3470 |
dc.SetFont(font) |
|
3471 |
else: |
|
3472 |
dc.SetFont(self.GetFont()) |
|
3473 |
else: |
|
3474 |
dc.SetBackground(wx.Brush(self.Editor.GetBackgroundColour())) |
|
3475 |
dc.Clear() |
|
3476 |
dc.BeginDrawing() |
|
3477 |
if self.Scaling is not None and self.DrawGrid and not printing: |
|
3478 |
dc.SetPen(wx.TRANSPARENT_PEN) |
|
3479 |
dc.SetBrush(self.GridBrush) |
|
3480 |
xstart, ystart = self.GetViewStart() |
|
3481 |
window_size = self.Editor.GetClientSize() |
|
3482 |
width, height = self.Editor.GetVirtualSize() |
|
3483 |
width = int(max(width, xstart * SCROLLBAR_UNIT + window_size[0]) / self.ViewScale[0]) |
|
3484 |
height = int(max(height, ystart * SCROLLBAR_UNIT + window_size[1]) / self.ViewScale[1]) |
|
3485 |
dc.DrawRectangle(1, 1, width, height) |
|
3486 |
if self.PageSize is not None and not printing: |
|
3487 |
dc.SetPen(self.PagePen) |
|
3488 |
xstart, ystart = self.GetViewStart() |
|
3489 |
window_size = self.Editor.GetClientSize() |
|
3490 |
for x in xrange(self.PageSize[0] - (xstart * SCROLLBAR_UNIT) % self.PageSize[0], int(window_size[0] / self.ViewScale[0]), self.PageSize[0]): |
|
3491 |
dc.DrawLine(xstart * SCROLLBAR_UNIT + x + 1, int(ystart * SCROLLBAR_UNIT / self.ViewScale[0]), |
|
3492 |
xstart * SCROLLBAR_UNIT + x + 1, int((ystart * SCROLLBAR_UNIT + window_size[1]) / self.ViewScale[0])) |
|
3493 |
for y in xrange(self.PageSize[1] - (ystart * SCROLLBAR_UNIT) % self.PageSize[1], int(window_size[1] / self.ViewScale[1]), self.PageSize[1]): |
|
3494 |
dc.DrawLine(int(xstart * SCROLLBAR_UNIT / self.ViewScale[0]), ystart * SCROLLBAR_UNIT + y + 1, |
|
3495 |
int((xstart * SCROLLBAR_UNIT + window_size[0]) / self.ViewScale[1]), ystart * SCROLLBAR_UNIT + y + 1) |
|
3496 |
||
3497 |
# Draw all elements |
|
3498 |
for comment in self.Comments.itervalues(): |
|
3499 |
if comment != self.SelectedElement and (comment.IsVisible() or printing): |
|
3500 |
comment.Draw(dc) |
|
3501 |
for wire in self.Wires.iterkeys(): |
|
3502 |
if wire != self.SelectedElement and (wire.IsVisible() or printing): |
|
3503 |
if not self.Debug or wire.GetValue() != True: |
|
3504 |
wire.Draw(dc) |
|
3505 |
if self.Debug: |
|
3506 |
for wire in self.Wires.iterkeys(): |
|
3507 |
if wire != self.SelectedElement and (wire.IsVisible() or printing) and wire.GetValue() == True: |
|
3508 |
wire.Draw(dc) |
|
3509 |
for block in self.Blocks.itervalues(): |
|
3510 |
if block != self.SelectedElement and (block.IsVisible() or printing): |
|
3511 |
block.Draw(dc) |
|
3512 |
||
3513 |
if self.SelectedElement is not None and (self.SelectedElement.IsVisible() or printing): |
|
3514 |
self.SelectedElement.Draw(dc) |
|
3515 |
||
3516 |
if not printing: |
|
3517 |
if self.Debug: |
|
|
1203
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3518 |
scalex, scaley = dc.GetUserScale() |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3519 |
dc.SetUserScale(1, 1) |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3520 |
|
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3521 |
is_action = self.TagName.split("::")[0] == "A"
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3522 |
text = _("Debug: %s") % self.InstancePath
|
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3523 |
if is_action and self.Value is not None: |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3524 |
text += " ("
|
|
1201
3907f10efcf4
Fixed bug Viewer not refreshed when debugging
Laurent Bessard
parents:
1176
diff
changeset
|
3525 |
text_offset_x, text_offset_y = self.CalcUnscrolledPosition(2, 2) |
|
1203
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3526 |
dc.DrawText(text, text_offset_x, text_offset_y) |
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3527 |
if is_action and self.Value is not None: |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3528 |
value_text = self.VALUE_TRANSLATION[self.Value] |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3529 |
tw, th = dc.GetTextExtent(text) |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3530 |
if self.Value: |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3531 |
dc.SetTextForeground(wx.GREEN) |
|
1203
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3532 |
dc.DrawText(value_text, text_offset_x + tw, text_offset_y) |
|
828
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3533 |
if self.Value: |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3534 |
dc.SetTextForeground(wx.BLACK) |
|
319dac4c4fd3
Fix debug of Action and Transition defined in FBD and LD using Viewer
laurent
parents:
823
diff
changeset
|
3535 |
vw, vh = dc.GetTextExtent(value_text) |
|
1203
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3536 |
dc.DrawText(")", text_offset_x + tw + vw + 2, text_offset_y)
|
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3537 |
|
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3538 |
dc.SetUserScale(scalex, scaley) |
|
4399ddd024e5
Added support for drawing instance path at a fixed position in Viewer debug mode
Laurent Bessard
parents:
1201
diff
changeset
|
3539 |
|
| 814 | 3540 |
if self.rubberBand.IsShown(): |
3541 |
self.rubberBand.Draw(dc) |
|
3542 |
dc.EndDrawing() |
|
3543 |
||
3544 |
def OnPaint(self, event): |
|
3545 |
dc = self.GetLogicalDC(True) |
|
3546 |
self.DoDrawing(dc) |
|
3547 |
wx.BufferedPaintDC(self.Editor, dc.GetAsBitmap()) |
|
3548 |
if self.Debug: |
|
3549 |
DebugViewer.RefreshNewData(self) |
|
3550 |
event.Skip() |
|
3551 |
||
3552 |