plcopeneditor_history: comparison Viewer.py

equal deleted inserted replaced

-:b67a5de5a24a
+:4fb225afddf4
 wx.TextDropTarget.__init__(self)
 self.ParentWindow = parent
 def OnDropText(self, x, y, data):
 x, y = self.ParentWindow.CalcUnscrolledPosition(x, y)
+scaling = self.ParentWindow.Scaling
 values = eval(data)
 if values[1] == "program":
 message = wx.MessageDialog(self.ParentWindow, "Programs can't be used by other POUs!", "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 if dialog.ShowModal():
 blockname = dialog.GetValue()
 dialog.Destroy()
 id = self.ParentWindow.GetNewId()
 block = FBD_Block(self.ParentWindow, values[0], blockname, id)
+width, height = block.GetMinSize()
+if scaling is not None:
+x = round(float(x) / float(scaling[0])) * scaling[0]
+y = round(float(y) / float(scaling[1])) * scaling[1]
+width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0]
+height = round(float(height) / float(scaling[1]) + 0.5) * scaling[1]
 block.SetPosition(x, y)
-width, height = block.GetMinSize()
 block.SetSize(width, height)
 self.ParentWindow.AddBlock(block)
 self.ParentWindow.Controler.AddEditedElementBlock(self.ParentWindow.GetTagName(), id, values[0], blockname)
 self.ParentWindow.RefreshBlockModel(block)
 self.ParentWindow.RefreshBuffer()
 self.ParentWindow.RefreshScrollBars()
-self.ParentWindow.ParentWindow.RefreshVariablePanel(self.TagName)
+self.ParentWindow.ParentWindow.RefreshVariablePanel(self.ParentWindow.GetTagName())
 self.ParentWindow.Refresh()
 elif values[1] != "location":
 if values[3] == self.ParentWindow.GetTagName():
 id = self.ParentWindow.GetNewId()
 if values[1] == "Output":
 elif values[1] == "InOut":
 var_type = INPUT
 else:
 var_type = INPUT
 variable = FBD_Variable(self.ParentWindow, var_type, values[0], values[2], id)
+width, height = variable.GetMinSize()
+if scaling is not None:
+x = round(float(x) / float(scaling[0])) * scaling[0]
+y = round(float(y) / float(scaling[1])) * scaling[1]
+width = round(float(width) / float(scaling[0]) + 0.5) * scaling[0]
+height = round(float(height) / float(scaling[1]) + 0.5) * scaling[1]
 variable.SetPosition(x, y)
-width, height = variable.GetMinSize()
 variable.SetSize(width, height)
 self.ParentWindow.AddBlock(variable)
-self.ParentWindow.Controler.AddEditedElementVariable(self.ParentWindow.TagName, id, var_type)
+self.ParentWindow.Controler.AddEditedElementVariable(self.ParentWindow.GetTagName(), id, var_type)
 self.ParentWindow.RefreshVariableModel(variable)
 self.ParentWindow.RefreshBuffer()
 self.ParentWindow.RefreshScrollBars()
 self.ParentWindow.Refresh()
 else:
 # Adding a rubberband to Viewer
 self.rubberBand = RubberBand(drawingSurface=self)
 self.SetBackgroundColour(wx.Colour(255,255,255))
 self.ResetView()
 self.Scaling = None
-#self.Scaling = (8, 8)
 self.DrawGrid = True
+self.GridBrush = wx.TRANSPARENT_BRUSH
 self.DrawingWire = False
 self.current_id = 0
 self.TagName = tagname
 # Initialize Block, Wire and Comment numbers
 # Link Viewer event to corresponding methods
 self.Bind(wx.EVT_PAINT, self.OnPaint)
 self.Bind(wx.EVT_LEFT_DOWN, self.OnViewerLeftDown)
 self.Bind(wx.EVT_LEFT_UP, self.OnViewerLeftUp)
 self.Bind(wx.EVT_LEFT_DCLICK, self.OnViewerLeftDClick)
