plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:3fc63036de16
+:255eada20688
 from Viewer import *
 from TextViewer import *
 from RessourceEditor import *
 from PLCControler import *
 from plcopen import OpenPDFDoc
+from plcopen.structures import LOCATIONDATATYPES
 import os, re, platform, sys, time, traceback, getopt
 __version__ = "$Revision$"
 self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
 if not self.ModeSolo:
 self.Bind(wx.EVT_MENU, self.OnSaveProjectMenu, id=ID_PLCOPENEDITORFILEMENUITEMS5)
 accel = wx.AcceleratorTable([wx.AcceleratorEntry(wx.ACCEL_CTRL, 83, ID_PLCOPENEDITORFILEMENUITEMS5)])
 self.SetAcceleratorTable(accel)
-self.Bind(wx.EVT_ACTIVATE, self.OnFrameActivated)
 self.MainSplitter = wx.SplitterWindow(id=ID_PLCOPENEDITORMAINSPLITTER,
 name='MainSplitter', parent=self, point=wx.Point(0, 0),
 size=wx.Size(0, 0), style=wx.SP_3D)
 self.MainSplitter.SetNeedUpdating(True)
 if fileOpen:
 self.Controler.OpenXMLFile(fileOpen)
 self.RefreshProjectTree()
 else:
 self.Controler = controler
+self.RefreshProjectTree()
 self.CurrentToolBar = []
 self.CurrentLanguage = ""
 self.DrawingMode = FREEDRAWING_MODE
 #self.DrawingMode = DRIVENDRAWING_MODE
 new_values["creationDateTime"] = old_values["creationDateTime"]
 self.Controler.SetProjectProperties(projectname, new_values)
 self.RefreshProjectTree()
 dialog.Destroy()
-def OnFrameActivated(self, event):
-if not self.ModeSolo and event.GetActive():
-self.Controler.RefreshPluginsBlockLists()
-selected = self.TabsOpened.GetSelection()
-if selected >= 0:
-self.TabsOpened.GetPage(selected).RefreshView()
-event.Skip()
 def OnCloseFrame(self, event):
-if not self.ModeSolo and getattr(self, "_onclose", None) != None:
+if not self.ModeSolo and getattr(self, "_onclose", None) is not None:
+self.Controler.CloseAllElements()
 self._onclose()
 event.Skip()
 elif not self.Controler.ProjectIsSaved():
 dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close Application", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
 answer = dialog.ShowModal()
 if block_type != "program":
 data = wx.TextDataObject(str((block_name, block_type, "")))
 dragSource = wx.DropSource(self.ProjectTree)
 dragSource.SetData(data)
 dragSource.DoDragDrop()
+def RefreshEditorNames(self, item_type, old_name, new_name):
+for i in xrange(self.TabsOpened.GetPageCount()):
+editor = self.TabsOpened.GetPage(i)
+editor.RefreshName(item_type, old_name, new_name)
 def OnProjectTreeItemEndEdit(self, event):
 message = None
 abort = False
 new_name = event.GetLabel()
 abort = True
 messageDialog.Destroy()
 if not abort:
 old_name = self.ProjectTree.GetItemText(item)
 self.Controler.ChangePouName(old_name, new_name)
+self.RefreshEditorNames(itemtype, old_name, new_name)
 self.RefreshTabsOpenedTitles()
 elif itemtype == ITEM_TRANSITION:
-category = self.ProjectTree.GetItemParent(item)
+parent = self.ProjectTree.GetItemParent(selected)
-pou = self.ProjectTree.GetItemParent(category)
+parent_type = self.ProjectTree.GetPyData(parent)
-pou_name = self.ProjectTree.GetItemText(pou)
+while parent_type != ITEM_POU:
+parent = self.ProjectTree.GetItemParent(parent)
+parent_type = self.ProjectTree.GetPyData(parent)
+pou_name = self.ProjectTree.GetItemText(parent)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
 message = "A pou with \"%s\" as name exists!"%new_name
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name)]:
 message = "A variable with \"%s\" as name already exists in this pou!"%new_name
 else:
 old_name = self.ProjectTree.GetItemText(item)
 self.Controler.ChangePouTransitionName(pou_name, old_name, new_name)
