diff -r 8c525217ef1f -r a7c706b9492e PLCOpenEditor.py --- a/PLCOpenEditor.py Tue Oct 11 12:08:55 2011 +0200 +++ b/PLCOpenEditor.py Wed Oct 12 15:08:47 2011 +0200 @@ -154,8 +154,8 @@ ID_PLCOPENEDITORTOOLBARBRANCH, ID_PLCOPENEDITORTOOLBARINITIALSTEP, ID_PLCOPENEDITORTOOLBARSTEP, ID_PLCOPENEDITORTOOLBARTRANSITION, ID_PLCOPENEDITORTOOLBARACTIONBLOCK, ID_PLCOPENEDITORTOOLBARDIVERGENCE, - ID_PLCOPENEDITORTOOLBARJUMP, -] = [wx.NewId() for _init_coll_DefaultToolBar_Items in range(17)] + ID_PLCOPENEDITORTOOLBARJUMP, ID_PLCOPENEDITORTOOLBARMOTION, +] = [wx.NewId() for _init_coll_DefaultToolBar_Items in range(18)] # Define behaviour of each Toolbar item according to current POU body type # Informations meaning are in this order: @@ -167,6 +167,9 @@ # - Item tooltip text ToolBarItems = { "FBD" : [(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, + ID_PLCOPENEDITORTOOLBARMOTION, "OnMotionTool", + "move.png", _("Move the view")), + (True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, ID_PLCOPENEDITORTOOLBARCOMMENT, "OnCommentTool", "add_comment.png", _("Create a new comment")), (True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, @@ -178,7 +181,10 @@ (True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, ID_PLCOPENEDITORTOOLBARCONNECTION, "OnConnectionTool", "add_connection.png", _("Create a new connection"))], - "LD" : [(True, FREEDRAWING_MODE, + "LD" : [((True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, + ID_PLCOPENEDITORTOOLBARMOTION, "OnMotionTool", + "move.png", _("Move the view")), + True, FREEDRAWING_MODE, ID_PLCOPENEDITORTOOLBARCOMMENT, "OnCommentTool", "add_comment.png", _("Create a new comment")), (True, FREEDRAWING_MODE, @@ -205,7 +211,10 @@ (True, FREEDRAWING_MODE, ID_PLCOPENEDITORTOOLBARCONNECTION, "OnConnectionTool", "add_connection.png", _("Create a new connection"))], - "SFC" : [(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, + "SFC" : [(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, + ID_PLCOPENEDITORTOOLBARMOTION, "OnMotionTool", + "move.png", _("Move the view")), + (True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, ID_PLCOPENEDITORTOOLBARCOMMENT, "OnCommentTool", "add_comment.png", _("Create a new comment")), (True, FREEDRAWING_MODE|DRIVENDRAWING_MODE, @@ -595,8 +604,8 @@ wx.Bitmap(os.path.join(CWD, 'Images', 'select.png')), wx.NullBitmap, _("Select an object")) self.ToolBar.Realize() - self.Bind(wx.EVT_TOOL, self.OnSelectionTool, - id=ID_PLCOPENEDITORTOOLBARSELECTION) + self.Bind(wx.EVT_TOOL, self.OnSelectionTool, + id=ID_PLCOPENEDITORTOOLBARSELECTION) self.VariablePanelIndexer = VariablePanelIndexer(self.BottomNoteBook, self) self.BottomNoteBook.AddPage(self.VariablePanelIndexer, _("Variables")) @@ -2083,43 +2092,42 @@ selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).SetMode(MODE_SELECTION) - event.Skip() + + def OnMotionTool(self, event): + selected = self.TabsOpened.GetSelection() + if selected != -1: + self.TabsOpened.GetPage(selected).SetMode(MODE_MOTION) def OnCommentTool(self, event): self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARCOMMENT) selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).SetMode(MODE_COMMENT) - event.Skip() def OnVariableTool(self, event): self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARVARIABLE) selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).SetMode(MODE_VARIABLE) - event.Skip() def OnBlockTool(self, event): self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARBLOCK) selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).SetMode(MODE_BLOCK) - event.Skip() def OnConnectionTool(self, event): self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARCONNECTION) selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).SetMode(MODE_CONNECTION) - event.Skip() - + def OnPowerRailTool(self, event): self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARPOWERRAIL) selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).SetMode(MODE_POWERRAIL) - event.Skip() - + def OnRungTool(self, event): selected = self.TabsOpened.GetSelection() if selected != -1: @@ -2142,20 +2150,17 @@ self.TabsOpened.GetPage(selected).SetMode(MODE_CONTACT) else: self.TabsOpened.GetPage(selected).AddLadderContact() - event.Skip() def OnBranchTool(self, event): selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).AddLadderBranch() - event.Skip() def OnInitialStepTool(self, event): self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARINITIALSTEP) selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).SetMode(MODE_INITIALSTEP) - event.Skip() def OnStepTool(self, event): if self.GetDrawingMode() == FREEDRAWING_MODE: @@ -2166,8 +2171,7 @@ self.TabsOpened.GetPage(selected).SetMode(MODE_STEP) else: self.TabsOpened.GetPage(selected).AddStep() - event.Skip() - + def OnActionBlockTool(self, event): if self.GetDrawingMode() == FREEDRAWING_MODE: self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARACTIONBLOCK) @@ -2177,15 +2181,13 @@ self.TabsOpened.GetPage(selected).SetMode(MODE_ACTION) else: self.TabsOpened.GetPage(selected).AddStepAction() - event.Skip() - + def OnTransitionTool(self, event): self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARTRANSITION) selected = self.TabsOpened.GetSelection() if selected != -1: self.TabsOpened.GetPage(selected).SetMode(MODE_TRANSITION) - event.Skip() - + def OnDivergenceTool(self, event): if self.GetDrawingMode() == FREEDRAWING_MODE: self.ResetToolToggle(ID_PLCOPENEDITORTOOLBARDIVERGENCE) @@ -2195,7 +2197,6 @@ self.TabsOpened.GetPage(selected).SetMode(MODE_DIVERGENCE) else: self.TabsOpened.GetPage(selected).AddDivergence() - event.Skip() def OnJumpTool(self, event): if self.GetDrawingMode() == FREEDRAWING_MODE: @@ -2206,8 +2207,7 @@ self.TabsOpened.GetPage(selected).SetMode(MODE_JUMP) else: self.TabsOpened.GetPage(selected).AddJump() - event.Skip() - + #------------------------------------------------------------------------------- # Add Project Elements Functions