+self.Bind(wx.EVT_RIGHT_DOWN, self.OnViewerRightDown)
 self.Bind(wx.EVT_RIGHT_UP, self.OnViewerRightUp)
 self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeaveViewer)
 self.Bind(wx.EVT_MOTION, self.OnViewerMotion)
 self.Bind(wx.EVT_CHAR, self.OnChar)
 self.Bind(wx.EVT_SCROLLWIN, self.OnMoveWindow)
 self.Bind(wx.EVT_SIZE, self.OnMoveWindow)
 def GetScrolledRect(self, rect):
 rect.x, rect.y = self.CalcScrolledPosition(rect.x, rect.y)
 return rect
+def GetScaling(self):
+return self.Scaling
 def SetTagName(self, tagname):
 self.TagName = tagname
 def GetTagName(self):
 def RefreshBuffer(self):
 self.Controler.BufferProject()
 self.ParentWindow.RefreshTitle()
 self.ParentWindow.RefreshEditMenu()
+# Refresh the current scaling
+def RefreshScaling(self, refresh=True):
+properties = self.Controler.GetProjectProperties()
+scaling = properties["scaling"][self.CurrentLanguage]
+if scaling != (0, 0):
+self.Scaling = scaling
+if self.DrawGrid:
+bitmap = wx.EmptyBitmap(*scaling)
+dc = wx.MemoryDC(bitmap)
+dc.SetBackground(wx.Brush(self.GetBackgroundColour()))
+dc.Clear()
+dc.SetPen(wx.Pen(wx.Colour(180, 180, 180)))
+dc.DrawPoint(0, 0)
+self.GridBrush = wx.BrushFromBitmap(bitmap)
+else:
+self.GridBrush = wx.TRANSPARENT_BRUSH
+else:
+self.Scaling = None
+self.GridBrush = wx.TRANSPARENT_BRUSH
+if refresh:
+self.Refresh()
 #-------------------------------------------------------------------------------
 #                          Refresh functions
 #-------------------------------------------------------------------------------
 def ResetBuffer(self):
 contact_type = CONTACT_FALLING
 else:
 contact_type = CONTACT_NORMAL
 contact = LD_Contact(self, contact_type, instance["name"], instance["id"])
 contact.SetPosition(instance["x"], instance["y"])
+contact.SetSize(instance["width"], instance["height"])
 self.AddBlock(contact)
 connectors = contact.GetConnectors()
 connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"]))
 self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids)
 connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"]))
 coil_type = COIL_RESET
 else:
 coil_type = COIL_NORMAL
 coil = LD_Coil(self, coil_type, instance["name"], instance["id"])
 coil.SetPosition(instance["x"], instance["y"])
+coil.SetSize(instance["width"], instance["height"])
 self.AddBlock(coil)
 connectors = coil.GetConnectors()
 connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"]))
 self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids)
 connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"]))
 if connectors["action"]:
 connectors["action"].SetPosition(wx.Point(*instance["connectors"]["action"]["position"]))
 elif instance["type"] == "transition":
 transition = SFC_Transition(self, instance["condition_type"], instance["condition"], instance["priority"], instance["id"])
 transition.SetPosition(instance["x"], instance["y"])
+transition.SetSize(instance["width"], instance["height"])
 self.AddBlock(transition)
 connectors = transition.GetConnectors()
 connectors["input"].SetPosition(wx.Point(*instance["connectors"]["input"]["position"]))
 self.CreateWires(connectors["input"], instance["connectors"]["input"]["links"], ids)
 connectors["output"].SetPosition(wx.Point(*instance["connectors"]["output"]["position"]))
 connector = connectors["outputs"][i]
 connector.SetPosition(wx.Point(*output_connector["position"]))
 elif instance["type"] == "jump":
 jump = SFC_Jump(self, instance["target"], instance["id"])
 jump.SetPosition(instance["x"], instance["y"])
+jump.SetSize(instance["width"], instance["height"])
 self.AddBlock(jump)
 connector = jump.GetConnector()
 connector.SetPosition(wx.Point(*instance["connector"]["position"]))
 self.CreateWires(connector, instance["connector"]["links"], ids)
 elif instance["type"] == "actionBlock":
 def OnAlignLeftMenu(self, event):
 if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group):
 self.SelectedElement.AlignElements(ALIGN_LEFT, None)
 self.RefreshBuffer()