+self.RefreshEditorNames(itemtype, old_name, new_name)
 self.RefreshTabsOpenedTitles()
 elif itemtype == ITEM_ACTION:
-category = self.ProjectTree.GetItemParent(item)
+parent = self.ProjectTree.GetItemParent(selected)
-pou = self.ProjectTree.GetItemParent(category)
+parent_type = self.ProjectTree.GetPyData(parent)
-pou_name = self.ProjectTree.GetItemText(pou)
+while parent_type != ITEM_POU:
+parent = self.ProjectTree.GetItemParent(parent)
+parent_type = self.ProjectTree.GetPyData(parent)
+pou_name = self.ProjectTree.GetItemText(parent)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
 message = "A pou with \"%s\" as name exists!"%new_name
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name)]:
 message = "A variable with \"%s\" as name already exists in this pou!"%new_name
 else:
 old_name = self.ProjectTree.GetItemText(item)
 self.Controler.ChangePouActionName(pou_name, old_name, new_name)
+self.RefreshEditorNames(itemtype, old_name, new_name)
+self.RefreshTabsOpenedTitles()
+elif itemtype == ITEM_CONFIGURATION:
+if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames()]:
+message = "\"%s\" config already exists!"%new_name
+abort = True
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
+messageDialog = wx.MessageDialog(self, "A pou is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"%new_name, "Error", wx.YES_NO|wx.ICON_QUESTION)
+if messageDialog.ShowModal() == wx.ID_NO:
+abort = True
+messageDialog.Destroy()
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables()]:
+messageDialog = wx.MessageDialog(self, "A variable is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"%new_name, "Error", wx.YES_NO|wx.ICON_QUESTION)
+if messageDialog.ShowModal() == wx.ID_NO:
+abort = True
+messageDialog.Destroy()
+if not abort:
+old_name = self.ProjectTree.GetItemText(item)
+self.Controler.ChangeConfigurationName(old_name, new_name)
+self.RefreshEditorNames(itemtype, old_name, new_name)
+self.RefreshTabsOpenedTitles()
+elif itemtype == ITEM_RESOURCE:
+parent = self.ProjectTree.GetItemParent(selected)
+parent_type = self.ProjectTree.GetPyData(parent)
+while parent_type != ITEM_CONFIGURATION:
+parent = self.ProjectTree.GetItemParent(parent)
+parent_type = self.ProjectTree.GetPyData(parent)
+config_name = self.ProjectTree.GetItemText(parent)
+if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames()]:
+message = "\"%s\" config already exists!"%new_name
+abort = True
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
+messageDialog = wx.MessageDialog(self, "A pou is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"%new_name, "Error", wx.YES_NO|wx.ICON_QUESTION)
+if messageDialog.ShowModal() == wx.ID_NO:
+abort = True
+messageDialog.Destroy()
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables()]:
+messageDialog = wx.MessageDialog(self, "A variable is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"%new_name, "Error", wx.YES_NO|wx.ICON_QUESTION)
+if messageDialog.ShowModal() == wx.ID_NO:
+abort = True
+messageDialog.Destroy()
+if not abort:
+old_name = self.ProjectTree.GetItemText(item)
+self.Controler.ChangeConfigurationResourceName(config_name, old_name, new_name)
+self.RefreshEditorNames(itemtype, old_name, new_name)
 self.RefreshTabsOpenedTitles()
 if message or abort:
 if message:
 messageDialog = wx.MessageDialog(self, message, "Error", wx.OK|wx.ICON_ERROR)
 messageDialog.ShowModal()
 self.Controler.ProjectRemovePou(selected)
 deleted = None
 for i in xrange(self.TabsOpened.GetPageCount()):
 if self.TabsOpened.GetPageText(i) == selected:
 deleted = i
