diff -r d51af006fa6b -r 64d8f52bc8c8 editors/SFCViewer.py --- a/editors/SFCViewer.py Fri Aug 11 15:18:19 2017 +0300 +++ b/editors/SFCViewer.py Mon Aug 14 19:13:01 2017 +0300 @@ -35,7 +35,7 @@ class SFC_Viewer(Viewer): - + SFC_StandardRules = { # The key of this dict is a block that user try to connect, # and the value is a list of blocks, that can be connected with the current block @@ -85,7 +85,7 @@ def __init__(self, parent, tagname, window, controler, debug = False, instancepath = ""): Viewer.__init__(self, parent, tagname, window, controler, debug, instancepath) self.CurrentLanguage = "SFC" - + def ConnectConnectors(self, start, end): startpoint = [start.GetPosition(False), start.GetDirection()] endpoint = [end.GetPosition(False), end.GetDirection()] @@ -96,7 +96,7 @@ wire.ConnectStartPoint(None, start) wire.ConnectEndPoint(None, end) return wire - + def CreateTransition(self, connector, next = None): previous = connector.GetParentBlock() id = self.GetNewId() @@ -124,7 +124,7 @@ next_block.RefreshPosition() transition.RefreshOutputModel(True) return transition - + def RemoveTransition(self, transition): connectors = transition.GetConnectors() input_wires = connectors["input"].GetWires() @@ -146,7 +146,7 @@ self.Controler.RemoveEditedElementInstance(self.TagName, transition.GetId()) wire = self.ConnectConnectors(next, previous) return wire - + def CreateStep(self, name, connector, next = None): previous = connector.GetParentBlock() id = self.GetNewId() @@ -289,7 +289,7 @@ self.SelectedElement.RefreshModel() self.SelectedElement.SetSelected(True) event.Skip() - + def OnViewerRightUp(self, event): if self.GetDrawingMode() == FREEDRAWING_MODE: Viewer.OnViewerRightUp(self, event) @@ -307,7 +307,7 @@ self.SelectedElement.Refresh() wx.CallAfter(self.SetCurrentCursor, 0) event.Skip() - + def OnViewerLeftDClick(self, event): if self.GetDrawingMode() == FREEDRAWING_MODE: Viewer.OnViewerLeftDClick(self, event) @@ -315,7 +315,7 @@ self.SelectedElement.OnLeftDClick(event, self.GetLogicalDC(), self.Scaling) self.Refresh(False) event.Skip() - + def OnViewerMotion(self, event): if self.GetDrawingMode() == FREEDRAWING_MODE: Viewer.OnViewerMotion(self, event) @@ -424,7 +424,7 @@ self.RefreshRect(self.GetScrolledRect(self.SelectedElement.GetRedrawRect(0, scaling[1])), False) else: event.Skip() - + #------------------------------------------------------------------------------- # Adding element functions #------------------------------------------------------------------------------- @@ -503,7 +503,7 @@ self.RefreshScrollBars() self.Refresh(False) dialog.Destroy() - + def AddStepAction(self): if isinstance(self.SelectedElement, SFC_Step): connectors = self.SelectedElement.GetConnectors() @@ -532,9 +532,9 @@ self.RefreshScrollBars() self.Refresh(False) dialog.Destroy() - + def AddDivergence(self): - if self.SelectedElement in self.Wires or isinstance(self.SelectedElement, Graphic_Group) or isinstance(self.SelectedElement, SFC_Step): + if self.SelectedElement in self.Wires or isinstance(self.SelectedElement, Graphic_Group) or isinstance(self.SelectedElement, SFC_Step): dialog = SFCDivergenceDialog(self.ParentWindow) dialog.SetPreviewFont(self.GetFont()) if dialog.ShowModal() == wx.ID_OK: @@ -729,7 +729,7 @@ self.RefreshScrollBars() self.Refresh(False) dialog.Destroy() - + def AddDivergenceBranch(self, divergence): if isinstance(divergence, SFC_Divergence): if self.GetDrawingMode() == FREEDRAWING_MODE: @@ -750,7 +750,7 @@ self.RefreshBuffer() self.RefreshScrollBars() self.Refresh(False) - + def RemoveDivergenceBranch(self, divergence): if isinstance(divergence, SFC_Divergence): if self.GetDrawingMode() == FREEDRAWING_MODE: @@ -759,15 +759,15 @@ self.RefreshBuffer() self.RefreshScrollBars() self.Refresh(False) - + def AddJump(self): if isinstance(self.SelectedElement, SFC_Step) and not self.SelectedElement.Output: choices = [] for block in self.Blocks: if isinstance(block, SFC_Step): choices.append(block.GetName()) - dialog = wx.SingleChoiceDialog(self.ParentWindow, - _("Add a new jump"), _("Please choose a target"), + dialog = wx.SingleChoiceDialog(self.ParentWindow, + _("Add a new jump"), _("Please choose a target"), choices, wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL) if dialog.ShowModal() == wx.ID_OK: value = dialog.GetStringSelection() @@ -884,7 +884,7 @@ self.DeleteDivergence(previous_block) else: self.RefreshDivergenceModel(previous_block) - + def DeleteTransition(self, transition): if self.GetDrawingMode() == FREEDRAWING_MODE: Viewer.DeleteTransition(self, transition) @@ -919,7 +919,7 @@ self.DeleteDivergence(next_block) else: self.RefreshDivergenceModel(next_block) - + def DeleteDivergence(self, divergence): if self.GetDrawingMode() == FREEDRAWING_MODE: Viewer.DeleteDivergence(self, divergence) @@ -979,7 +979,7 @@ next_pos = next.GetPosition(False) wire_size = GetWireSize(previous_block) previous_block.RefreshOutputPosition((0, previous_pos.y + wire_size - next_pos.y)) - wire.SetPoints([wx.Point(previous_pos.x, previous_pos.y + wire_size), + wire.SetPoints([wx.Point(previous_pos.x, previous_pos.y + wire_size), wx.Point(previous_pos.x, previous_pos.y)]) if isinstance(next_block, SFC_Divergence): next_block.RefreshPosition() @@ -1009,12 +1009,12 @@ next_pos = next.GetPosition(False) wire_size = GetWireSize(previous_block) previous_block.RefreshOutputPosition((previous_pos.x - next_pos.x, previous_pos.y + wire_size - next_pos.y)) - wire.SetPoints([wx.Point(previous_pos.x, previous_pos.y + wire_size), + wire.SetPoints([wx.Point(previous_pos.x, previous_pos.y + wire_size), wx.Point(previous_pos.x, previous_pos.y)]) if isinstance(next_block, SFC_Divergence): next_block.RefreshPosition() previous_block.RefreshOutputModel(True) - + def DeleteJump(self, jump): if self.GetDrawingMode() == FREEDRAWING_MODE: Viewer.DeleteJump(self, jump) @@ -1049,7 +1049,7 @@ self.DeleteDivergence(previous_block) else: previous_block.RefreshModel() - + def DeleteActionBlock(self, actionblock): if self.GetDrawingMode() == FREEDRAWING_MODE: Viewer.DeleteActionBlock(self, actionblock) @@ -1069,7 +1069,7 @@ self.RefreshStepModel(step) step.RefreshOutputPosition() step.RefreshOutputModel(True) - + def DeleteWire(self, wire): if self.GetDrawingMode() == FREEDRAWING_MODE: Viewer.DeleteWire(self, wire) @@ -1087,4 +1087,3 @@ infos["width"], infos["height"] = block.GetSize() infos["connectors"] = block.GetConnectors() self.Controler.SetEditedElementBlockInfos(self.TagName, blockid, infos) -