+self.Refresh()
 event.Skip()
 def OnAlignCenterMenu(self, event):
 if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group):
 self.SelectedElement.AlignElements(ALIGN_CENTER, None)
 self.RefreshBuffer()
+self.Refresh()
 event.Skip()
 def OnAlignRightMenu(self, event):
 if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group):
 self.SelectedElement.AlignElements(ALIGN_RIGHT, None)
 self.RefreshBuffer()
+self.Refresh()
 event.Skip()
 def OnAlignTopMenu(self, event):
 if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group):
 self.SelectedElement.AlignElements(None, ALIGN_TOP)
 self.RefreshBuffer()
+self.Refresh()
 event.Skip()
 def OnAlignMiddleMenu(self, event):
 if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group):
 self.SelectedElement.AlignElements(None, ALIGN_MIDDLE)
 self.RefreshBuffer()
+self.Refresh()
 event.Skip()
 def OnAlignBottomMenu(self, event):
 if self.SelectedElement and isinstance(self.SelectedElement, Graphic_Group):
 self.SelectedElement.AlignElements(None, ALIGN_BOTTOM)
 self.RefreshBuffer()
+self.Refresh()
 event.Skip()
 def OnNoModifierMenu(self, event):
 if self.SelectedElement and self.IsBlock(self.SelectedElement):
 self.SelectedElement.SetConnectorNegated(False)
 elif len(elements) == 1:
 self.SelectedElement = elements[0]
 self.SelectedElement.SetSelected(True)
 else:
 element = self.FindElement(pos)
-connector = self.FindBlockConnector(pos)
+if element is None or element.TestHandle(pos) == (0, 0):
+connector = self.FindBlockConnector(pos)
+else:
+connector = None
 if self.DrawingWire:
 self.DrawingWire = False
 if connector:
 event.Dragging = lambda : True
 self.SelectedElement.OnMotion(event, self.GetLogicalDC(), self.Scaling)
 element = self.SelectedElement
 self.RefreshBuffer()
 else:
 rect = self.SelectedElement.GetRedrawRect()
 self.SelectedElement.Delete()
+self.SelectedElement = None
 element = None
 self.RefreshRect(self.GetScrolledRect(rect))
 elif connector:
 self.DrawingWire = True
 pos = GetScaledEventPosition(event, self.GetLogicalDC(), self.Scaling)
 wire = Wire(self, [wx.Point(pos.x, pos.y), EAST], [wx.Point(pos.x, pos.y), WEST])
 else:
 wire = Wire(self, [wx.Point(pos.x, pos.y), WEST], [wx.Point(pos.x, pos.y), EAST])
 wire.oldPos = pos
 wire.Handle = (HANDLE_POINT, 0)
-wire.ProcessDragging(0, 0)
+wire.ProcessDragging(0, 0, self.Scaling)
 wire.Handle = (HANDLE_POINT, 1)
 self.AddWire(wire)
 if self.SelectedElement:
 self.SelectedElement.SetSelected(False)
 self.SelectedElement = wire
 if self.DrawingWire:
 pos = event.GetLogicalPosition(dc)
 connector = self.FindBlockConnector(pos)
 if self.SelectedElement.EndConnected is not None:
 self.DrawingWire = False
+self.SelectedElement.StartConnected.HighlightParentBlock(False)
+self.SelectedElement.EndConnected.HighlightParentBlock(False)
 self.SelectedElement.ResetPoints()
 self.SelectedElement.OnMotion(event, dc, self.Scaling)
 self.SelectedElement.GeneratePoints()
 self.SelectedElement.RefreshModel()
