plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:e24d2f917c7e
+:7187e1c00975
 kind=wx.ITEM_NORMAL, text=u'Add Configuration')
 parent.Append(help='', id=wxID_PLCOPENEDITOREDITMENUITEMS12,
 kind=wx.ITEM_NORMAL, text=u'Remove Configuration')
 self.Bind(wx.EVT_MENU, self.OnRefreshMenu,
 id=wxID_PLCOPENEDITOREDITMENUITEMS0)
+self.Bind(wx.EVT_MENU, self.OnUndoMenu,
+id=wxID_PLCOPENEDITOREDITMENUITEMS1)
+self.Bind(wx.EVT_MENU, self.OnRedoMenu,
+id=wxID_PLCOPENEDITOREDITMENUITEMS2)
 self.Bind(wx.EVT_MENU, self.OnCutMenu,
 id=wxID_PLCOPENEDITOREDITMENUITEMS4)
 self.Bind(wx.EVT_MENU, self.OnCopyMenu,
 id=wxID_PLCOPENEDITOREDITMENUITEMS5)
 self.Bind(wx.EVT_MENU, self.OnPasteMenu,
 parent=prnt, pos=wx.Point(235, 287), size=wx.Size(1000, 600),
 style=wx.DEFAULT_FRAME_STYLE, title=u'PLCOpenEditor')
 self._init_utils()
 self.SetClientSize(wx.Size(1000, 600))
 self.SetMenuBar(self.menuBar1)
+self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=wxID_PLCOPENEDITOR)
 self.splitterWindow1 = wx.SplitterWindow(id=wxID_PLCOPENEDITORSPLITTERWINDOW1,
 name='splitterWindow1', parent=self, point=wx.Point(0, 0),
 size=wx.Size(-1, -1), style=wx.SP_3D)
 self.splitterWindow1.SetNeedUpdating(True)
 #self.DrawingMode = FREEDRAWING_MODE
 self.DrawingMode = DRIVENDRAWING_MODE
 self.RefreshFileMenu()
 self.RefreshEditMenu()
+self.RefreshTitle()
 self.RefreshToolBar()
 def GetDrawingMode(self):
 return self.DrawingMode
+def RefreshTitle(self):
+if self.Controler.HasOpenedProject() > 0:
+self.SetTitle("PLCOpenEditor - %s"%self.Controler.GetFilename())
+else:
+self.SetTitle("PLCOpenEditor")
 def RefreshFileMenu(self):
 if self.FileMenu:
 if self.Controler.HasOpenedProject():
 if self.TabsOpened.GetPageCount() > 0:
 self.FileMenu.FindItemByPosition(7).Enable(False)
 self.FileMenu.FindItemByPosition(9).Enable(False)
 def RefreshEditMenu(self):
 if self.EditMenu:
-self.EditMenu.FindItemByPosition(1).Enable(False)
+if self.Controler.HasOpenedProject():
-self.EditMenu.FindItemByPosition(2).Enable(False)
+undo, redo = self.Controler.GetBufferState()
+self.EditMenu.Enable(wxID_PLCOPENEDITOREDITMENUITEMS1, undo)
+self.EditMenu.Enable(wxID_PLCOPENEDITOREDITMENUITEMS2, redo)
+else:
+self.EditMenu.Enable(wxID_PLCOPENEDITOREDITMENUITEMS1, False)
+self.EditMenu.Enable(wxID_PLCOPENEDITOREDITMENUITEMS2, False)
 if self.Controler.HasOpenedProject():
 if self.TabsOpened.GetPageCount() > 0:
 self.EditMenu.FindItemByPosition(0).Enable(True)
 else:
 self.EditMenu.FindItemByPosition(0).Enable(False)
 self.EditMenu.FindItemByPosition(5).Enable(False)
 self.EditMenu.FindItemByPosition(6).Enable(False)
 def ShowProperties(self):
 old_values = self.Controler.GetProjectProperties()
-old_values["projectName"] = self.Controler.GetProjectName()
 dialog = ProjectDialog(self)
 dialog.SetValues(old_values)
 if dialog.ShowModal() == wxID_OK:
 new_values = dialog.GetValues()
 projectname = new_values.pop("projectName")
 new_values["creationDateTime"] = old_values["creationDateTime"]
-self.Controler.SetProjectName(projectname)
+self.Controler.SetProjectProperties(projectname, new_values)
-self.Controler.SetProjectProperties(new_values)
 self.RefreshProjectTree()
 dialog.Destroy()
