editors/SFCViewer.py
changeset 1872 866fb3ab8778
parent 1865 0bd5b3099144
child 2414 7fad75e5e63d
equal deleted inserted replaced
1871:933fbe9a5e2c 1872:866fb3ab8778
   282                 self.SelectedElement.SetSelectedSegment(0)
   282                 self.SelectedElement.SetSelectedSegment(0)
   283             else:
   283             else:
   284                 self.SelectedElement.OnLeftUp(event, self.GetLogicalDC(), self.Scaling)
   284                 self.SelectedElement.OnLeftUp(event, self.GetLogicalDC(), self.Scaling)
   285                 self.SelectedElement.Refresh()
   285                 self.SelectedElement.Refresh()
   286             wx.CallAfter(self.SetCurrentCursor, 0)
   286             wx.CallAfter(self.SetCurrentCursor, 0)
   287         elif self.Mode == MODE_WIRE and self.SelectedElement:
   287         #
   288             self.SelectedElement.ResetPoints()
   288         # FIXME:
   289             self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling)
   289         # This code was forgotten by commit
   290             self.SelectedElement.GeneratePoints()
   290         # 9c74d00ce93e from plcopeneditor_history repository
   291             self.SelectedElement.RefreshModel()
   291         # 'Last bugs on block and wire moving, resizing with cursor fixed'
   292             self.SelectedElement.SetSelected(True)
   292         #
       
   293         # elif self.Mode == MODE_WIRE and self.SelectedElement:
       
   294         #     self.SelectedElement.ResetPoints()
       
   295         #     self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling)
       
   296         #     self.SelectedElement.GeneratePoints()
       
   297         #     self.SelectedElement.RefreshModel()
       
   298         #     self.SelectedElement.SetSelected(True)
   293         event.Skip()
   299         event.Skip()
   294 
   300 
   295     def OnViewerRightUp(self, event):
   301     def OnViewerRightUp(self, event):
   296         if self.GetDrawingMode() == FREEDRAWING_MODE:
   302         if self.GetDrawingMode() == FREEDRAWING_MODE:
   297             Viewer.OnViewerRightUp(self, event)
   303             Viewer.OnViewerRightUp(self, event)
   326                 self.rubberBand.OnMotion(event, self.GetLogicalDC(), self.Scaling)
   332                 self.rubberBand.OnMotion(event, self.GetLogicalDC(), self.Scaling)
   327             elif self.Mode == MODE_SELECTION and self.SelectedElement:
   333             elif self.Mode == MODE_SELECTION and self.SelectedElement:
   328                 if not self.IsWire(self.SelectedElement) and not isinstance(self.SelectedElement, Graphic_Group):
   334                 if not self.IsWire(self.SelectedElement) and not isinstance(self.SelectedElement, Graphic_Group):
   329                     self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling)
   335                     self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling)
   330                     self.SelectedElement.Refresh()
   336                     self.SelectedElement.Refresh()
   331             elif self.Mode == MODE_WIRE and self.SelectedElement:
   337             #
   332                 self.SelectedElement.ResetPoints()
   338             # FIXME:
   333                 self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling)
   339             # This code was forgotten by commit
   334                 self.SelectedElement.GeneratePoints()
   340             # 9c74d00ce93e from plcopeneditor_history repository
   335                 self.SelectedElement.Refresh()
   341             # 'Last bugs on block and wire moving, resizing with cursor fixed'
       
   342             #
       
   343             # elif self.Mode == MODE_WIRE and self.SelectedElement:
       
   344             #     self.SelectedElement.ResetPoints()
       
   345             #     self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling)
       
   346             #     self.SelectedElement.GeneratePoints()
       
   347             #     self.SelectedElement.Refresh()
   336             self.UpdateScrollPos(event)
   348             self.UpdateScrollPos(event)
   337         event.Skip()
   349         event.Skip()
   338 
   350 
   339     def GetBlockName(self, block):
   351     def GetBlockName(self, block):
   340         blockName = block.__class__.__name__
   352         blockName = block.__class__.__name__