+if self.HighlightedElement is not None:
+self.HighlightedElement.SetHighlighted(False)
+self.HighlightedElement = None
+self.SelectedElement.SetHighlighted(True)
+self.HighlightedElement = self.SelectedElement
 self.SelectedElement.SetSelected(True)
 self.RefreshBuffer()
 elif connector is None or self.SelectedElement.GetDragging():
 self.DrawingWire = False
 rect = self.SelectedElement.GetRedrawRect()
 self.SelectedElement.Refresh()
 if self.Mode != MODE_SELECTION and not self.SavedMode:
 wx.CallAfter(self.ParentWindow.ResetCurrentMode)
 event.Skip()
+def OnViewerRightDown(self, event):
+if self.Mode == MODE_SELECTION:
+dc = self.GetLogicalDC()
+pos = event.GetLogicalPosition(dc)
+element = self.FindElement(pos)
+if self.SelectedElement and self.SelectedElement != element:
+self.SelectedElement.SetSelected(False)
+self.SelectedElement = None
+if element:
+self.SelectedElement = element
+self.SelectedElement.OnRightDown(event, dc, self.Scaling)
+self.SelectedElement.Refresh()
+event.Skip()
 def OnViewerRightUp(self, event):
 dc = self.GetLogicalDC()
-pos = event.GetLogicalPosition(dc)
+if self.SelectedElement:
-element = self.FindElement(pos)
+self.SelectedElement.OnRightUp(event, dc, self.Scaling)
-if element:
-if self.SelectedElement and self.SelectedElement != element:
-self.SelectedElement.SetSelected(False)
-self.SelectedElement = element
-self.SelectedElement.SetSelected(True)
-self.SelectedElement.OnRightUp(event, self.GetLogicalDC(), self.Scaling)
 wx.CallAfter(self.SetCursor, wx.NullCursor)
+self.SelectedElement.Refresh()
 else:
 self.PopupDefaultMenu(False)
 event.Skip()
 def OnViewerLeftDClick(self, event):
 dc = self.GetLogicalDC()
 pos = GetScaledEventPosition(event, dc, self.Scaling)
 if not event.Dragging():
 highlighted = self.FindElement(pos)
 if self.HighlightedElement is not None and self.HighlightedElement != highlighted:
-rect = self.HighlightedElement.GetRedrawRect()
 self.HighlightedElement.SetHighlighted(False)
 self.HighlightedElement = None
 if highlighted is not None and self.HighlightedElement != highlighted:
 highlighted.SetHighlighted(True)
 self.HighlightedElement = highlighted
 #-------------------------------------------------------------------------------
 #                          Model adding functions
 #-------------------------------------------------------------------------------
+def GetScaledSize(self, width, height):
+if self.Scaling is not None:
+width = round(float(width) / float(self.Scaling[0]) + 0.4) * self.Scaling[0]
+height = round(float(height) / float(self.Scaling[1]) + 0.4) * self.Scaling[1]
+return width, height
 def AddNewBlock(self, bbox):
 dialog = BlockPropertiesDialog(self.ParentWindow)
 dialog.SetBlockList(self.Controler.GetBlockTypes(self.TagName))
 dialog.SetPouNames(self.Controler.GetProjectPouNames())
 dialog.SetPouElementNames(self.Controler.GetEditedElementVariables(self.TagName))
 if "name" in values:
 block = FBD_Block(self, values["type"], values["name"], id, values["extension"], values["inputs"])
 else:
 block = FBD_Block(self, values["type"], "", id, values["extension"], values["inputs"])
 block.SetPosition(bbox.x, bbox.y)
-block.SetSize(values["width"], values["height"])
+block.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 self.AddBlock(block)
 self.Controler.AddEditedElementBlock(self.TagName, id, values["type"], values.get("name", None))
 self.RefreshBlockModel(block)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 if dialog.ShowModal() == wx.ID_OK:
 id = self.GetNewId()
 values = dialog.GetValues()
 variable = FBD_Variable(self, values["type"], values["name"], values["value_type"], id)
 variable.SetPosition(bbox.x, bbox.y)
-variable.SetSize(values["width"], values["height"])
+variable.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 self.AddBlock(variable)
 self.Controler.AddEditedElementVariable(self.TagName, id, values["type"])
 self.RefreshVariableModel(variable)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 if dialog.ShowModal() == wx.ID_OK:
 id = self.GetNewId()
 values = dialog.GetValues()
 connection = FBD_Connector(self, values["type"], values["name"], id)
 connection.SetPosition(bbox.x, bbox.y)
