plcopeneditor_history: comparison graphics/GraphicCommons.py

equal deleted inserted replaced

-:f7df265edd54
+:d8425712acef
 #License along with this library; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 import wx
 from math import *
+from types import *
 #-------------------------------------------------------------------------------
 #                               Common constants
 #-------------------------------------------------------------------------------
 self.Selected = False
 self.Highlighted = False
 self.Pos = wx.Point(0, 0)
 self.Size = wx.Size(0, 0)
 self.BoundingBox = wx.Rect(0, 0, 0, 0)
+self.Visible = False
 self.CurrentCursor = 0
 ResetCursors()
+def TestVisible(self, screen):
+self.Visible = self.BoundingBox.Intersects(screen)
+def IsVisible(self):
+return self.Visible
+def SpreadCurrent(self):
+pass
 def IsOfType(self, type, reference):
 return self.Parent.IsOfType(type, reference)
 def IsEndType(self, type):
 # Destructor
 def __del__(self):
 self.Elements = []
+def IsVisible(self):
+for element in self.Elements:
+if element.IsVisible():
+return True
+return False
 # Refresh the list of wire excluded
 def RefreshWireExclusion(self):
 self.WireExcluded = []
 for element in self.Elements:
 if isinstance(element, Wire):
 self.Edge = edge
 else:
 self.Negated = False
 self.Edge = "none"
 self.OneConnected = onlyone
+self.Valid = True
+self.Value = None
 self.Pen = wx.BLACK_PEN
 self.Errors = {}
 self.RefreshNameSize()
+def Flush(self):
+self.ParentBlock = None
+for wire, handle in self.Wires:
+wire.Flush()
+self.Wires = []
 # Returns the RedrawRect
 def GetRedrawRect(self, movex = 0, movey = 0):
 parent_pos = self.ParentBlock.GetPosition()
 x = min(parent_pos[0] + self.Pos.x, parent_pos[0] + self.Pos.x + self.Direction[0] * CONNECTOR_SIZE)
 # Changes the connector name
 def SetName(self, name):
 self.Name = name
 self.RefreshNameSize()
-def SetValue(self, value):
+def RefreshValue(self):
+self.Value = self.ReceivingCurrent()
+def MarkAsInvalid(self):
+self.Valid = False
+def ReceivingCurrent(self):
+current = False
 for wire, handle in self.Wires:
-wire.SetValue(value)
+value = wire.GetValue()
+if isinstance(value, BooleanType):
+current |= wire.GetValue()
+return current
+def SpreadCurrent(self, spreading):
+for wire, handle in self.Wires:
+wire.SetValue(spreading)
 # Changes the connector name size
 def RefreshNameSize(self):
 if self.Name != "":
 dc = wx.ClientDC(self.ParentBlock.Parent)
 self.Negated = False
 # Tests if the point given is near from the end point of this connector
 def TestPoint(self, pt, direction = None, exclude = True):
 parent_pos = self.ParentBlock.GetPosition()
-if not (len(self.Wires) > 0 and self.OneConnected and exclude):
+if (not (len(self.Wires) > 0 and self.OneConnected and exclude) or self.Type == "BOOL")\
-if direction is None or self.Direction == direction:
+and direction is None or self.Direction == direction:
 # Calculate a square around the end point of this connector
 x = parent_pos[0] + self.Pos.x + self.Direction[0] * CONNECTOR_SIZE - ANCHOR_DISTANCE
 y = parent_pos[1] + self.Pos.y + self.Direction[1] * CONNECTOR_SIZE - ANCHOR_DISTANCE
 width = ANCHOR_DISTANCE * 2 + abs(self.Direction[0]) * CONNECTOR_SIZE
 height = ANCHOR_DISTANCE * 2 + abs(self.Direction[1]) * CONNECTOR_SIZE
 rect = wx.Rect(x, y, width, height)
 return rect.InsideXY(pt.x, pt.y)
 return False
 # Draws the highlightment of this element if it is highlighted
 def DrawHighlightment(self, dc):
 dc.SetPen(wx.Pen(HIGHLIGHTCOLOR))
 def Draw(self, dc):
 if len(self.Errors) > 0:
 dc.SetPen(wx.RED_PEN)
 dc.SetBrush(wx.Brush(wx.Colour(255, 255, 0)))
 else:
-dc.SetPen(self.Pen)
+if not self.Valid:
+dc.SetPen(wx.RED_PEN)
+elif isinstance(self.Value, BooleanType) and self.Value:
+dc.SetPen(wx.GREEN_PEN)
+else:
+dc.SetPen(self.Pen)
 dc.SetBrush(wx.WHITE_BRUSH)
 parent_pos = self.ParentBlock.GetPosition()
 if getattr(dc, "printing", False):
 name_size = dc.GetTextExtent(self.Name)
 self.Points = []
 self.Segments = []
 self.SelectedSegment = None
 self.Valid = True
 self.Value = None
+self.ValueSize = None
 self.OverStart = False
 self.OverEnd = False
 self.ComputingType = False
+parent_font = parent.GetFont()
-# Destructor of a wire
+self.Font = wx.Font(parent_font.GetPointSize() * 0.75, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = parent_font.GetFaceName())
-def __del__(self):
+def Flush(self):
 self.StartConnected = None
 self.EndConnected = None
 # Returns the RedrawRect
 def GetRedrawRect(self, movex = 0, movey = 0):
 rect = Graphic_Element.GetRedrawRect(self, movex, movey)
 if self.StartConnected:
 rect = rect.Union(self.StartConnected.GetRedrawRect(movex, movey))
 if self.EndConnected:
 rect = rect.Union(self.EndConnected.GetRedrawRect(movex, movey))
+if self.ValueSize is not None:
+width, height = self.ValueSize
+width, height = self.ValueSize
+if self.BoundingBox[2] > width * 4 or self.BoundingBox[3] > height * 4:
+x = self.Points[0].x + width * self.StartPoint[1][0] / 2
+y = self.Points[0].y + (height * self.StartPoint[1][1] - 1) / 2
+rect = rect.Union(wx.Rect(x, y, width, height))
+x = self.Points[-1].x + width * self.EndPoint[1][0] / 2
+y = self.Points[-1].y + (height * self.EndPoint[1][1] - 1) / 2
+rect = rect.Union(wx.Rect(x, y, width, height))
+else:
+middle = len(self.Segments) / 2 + len(self.Segments) % 2 - 1
+x = self.Points[middle].x - width / 2
+y = self.Points[middle].y - height / 2
+rect = rect.Union(wx.Rect(x, y, width, height))
 return rect
 # Forbids to change the wire position
 def SetPosition(x, y):
 pass
 elif self.EndConnected:
 return True
 return False
 def SetValue(self, value):
-self.Value = value
+if value is not None and not isinstance(value, BooleanType):
+if isinstance(value, StringType):
+value = "\"%s\""%value
+else:
+value = str(value)
+if len(value) > 4:
+value = value[:4] + "_"
+if self.Value != value:
+self.Value = value
+if isinstance(self.Value, StringType):
+dc = wx.ClientDC(self.Parent)
+dc.SetFont(self.Font)
+self.ValueSize = dc.GetTextExtent(self.Value)
+else:
+self.ValueSize = None
+if self.StartConnected:
+self.StartConnected.RefreshValue()
+if self.EndConnected:
+self.EndConnected.RefreshValue()
+self.Refresh()
+if isinstance(value, BooleanType):
+block = self.StartConnected.GetParentBlock()
+block.SpreadCurrent()
+def GetValue(self):
+return self.Value
 # Unconnect the start and end points
 def Clean(self):
 if self.StartConnected:
 self.UnConnectStartPoint()
 # Select a segment and not the whole wire. It's useful for Ladder Diagram
 def MarkAsInvalid(self):
 self.Valid = False
 if self.StartConnected:
-self.StartConnected.SetPen(wx.RED_PEN)
+self.StartConnected.MarkAsInvalid()
 if self.EndConnected:
-self.EndConnected.SetPen(wx.RED_PEN)
+self.EndConnected.MarkAsInvalid()
 # Reinitialize the wire points
 def ResetPoints(self):
 if self.StartPoint and self.EndPoint:
 self.Points = [self.StartPoint[0], self.EndPoint[0]]
 width = lastwidth
 if height != lastheight and lastheight == self.Size.height:
 height = lastheight
 # Calculate the real points from the new size, it's important for
 # keeping a proportionality in the points position with the size
-# duringa resize dragging
+# during a resize dragging
 for i, point in enumerate(self.RealPoints):
 if not (i == 0 and self.StartConnected) and not (i == len(self.Points) - 1 and self.EndConnected):
 point[0] = point[0] * width / float(max(lastwidth, 1))
 point[1] = point[1] * height / float(max(lastheight, 1))
 # Calculate the correct position of the points from real points
 self.EndConnected.Draw(dc)
 # Draws the wire lines and points
 def Draw(self, dc):
 Graphic_Element.Draw(self, dc)
-if self.Valid:
+if not self.Valid:
+dc.SetPen(wx.RED_PEN)
+elif isinstance(self.Value, BooleanType) and self.Value:
+dc.SetPen(wx.GREEN_PEN)
+else:
 dc.SetPen(wx.BLACK_PEN)
-else:
-dc.SetPen(wx.RED_PEN)
 dc.SetBrush(wx.BLACK_BRUSH)
 # Draw the start and end points if they are not connected or the mouse is over them
 if len(self.Points) > 0 and (not self.StartConnected or self.OverStart):
 dc.DrawCircle(self.Points[0].x, self.Points[0].y, POINT_RADIUS)
 if len(self.Points) > 1 and (not self.EndConnected or self.OverEnd):
 dc.DrawCircle(self.Points[-1].x, self.Points[-1].y, POINT_RADIUS)
 # Draw the wire lines and the last point (it seems that DrawLines stop before the last point)
 dc.DrawLines(self.Points)
 dc.DrawPoint(self.Points[-1].x, self.Points[-1].y)
 # Draw the segment selected in red
-if self.SelectedSegment != None:
+if self.SelectedSegment is not None:
 dc.SetPen(wx.RED_PEN)
 dc.DrawLine(self.Points[self.SelectedSegment].x, self.Points[self.SelectedSegment].y,
 self.Points[self.SelectedSegment + 1].x, self.Points[self.SelectedSegment + 1].y)
 if self.SelectedSegment == len(self.Segments) - 1:
 dc.DrawPoint(self.Points[-1].x, self.Points[-1].y)
+if self.Value is not None and not isinstance(self.Value, BooleanType):
+dc.SetFont(self.Font)
+dc.SetTextForeground(wx.NamedColour("purple"))
+width, height = self.ValueSize
+if self.BoundingBox[2] > width * 4 or self.BoundingBox[3] > height * 4:
+x = self.Points[0].x + width * self.StartPoint[1][0] / 2
+y = self.Points[0].y + height * (self.StartPoint[1][1] - 1) / 2
+dc.DrawText(self.Value, x, y)
+x = self.Points[-1].x + width * self.EndPoint[1][0] / 2
+y = self.Points[-1].y + height * (self.EndPoint[1][1] - 1) / 2
+dc.DrawText(self.Value, x, y)
+else:
+middle = len(self.Segments) / 2 + len(self.Segments) % 2 - 1
+x = (self.Points[middle].x + self.Points[middle + 1].x - width) / 2
+y = (self.Points[middle].y + self.Points[middle + 1].y - height) / 2
+dc.DrawText(self.Value, x, y)
+dc.SetFont(self.Parent.GetFont())
+dc.SetTextForeground(wx.BLACK)
 #-------------------------------------------------------------------------------
 #                           Graphic comment element
 #-------------------------------------------------------------------------------
 else:
 linetext = word
 y += wordheight + 5
 if y + wordheight > self.Pos.y + self.Size[1] - 10:
 break

changeset 249	d8425712acef
parent 243	c5da8b706cde
child 253	d9391572655f