+def OnCloseFrame(self, event):
+if not self.Controler.ProjectIsSaved():
+dialog = wxMessageDialog(self, "There are changes, do you want to save?",  "Close Application", wxYES_NO|wxCANCEL|wxICON_QUESTION)
+answer = dialog.ShowModal()
+dialog.Destroy()
+if answer == wxID_YES:
+self.SaveProject()
+event.Skip()
+elif answer == wxID_NO:
+event.Skip()
+else:
+event.Skip()
 def OnNewProjectMenu(self, event):
 dialog = ProjectDialog(self)
 if dialog.ShowModal() == wxID_OK:
 values = dialog.GetValues()
 projectname = values.pop("projectName")
 values["creationDateTime"] = datetime(*localtime()[:6])
 self.Controler.CreateNewProject(projectname)
-self.Controler.SetProjectProperties(values)
+self.Controler.SetProjectProperties(projectname, values)
+self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshProjectTree()
 event.Skip()
 filepath = dialog.GetPath()
 if os.path.isfile(filepath):
 self.Controler.OpenXMLFile(filepath)
 self.TabsOpened.DeleteAllPages()
 self.RefreshProjectTree()
+self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 dialog.Destroy()
 event.Skip()
 if selected >= 0:
 self.Controler.CloseElementEditing()
 self.TabsOpened.DeletePage(selected)
 if self.TabsOpened.GetPageCount() > 0:
 self.TabsOpened.SetSelection(min(selected, self.TabsOpened.GetPageCount() - 1))
+self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 event.Skip()
 def OnCloseProjectMenu(self, event):
 self.Controler.Reset()
 self.TabsOpened.DeleteAllPages()
 self.ProjectTree.DeleteAllItems()
+self.RefreshTitle()
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshToolBar()
 event.Skip()
 def SaveProject(self):
 result = self.Controler.SaveXMLFile()
 if not result:
 self.SaveProjectAs()
+else:
+self.RefreshTitle()
 def SaveProjectAs(self):
 filepath = self.Controler.GetFilePath()
 if filepath != "":
 directory, filename = os.path.split(filepath)
 else:
-directory, filename = os.getcwd(), "%s.xml"%self.Controler.GetProjectName()
+directory, filename = os.getcwd(), "%(projectName)s.xml"%self.Controler.GetProjectProperties()
 dialog = wxFileDialog(self, "Choose a file", directory, filename,  "PLCOpen files (*.xml)|*.xml|All files|*.*", wxSAVE|wxOVERWRITE_PROMPT)
 if dialog.ShowModal() == wxID_OK:
 filepath = dialog.GetPath()
 if os.path.isdir(os.path.dirname(filepath)):
 result = self.Controler.SaveXMLFile(filepath)
 message.Destroy()
 else:
 message = wxMessageDialog(self, "%s is not a valid folder!"%os.path.dirname(filepath), "Error", wxOK|wxICON_ERROR)
 message.ShowModal()
 message.Destroy()
+self.RefreshTitle()
 dialog.Destroy()
 def OnPropertiesMenu(self, event):
 self.ShowProperties()
 event.Skip()
 else:
 self.TabsOpened.GetPage(selected).Viewer.AddJump()
 event.Skip()
 def OnPouSelectedChanged(self, event):
+old_selected = self.TabsOpened.GetSelection()
+if old_selected >= 0:
+self.TabsOpened.GetPage(old_selected).ResetBuffer()
 selected = event.GetSelection()
 if selected >= 0:
 self.Controler.RefreshCurrentElementEditing(selected)
 found = False
 name = self.TabsOpened.GetPageText(selected)
 message = "\"%s\" is a keyword. It can't be used!"%new_name
 else:
 item = event.GetItem()
 itemtype = self.ProjectTree.GetPyData(item)
 if itemtype == ITEM_PROJECT:
-self.Controler.SetProjectName(new_name)
+self.Controler.SetProjectProperties(name = new_name)
 elif itemtype == ITEM_POU:
 if new_name.upper() in self.Controler.GetProjectPouNames():
 message = "\"%s\" pou already exists!"%new_name
 abort = True
 elif new_name.upper() in self.Controler.GetProjectPouVariables():
 new_window = PouEditorPanel(self.TabsOpened, self, self.Controler, "action", pou_name = grandparent_name, action_name = name)
 self.TabsOpened.AddPage(new_window, "")
 else:
 idx = self.Controler.ChangePouActionEditing(grandparent_name, name)
 if idx != None:
+old_selected = self.TabsOpened.GetSelection()
+if old_selected >= 0:
+self.TabsOpened.GetPage(old_selected).ResetBuffer()
 self.TabsOpened.SetSelection(idx)
 window = self.TabsOpened.GetPage(idx)
 window.RefreshView()
 self.RefreshTabsOpenedTitles()
 self.RefreshFileMenu()
 self.TabsOpened.SetPageText(i, pou)
 def OnRefreshMenu(self, event):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
+self.TabsOpened.GetPage(selected).RefreshView()
 self.TabsOpened.GetPage(selected).Refresh()
 event.Skip()