-connection.SetSize(values["width"], values["height"])
+connection.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 self.AddBlock(connection)
 self.Controler.AddEditedElementConnection(self.TagName, id, values["type"])
 self.RefreshConnectionModel(connection)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 value = dialog.GetValue()
 id = self.GetNewId()
 comment = Comment(self, value, id)
 comment.SetPosition(bbox.x, bbox.y)
 min_width, min_height = comment.GetMinSize()
-comment.SetSize(max(min_width,bbox.width),max(min_height,bbox.height))
+comment.SetSize(*self.GetScaledSize(max(min_width,bbox.width),max(min_height,bbox.height)))
 self.AddComment(comment)
 self.Controler.AddEditedElementComment(self.TagName, id)
 self.RefreshCommentModel(comment)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 if dialog.ShowModal() == wx.ID_OK:
 id = self.GetNewId()
 values = dialog.GetValues()
 contact = LD_Contact(self, values["type"], values["name"], id)
 contact.SetPosition(bbox.x, bbox.y)
-contact.SetSize(values["width"], values["height"])
+contact.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 self.AddBlock(contact)
 self.Controler.AddEditedElementContact(self.TagName, id)
 self.RefreshContactModel(contact)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 if dialog.ShowModal() == wx.ID_OK:
 id = self.GetNewId()
 values = dialog.GetValues()
 coil = LD_Coil(self, values["type"], values["name"], id)
 coil.SetPosition(bbox.x, bbox.y)
-coil.SetSize(values["width"], values["height"])
+coil.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 self.AddBlock(coil)
 self.Controler.AddEditedElementCoil(self.TagName, id)
 self.RefreshCoilModel(coil)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 if dialog.ShowModal() == wx.ID_OK:
 id = self.GetNewId()
 values = dialog.GetValues()
 powerrail = LD_PowerRail(self, values["type"], id, [True for i in xrange(values["number"])])
 powerrail.SetPosition(bbox.x, bbox.y)
-powerrail.SetSize(values["width"], values["height"])
+powerrail.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 self.AddBlock(powerrail)
 self.Controler.AddEditedElementPowerRail(self.TagName, id, values["type"])
 self.RefreshPowerRailModel(powerrail)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 step.AddAction()
 else:
 step.RemoveAction()
 step.SetPosition(bbox.x, bbox.y)
 min_width, min_height = step.GetMinSize()
-step.SetSize(max(bbox.width, min_width), max(bbox.height, min_height))
+step.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height)))
 self.AddBlock(step)
 self.Controler.AddEditedElementStep(self.TagName, id)
 self.RefreshStepModel(step)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 id = self.GetNewId()
 values = dialog.GetValues()
 transition = SFC_Transition(self, values["type"], values["value"], values["priority"], id)
 transition.SetPosition(bbox.x, bbox.y)
 min_width, min_height = transition.GetMinSize()
-transition.SetSize(max(bbox.width, min_width), max(bbox.height, min_height))
+transition.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height)))
 self.AddBlock(transition)
 self.Controler.AddEditedElementTransition(self.TagName, id)
 self.RefreshTransitionModel(transition)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 id = self.GetNewId()
 values = dialog.GetValues()
 divergence = SFC_Divergence(self, values["type"], values["number"], id)
 divergence.SetPosition(bbox.x, bbox.y)
 min_width, min_height = divergence.GetMinSize(True)
-divergence.SetSize(max(bbox.width, min_width), max(bbox.height, min_height))
+divergence.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height)))
 self.AddBlock(divergence)
 self.Controler.AddEditedElementDivergence(self.TagName, id, values["type"])
 self.RefreshDivergenceModel(divergence)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 id = self.GetNewId()
 value = dialog.GetStringSelection()
 jump = SFC_Jump(self, value, id)
 jump.SetPosition(bbox.x, bbox.y)
 min_width, min_height = jump.GetMinSize()