-if deleted != None:
+if deleted is not None:
-self.TabsOpened.DeletePage(i)
+self.TabsOpened.DeletePage(deleted)
 self.RefreshTitle()
 self.RefreshEditMenu()
 self.RefreshProjectTree()
 self.RefreshToolBar()
 else:
 appropriate renderer given the column name.
 Otherwise default to the default renderer.
 """
-for col in range(self.GetNumberCols()):
-attr = wx.grid.GridCellAttr()
-attr.SetAlignment(self.Parent.ColAlignements[col], wx.ALIGN_CENTRE)
-grid.SetColAttr(col, attr)
-grid.SetColSize(col, self.Parent.ColSizes[col])
 typelist = None
 accesslist = None
 for row in range(self.GetNumberRows()):
 for col in range(self.GetNumberCols()):
 editor = None
 if self.Parent.PouIsUsed and self.GetValueByName(row, "Class") in ["Input", "Output", "InOut"]:
 grid.SetReadOnly(row, col, True)
 else:
 editor = wx.grid.GridCellTextEditor()
 renderer = wx.grid.GridCellStringRenderer()
-elif colname in ["Initial Value","Location"]:
+elif colname == "Initial Value":
 editor = wx.grid.GridCellTextEditor()
 renderer = wx.grid.GridCellStringRenderer()
+elif colname == "Location":
+if self.GetValueByName(row, "Class") in ["Local", "Global"]:
+editor = wx.grid.GridCellTextEditor()
+renderer = wx.grid.GridCellStringRenderer()
+else:
+grid.SetReadOnly(row, col, True)
 elif colname == "Class":
 if len(self.Parent.ClassList) == 1 or self.Parent.PouIsUsed and self.GetValueByName(row, "Class") in ["Input", "Output", "InOut"]:
 grid.SetReadOnly(row, col, True)
 else:
 editor = wx.grid.GridCellChoiceEditor()
 col = self.ParentWindow.VariablesGrid.XToCol(x)
 row = self.ParentWindow.VariablesGrid.YToRow(y - self.ParentWindow.VariablesGrid.GetColLabelSize())
 if col != wx.NOT_FOUND and row != wx.NOT_FOUND:
 if self.ParentWindow.Table.GetColLabelValue(col) != "Location":
 return
-try:
+message = None
-values = eval(data)
+if not self.ParentWindow.Table.GetValueByName(row, "Edit"):
-except:
+message = "Can't affect a location to a function block instance"
-values = None
+elif self.ParentWindow.Table.GetValueByName(row, "Class") not in ["Local", "Global"]:
-if values and values[1] == "location":
+message = "Can affect a location only to local or global variables"
-dialog = wx.SingleChoiceDialog(self.ParentWindow, "Select a variable class:", "Variable class", ["Input", "Output", "Memory"], wx.OK|wx.CANCEL)
+else:
-if dialog.ShowModal() == wx.ID_OK:
+try:
-selected = dialog.GetSelection()
+values = eval(data)
-if selected == 0:
+except:
-location = "%I" + values[0]
+values = None
-elif selected == 1:
+if values and values[1] == "location":
-location = "%Q" + values[0]
+location = values[0]
+variable_type = self.ParentWindow.Table.GetValueByName(row, "Type")
+message = None
+if location[0].isdigit() and variable_type != "BOOL":
+message = "Incompatible size of data between \"%s\" and \"BOOL\""%location
+elif location[0] not in LOCATIONDATATYPES:
+message = "Unrecognized data size \"%s\""%location[0]
+elif variable_type not in LOCATIONDATATYPES[location[0]]:
+message = "Incompatible size of data between \"%s\" and \"%s\""%(location, variable_type)
 else:
-location = "%M" + values[0]
+dialog = wx.SingleChoiceDialog(self.ParentWindow, "Select a variable class:", "Variable class", ["Input", "Output", "Memory"], wx.OK|wx.CANCEL)
-self.ParentWindow.Table.SetValue(row, col, location)
+if dialog.ShowModal() == wx.ID_OK:
-self.ParentWindow.Table.ResetView(self.ParentWindow.VariablesGrid)
+selected = dialog.GetSelection()
-self.ParentWindow.SaveValues()
+if selected == 0:
-dialog.Destroy()
+location = "%I" + location
+elif selected == 1:
+location = "%Q" + location
+else:
+location = "%M" + location
+self.ParentWindow.Table.SetValue(row, col, location)
+self.ParentWindow.Table.ResetView(self.ParentWindow.VariablesGrid)
+self.ParentWindow.SaveValues()
+dialog.Destroy()
+if message is not None:
+message = wx.MessageDialog(self.ParentWindow, message, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
 [ID_POUEDITORPANEL, ID_POUEDITORPANELVIEWER,
 ID_POUEDITORPANELVARIABLESGRID, ID_POUEDITORPANELRETURNTYPE,
 ID_POUEDITORPANELCLASSFILTER, ID_POUEDITORPANELADDBUTTON,
 ID_POUEDITORPANELDELETEBUTTON, ID_POUEDITORPANELUPBUTTON,
 size=wx.Size(0, 150), style=wx.VSCROLL)
 self.VariablesGrid.SetFont(wx.Font(12, 77, wx.NORMAL, wx.NORMAL, False,
 'Sans'))
 self.VariablesGrid.SetLabelFont(wx.Font(10, 77, wx.NORMAL, wx.NORMAL,
 False, 'Sans'))
+self.VariablesGrid.SetSelectionBackground(wx.WHITE)
+self.VariablesGrid.SetSelectionForeground(wx.BLACK)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnVariablesGridCellChange)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_SELECT_CELL, self.OnVariablesGridSelectCell)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.OnVariablesGridCellLeftClick)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_EDITOR_SHOWN, self.OnVariablesGridEditorShown)
 self.VariablesGrid.SetDropTarget(VariableDropTarget(self))
 self.staticText1.Hide()
 self.ReturnType.Hide()
 self.VariablesGrid.SetTable(self.Table)
 self.VariablesGrid.SetRowLabelSize(0)
+for col in range(self.Table.GetNumberCols()):
+attr = wx.grid.GridCellAttr()
+attr.SetAlignment(self.ColAlignements[col], wx.ALIGN_CENTRE)
+self.VariablesGrid.SetColAttr(col, attr)
+self.VariablesGrid.SetColSize(col, self.ColSizes[col])
+def RefreshName(self, name_type, old_name, new_name):
+if name_type == ITEM_POU and self.PouName == old_name:
+self.PouName = new_name
+elif name_type == ITEM_TRANSITION and self.TransitionName == old_name:
+self.TransitionName = new_name
+elif name_type == ITEM_ACTION and self.ActionName == old_name:
+self.ActionName = new_name
+elif name_type == ITEM_CONFIGURATION and self.ConfigName == old_name:
+self.ConfigName = new_name
+elif name_type == ITEM_RESOURCE and self.ResourceName == old_name:
+self.ResourceName = new_name
 def SetMode(self, mode):
 if self.ElementType not in ["resource", "config"]:
 if self.ElementType == "transition":
 language = self.Controler.GetTransitionBodyType(self.PouName, self.TransitionName)
 self.RefreshViewerVarList()
 self.Viewer.RefreshView()
 event.Skip()
 else:
 self.SaveValues()
+if colname == "Class":
+self.Table.ResetView(self.VariablesGrid)
 event.Skip()
 def OnVariablesGridCellLeftClick(self, event):
 if event.GetCol() == "#":
 row = event.GetRow()

changeset 107	255eada20688
parent 102	85875dcb7754
child 108	9aa1fdfb7cb2