+def OnUndoMenu(self, event):
+self.Controler.LoadPrevious()
+selected = self.TabsOpened.GetSelection()
+if selected != -1:
+self.TabsOpened.GetPage(selected).RefreshView()
+self.TabsOpened.GetPage(selected).Refresh()
+self.RefreshTitle()
+self.RefreshEditMenu()
+event.Skip()
+def OnRedoMenu(self, event):
+self.Controler.LoadNext()
+selected = self.TabsOpened.GetSelection()
+if selected != -1:
+self.TabsOpened.GetPage(selected).RefreshView()
+self.TabsOpened.GetPage(selected).Refresh()
+self.RefreshTitle()
+self.RefreshEditMenu()
+event.Skip()
 def OnCutMenu(self, event):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 try:
 self.TabsOpened.GetPage(selected).Viewer.Cut()
 dialog = wxSingleChoiceDialog(self, "Select POU to remove:", "POU Remove", pous, wxOK|wxCANCEL)
 if dialog.ShowModal() == wxID_OK:
 selected = dialog.GetStringSelection()
 if not self.Controler.PouIsUsed(selected):
 self.Controler.ProjectRemovePou(selected)
+deleted = None
 for i in xrange(self.TabsOpened.GetPageCount()):
 if self.TabsOpened.GetPageText(i) == selected:
-self.TabsOpened.DeletePage(i)
+deleted = i
+if deleted != None:
+self.TabsOpened.DeletePage(i)
 self.RefreshProjectTree()
 self.RefreshToolBar()
 else:
 message = wxMessageDialog(self, "%s is used by one or more POUs. It can't be removed!"%selected, "Error", wxOK|wxICON_ERROR)
 message.ShowModal()
 if element_type == "config":
 self.Viewer = wx.Panel(id=wxID_POUEDITORPANELVIEWER,
 name='ConfigPanel', parent=self, pos=wx.Point(0, 0),
 size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL)
+self.Viewer.ResetBuffer = lambda: None
+self.Viewer.RefreshView = lambda: None
 elif element_type == "resource":
 self.Viewer = ResourceEditor(self, self.Parent, self.Controler)
 elif element_type == "FBD":
 self.Viewer = Viewer(self, self.Parent, self.Controler)
 elif element_type == "LD":
 else:
 language = self.Controler.GetPouBodyType(self.PouName)
 if language not in ["IL", "ST"]:
 self.Viewer.SetMode(mode)
+def ResetBuffer(self):
+self.Viewer.ResetBuffer()
 def RefreshView(self):
 self.PouNames = self.Controler.GetProjectPouNames()
 if self.ElementType == "config":
 self.PouIsUsed = False
 if returnType and self.ReturnType.IsEnabled():
 self.ReturnType.SetStringSelection(returnType)
 self.RefreshValues()
 self.RefreshButtons()
-if self.ElementType != "config":
+self.Viewer.RefreshView()
-self.Viewer.RefreshView()
 def OnClassFilter(self, event):
 self.Filter = self.FilterChoiceTransfer[self.ClassFilter.GetStringSelection()]
 self.RefreshTypeList()
 self.RefreshValues()
 self.RefreshButtons()
 self.ClassList = ["Local","Temp"]
 else:
 self.ClassList = [self.Filter]
 def RefreshButtons(self):
-table_length = len(self.Table.data)
+if self.Table:
-row_class = None
+table_length = len(self.Table.data)
-if table_length and self.PouIsUsed:
+row_class = None
-row = self.VariablesGrid.GetGridCursorRow()
+if table_length and self.PouIsUsed:
-row_class = self.Table.GetValueByName(row, "Class")
+row = self.VariablesGrid.GetGridCursorRow()
-self.AddButton.Enable(not self.PouIsUsed or self.Filter not in ["Interface", "Input", "Output", "InOut"])
+row_class = self.Table.GetValueByName(row, "Class")
-self.DeleteButton.Enable(table_length > 0 and row_class not in ["Input", "Output", "InOut"])
+self.AddButton.Enable(not self.PouIsUsed or self.Filter not in ["Interface", "Input", "Output", "InOut"])
-self.UpButton.Enable(table_length > 0 and self.Filter == "All" and row_class not in ["Input", "Output", "InOut"])
+self.DeleteButton.Enable(table_length > 0 and row_class not in ["Input", "Output", "InOut"])
-self.DownButton.Enable(table_length > 0 and self.Filter == "All" and row_class not in ["Input", "Output", "InOut"])
+self.UpButton.Enable(table_length > 0 and self.Filter == "All" and row_class not in ["Input", "Output", "InOut"])
+self.DownButton.Enable(table_length > 0 and self.Filter == "All" and row_class not in ["Input", "Output", "InOut"])
 def OnAddButton(self, event):
 new_row = self.DefaultValue.copy()
 if self.Filter in self.DefaultTypes:
 new_row["Class"] = self.DefaultTypes[self.Filter]

changeset 56	7187e1c00975
parent 55	e24d2f917c7e
child 58	39cd981ff242