-jump.SetSize(max(bbox.width, min_width), max(bbox.height, min_height))
+jump.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height)))
 self.AddBlock(jump)
 self.Controler.AddEditedElementJump(self.TagName, id)
 self.RefreshJumpModel(jump)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 actions = dialog.GetValues()
 id = self.GetNewId()
 actionblock = SFC_ActionBlock(self, actions, id)
 actionblock.SetPosition(bbox.x, bbox.y)
 min_width, min_height = actionblock.GetMinSize()
-actionblock.SetSize(max(bbox.width, min_width), max(bbox.height, min_height))
+actionblock.SetSize(*self.GetScaledSize(max(bbox.width, min_width), max(bbox.height, min_height)))
 self.AddBlock(actionblock)
 self.Controler.AddEditedElementActionBlock(self.TagName, id)
 self.RefreshActionBlockModel(actionblock)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 dialog.SetValues(old_values)
 if dialog.ShowModal() == wx.ID_OK:
 new_values = dialog.GetValues()
 if "name" in new_values:
 block.SetName(new_values["name"])
-block.SetSize(new_values["width"], new_values["height"])
+block.SetSize(*self.GetScaledSize(new_values["width"], new_values["height"]))
 block.SetType(new_values["type"], new_values["extension"])
 block.SetExecutionOrder(new_values["executionOrder"])
 self.RefreshBlockModel(block)
 if old_values["executionOrder"] != new_values["executionOrder"]:
 self.RefreshView()
 dialog.SetValues(old_values)
 if dialog.ShowModal() == wx.ID_OK:
 new_values = dialog.GetValues()
 variable.SetName(new_values["name"])
 variable.SetType(new_values["type"], new_values["value_type"])
-variable.SetSize(new_values["width"], new_values["height"])
+variable.SetSize(*self.GetScaledSize(new_values["width"], new_values["height"]))
 variable.SetExecutionOrder(new_values["executionOrder"])
 if old_values["type"] != new_values["type"]:
 id = variable.GetId()
 self.Controler.RemoveEditedElementInstance(self.TagName, id)
 self.Controler.AddEditedElementVariable(self.TagName, id, new_values["type"])
 if dialog.ShowModal() == wx.ID_OK:
 old_type = connection.GetType()
 values = dialog.GetValues()
 connection.SetName(values["name"])
 connection.SetType(values["type"])
-connection.SetSize(values["width"], values["height"])
+connection.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 if old_type != values["type"]:
 id = connection.GetId()
 self.Controler.RemoveEditedElementInstance(self.TagName, id)
 self.Controler.AddEditedElementConnection(self.TagName, id, values["type"])
 self.RefreshConnectionModel(connection)
 dialog.SetElementSize(contact.GetSize())
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 contact.SetName(values["name"])
 contact.SetType(values["type"])
-contact.SetSize(values["width"], values["height"])
+contact.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 self.RefreshContactModel(contact)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 contact.Refresh()
 dialog.Destroy()
 dialog.SetElementSize(coil.GetSize())
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 coil.SetName(values["name"])
 coil.SetType(values["type"])
-coil.SetSize(values["width"], values["height"])
+coil.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 self.RefreshCoilModel(coil)
 self.RefreshBuffer()
 self.RefreshScrollBars()
 coil.Refresh()
 dialog.Destroy()
 dialog.SetMinSize(powerrail.GetSize())
 if dialog.ShowModal() == wx.ID_OK:
 old_type = powerrail.GetType()
 values = dialog.GetValues()
 powerrail.SetType(values["type"], [True for i in xrange(values["number"])])
-powerrail.SetSize(values["width"], values["height"])
+powerrail.SetSize(*self.GetScaledSize(values["width"], values["height"]))
 if old_type != values["type"]:
 id = powerrail.GetId()
 self.Controler.RemoveEditedElementInstance(self.TagName, id)
 self.Controler.AddEditedElementPowerRail(self.TagName, id, values["type"])
 self.RefreshPowerRailModel(powerrail)
 step.RemoveOutput()
 if values["action"]:
 step.AddAction()
 else:
 step.RemoveAction()
