2284 block.SetType(new_values["type"], new_values["extension"], executionControl = new_values["executionControl"]) |
2284 block.SetType(new_values["type"], new_values["extension"], executionControl = new_values["executionControl"]) |
2285 block.SetExecutionOrder(new_values["executionOrder"]) |
2285 block.SetExecutionOrder(new_values["executionOrder"]) |
2286 rect = rect.Union(block.GetRedrawRect()) |
2286 rect = rect.Union(block.GetRedrawRect()) |
2287 self.RefreshBlockModel(block) |
2287 self.RefreshBlockModel(block) |
2288 self.RefreshBuffer() |
2288 self.RefreshBuffer() |
2289 self.RefreshScrollBars() |
2289 if old_values["executionOrder"] != new_values["executionOrder"]: |
2290 self.RefreshVisibleElements() |
2290 self.RefreshView(selection=({block.GetId(): True}, {})) |
|
2291 else: |
|
2292 self.RefreshScrollBars() |
|
2293 self.RefreshVisibleElements() |
|
2294 block.Refresh(rect) |
2291 self.RefreshVariablePanel() |
2295 self.RefreshVariablePanel() |
2292 self.ParentWindow.RefreshPouInstanceVariablesPanel() |
2296 self.ParentWindow.RefreshPouInstanceVariablesPanel() |
2293 if old_values["executionOrder"] != new_values["executionOrder"]: |
|
2294 self.RefreshView() |
|
2295 else: |
|
2296 block.Refresh(rect) |
|
2297 dialog.Destroy() |
2297 dialog.Destroy() |
2298 |
2298 |
2299 def EditVariableContent(self, variable): |
2299 def EditVariableContent(self, variable): |
2300 words = self.TagName.split("::") |
2300 words = self.TagName.split("::") |
2301 if words[0] == "T": |
2301 if words[0] == "T": |
2328 if old_values["type"] != new_values["type"]: |
2328 if old_values["type"] != new_values["type"]: |
2329 id = variable.GetId() |
2329 id = variable.GetId() |
2330 self.Controler.RemoveEditedElementInstance(self.TagName, id) |
2330 self.Controler.RemoveEditedElementInstance(self.TagName, id) |
2331 self.Controler.AddEditedElementVariable(self.TagName, id, new_values["type"]) |
2331 self.Controler.AddEditedElementVariable(self.TagName, id, new_values["type"]) |
2332 self.RefreshVariableModel(variable) |
2332 self.RefreshVariableModel(variable) |
|
2333 self.RefreshBuffer() |
2333 if old_values["executionOrder"] != new_values["executionOrder"]: |
2334 if old_values["executionOrder"] != new_values["executionOrder"]: |
2334 self.RefreshView() |
2335 self.RefreshView(selection=({variable.GetId(): True}, {})) |
2335 self.RefreshBuffer() |
2336 else: |
2336 self.RefreshVisibleElements() |
2337 self.RefreshVisibleElements() |
2337 self.RefreshScrollBars() |
2338 self.RefreshScrollBars() |
2338 variable.Refresh(rect) |
2339 variable.Refresh(rect) |
2339 dialog.Destroy() |
2340 dialog.Destroy() |
2340 |
2341 |
2341 def EditConnectionContent(self, connection): |
2342 def EditConnectionContent(self, connection): |
2342 dialog = ConnectionDialog(self.ParentWindow, self.Controler) |
2343 dialog = ConnectionDialog(self.ParentWindow, self.Controler) |
2343 dialog.SetPreviewFont(self.GetFont()) |
2344 dialog.SetPreviewFont(self.GetFont()) |
2346 dialog.SetMinConnectionSize(connection.GetSize()) |
2347 dialog.SetMinConnectionSize(connection.GetSize()) |
2347 values = {"name" : connection.GetName(), "type" : connection.GetType()} |
2348 values = {"name" : connection.GetName(), "type" : connection.GetType()} |
2348 dialog.SetValues(values) |
2349 dialog.SetValues(values) |
2349 if dialog.ShowModal() == wx.ID_OK: |
2350 if dialog.ShowModal() == wx.ID_OK: |
2350 old_type = connection.GetType() |
2351 old_type = connection.GetType() |
|
2352 old_name = connection.GetName() |
2351 values = dialog.GetValues() |
2353 values = dialog.GetValues() |
2352 rect = connection.GetRedrawRect(1, 1) |
2354 rect = connection.GetRedrawRect(1, 1) |
2353 connection.SetName(values["name"]) |
2355 connection.SetName(values["name"]) |
2354 connection.SetType(values["type"]) |
2356 connection.SetType(values["type"]) |
2355 connection.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
2357 connection.SetSize(*self.GetScaledSize(values["width"], values["height"])) |
2358 id = connection.GetId() |
2360 id = connection.GetId() |
2359 self.Controler.RemoveEditedElementInstance(self.TagName, id) |
2361 self.Controler.RemoveEditedElementInstance(self.TagName, id) |
2360 self.Controler.AddEditedElementConnection(self.TagName, id, values["type"]) |
2362 self.Controler.AddEditedElementConnection(self.TagName, id, values["type"]) |
2361 self.RefreshConnectionModel(connection) |
2363 self.RefreshConnectionModel(connection) |
2362 self.RefreshBuffer() |
2364 self.RefreshBuffer() |
2363 self.RefreshScrollBars() |
2365 if old_name != values["name"]: |
2364 self.RefreshVisibleElements() |
2366 self.Controler.UpdateEditedElementUsedVariable(self.TagName, old_name, values["name"]) |
2365 connection.Refresh(rect) |
2367 self.RefreshView(selection=({connection.GetId(): True}, {})) |
|
2368 else: |
|
2369 self.RefreshScrollBars() |
|
2370 self.RefreshVisibleElements() |
|
2371 connection.Refresh(rect) |
2366 dialog.Destroy() |
2372 dialog.Destroy() |
2367 |
2373 |
2368 def EditContactContent(self, contact): |
2374 def EditContactContent(self, contact): |
2369 dialog = LDElementDialog(self.ParentWindow, self.Controler, "contact") |
2375 dialog = LDElementDialog(self.ParentWindow, self.Controler, "contact") |
2370 dialog.SetPreviewFont(self.GetFont()) |
2376 dialog.SetPreviewFont(self.GetFont()) |