-step.UpdateSize(values["width"], values["height"])
+step.UpdateSize(*self.GetScaledSize(values["width"], values["height"]))
 step.RefreshModel()
 self.RefreshBuffer()
 self.RefreshScrollBars()
 step.Refresh()
 dialog.SetVariableList(self.Controler.GetEditedElementInterfaceVars(self.TagName))
 dialog.SetValues(actionblock.GetActions())
 if dialog.ShowModal() == wx.ID_OK:
 actions = dialog.GetValues()
 actionblock.SetActions(actions)
+actionblock.SetSize(*self.GetScaledSize(*actionblock.GetSize()))
 actionblock.RefreshModel()
 self.RefreshBuffer()
 self.RefreshScrollBars()
 actionblock.Refresh()
 dialog.Destroy()
 else:
 dialog = wx.TextEntryDialog(self.ParentWindow, "Edit comment", "Please enter comment text", comment.GetContent(), wx.OK|wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 value = dialog.GetValue()
 comment.SetContent(value)
+comment.SetSize(*self.GetScaledSize(*comment.GetSize()))
 comment.RefreshModel()
 self.RefreshBuffer()
 self.RefreshScrollBars()
 comment.Refresh()
 dialog.Destroy()
 def RefreshBlockModel(self, block):
 blockid = block.GetId()
 infos = {}
 infos["type"] = block.GetType()
 infos["name"] = block.GetName()
-infos["executionOrder"] = block.GetExecutionOrder()
+if self.CurrentLanguage == "FBD":
+infos["executionOrder"] = block.GetExecutionOrder()
 infos["x"], infos["y"] = block.GetPosition()
 infos["width"], infos["height"] = block.GetSize()
 infos["connectors"] = block.GetConnectors()
 self.Controler.SetEditedElementBlockInfos(self.TagName, blockid, infos)
 def RefreshVariableModel(self, variable):
 variableid = variable.GetId()
 infos = {}
 infos["name"] = variable.GetName()
-infos["executionOrder"] = variable.GetExecutionOrder()
+if self.CurrentLanguage == "FBD":
+infos["executionOrder"] = variable.GetExecutionOrder()
 infos["x"], infos["y"] = variable.GetPosition()
 infos["width"], infos["height"] = variable.GetSize()
 infos["connectors"] = variable.GetConnectors()
 self.Controler.SetEditedElementVariableInfos(self.TagName, variableid, infos)
 def RefreshConnectionModel(self, connection):
 connectionid = connection.GetId()
 infos = {}
 infos["name"] = connection.GetName()
-infos["executionOrder"] = connection.GetExecutionOrder()
 infos["x"], infos["y"] = connection.GetPosition()
 infos["width"], infos["height"] = connection.GetSize()
 infos["connector"] = connection.GetConnector()
 self.Controler.SetEditedElementConnectionInfos(self.TagName, connectionid, infos)
 self.RefreshScrollBars()
 event.Skip()
 def OnPaint(self, event):
 dc = self.GetLogicalDC(True)
+dc.SetBackground(wx.Brush(self.GetBackgroundColour()))
 dc.Clear()
-dc.SetPen(wx.Pen(wx.Colour(230, 230, 230)))
 dc.BeginDrawing()
 if self.Scaling and self.DrawGrid:
-width, height = dc.GetSize()
+dc.SetPen(wx.TRANSPARENT_PEN)
-for i in xrange(1, width / self.Scaling[0] + 1):
+dc.SetBrush(self.GridBrush)
-dc.DrawLine(i * self.Scaling[0], 0, i * self.Scaling[0], height)
+width, height = self.GetVirtualSize()
-for i in xrange(1, height / self.Scaling[1] + 1):
+dc.DrawRectangle(0, 0, width, height)
-dc.DrawLine(0, i * self.Scaling[1], width, i * self.Scaling[1])
 # Draw all elements
 for comment in self.Comments:
 if comment != self.SelectedElement:
 comment.Draw(dc)

changeset 145	4fb225afddf4
parent 144	b67a5de5a24a
child 154	203c4acdaf27