plcopeneditor_history: comparison Viewer.py

equal deleted inserted replaced

-:072f9f830659
+:62570186dad4
 """
 Class that implements a Viewer based on a wx.ScrolledWindow for drawing and
 manipulating graphic elements
 """
-class Viewer(wx.ScrolledWindow):
+class Viewer(wx.ScrolledWindow, DebugViewer):
 if wx.VERSION < (2, 6, 0):
 def Bind(self, event, function, id = None):
 if id is not None:
 event(self, id, function)
 # Create a new Viewer
 def __init__(self, parent, tagname, window, controler, debug = False, instancepath = ""):
 wx.ScrolledWindow.__init__(self, parent, pos=wx.Point(0, 0), size=wx.Size(0, 0),
 style=wx.HSCROLL | wx.VSCROLL | wx.ALWAYS_SHOW_SB)
+DebugViewer.__init__(self, controler, debug)
 self._init_menus()
 # Adding a rubberband to Viewer
 self.rubberBand = RubberBand(drawingSurface=self)
 self.SetBackgroundColour(wx.Colour(255,255,255))
 self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
 self.PagePen = wx.TRANSPARENT_PEN
 self.DrawingWire = False
 self.current_id = 0
 self.TagName = tagname
 self.Errors = []
-self.Debug = debug
 self.InstancePath = instancepath
 self.StartMousePos = None
 self.StartScreenPos = None
 # Initialize Block, Wire and Comment numbers
 self.ParentWindow = window
 self.Controler = controler
 if not self.Debug:
 self.SetDropTarget(ViewerDropTarget(self))
+self.NewDataRefreshRect = None
 dc = wx.ClientDC(self)
 font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["mono"])
 dc.SetFont(font)
 width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
 faces["size"] -= 1
 font = wx.Font(faces["size"], wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["mono"])
 dc.SetFont(font)
 width, height = dc.GetTextExtent("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
 self.SetFont(font)
+self.MiniTextDC = wx.MemoryDC()
+self.MiniTextDC.SetFont(wx.Font(faces["size"] * 0.75, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["helv"]))
 self.SetScale(len(ZOOM_FACTORS) / 2)
 self.ResetView()
 self.current_id += 1
 return self.current_id
 # Destructor
 def __del__(self):
+DebugViewer.__del__(self)
 self.Flush()
 self.ResetView()
 def SetScale(self, scale_number):
 self.CurrentScale = max(0, min(scale_number, len(ZOOM_FACTORS) - 1))
 else:
 self.PrepareDC(dc)
 dc.SetUserScale(self.ViewScale[0], self.ViewScale[1])
 return dc
+def GetMiniTextExtent(self, text):
+return self.MiniTextDC.GetTextExtent(text)
 def GetMiniFont(self):
-font = self.GetFont()
+return self.MiniTextDC.GetFont()
-return wx.Font(font.GetPointSize() * 0.75, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName = faces["helv"])
 #-------------------------------------------------------------------------------
 #                         Element management functions
 #-------------------------------------------------------------------------------
 def AddBlock(self, block):
 iec_path = "%s.%s%d"%(self.InstancePath, block.GetType(), block.GetId())
 else:
 iec_path = "%s.%s%d_%s"%(self.InstancePath, block.GetType(), block.GetId(), connectorname)
 elif isinstance(block, FBD_Variable):
 iec_path = "%s.%s"%(self.InstancePath, block.GetName())
-elif isinstance(element, (LD_Contact, LD_Coil)):
+elif isinstance(element, LD_Contact):
 iec_path = "%s.%s"%(self.InstancePath, element.GetName())
 elif isinstance(element, SFC_Step):
 iec_path = "%s.%s.X"%(self.InstancePath, element.GetName())
 elif isinstance(element, SFC_Transition):
 connectors = element.GetConnectors()
 self.Subscribed = {}
 self.SelectedElement = None
 self.HighlightedElement = None
 def Flush(self):
-for element, iec_path in self.Subscribed.iteritems():
+self.DeleteDataConsumers()
-self.Controler.UnsubscribeDebugIECVariable(iec_path, element)
 for block in self.Blocks:
 block.Flush()
 # Remove all elements
 def CleanView(self):
 #-------------------------------------------------------------------------------
 #                          Refresh functions
 #-------------------------------------------------------------------------------
+def UpdateRefreshRect(self, refresh_rect):
+if self.NewDataRefreshRect is None:
+self.NewDataRefreshRect = refresh_rect
+else:
+self.NewDataRefreshRect.Union(refresh_rect)
+def RefreshNewData(self):
+if self.NewDataRefreshRect is not None:
+refresh_rect, self.NewDataRefreshRect = self.NewDataRefreshRect, None
+self.RefreshRect(self.GetScrolledRect(refresh_rect), False)
+DebugViewer.RefreshNewData(self)
 def ResetBuffer(self):
 pass
 # Refresh Viewer elements
 else:
 if connectorname == "":
 iec_path = "%s.%s%d"%(self.InstancePath, block.GetType(), block.GetId())
 else:
 iec_path = "%s.%s%d_%s"%(self.InstancePath, block.GetType(), block.GetId(), connectorname)
-if self.Controler.SubscribeDebugIECVariable(iec_path.upper(), wire) is not None:
+if self.AddDataConsumer(iec_path.upper(), wire) is None:
-self.Subscribed[wire] = iec_path.upper()
-else:
 wire.SetValue("undefined")
 elif isinstance(block, FBD_Variable):
 iec_path = "%s.%s"%(self.InstancePath, block.GetName())
-if self.Controler.SubscribeDebugIECVariable(iec_path.upper(), wire) is not None:
+if self.AddDataConsumer(iec_path.upper(), wire) is None:
-self.Subscribed[wire] = iec_path.upper()
-else:
 wire.SetValue("undefined")
 elif isinstance(block, FBD_Connector):
 wire.SetValue("undefined")
 if self.Debug:
 for block in self.Blocks.keys():
 block.SpreadCurrent()
 iec_path = self.GetElementIECPath(block)
 if iec_path is not None:
-result = self.Controler.SubscribeDebugIECVariable(iec_path.upper(), block)
+self.AddDataConsumer(iec_path.upper(), block)
-if result is not None:
-self.Subscribed[block] = iec_path.upper()
 self.RefreshVisibleElements()
 self.ShowErrors()
 self.Refresh(False)
 def GetPreviousSteps(self, connector):
 names = exclude.copy()
 if isinstance(element, FBD_Block):
 names.update(dict([(varname.upper(), True) for varname in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]))
 format = "Block%d"
 elif isinstance(element, SFC_Step):
-names.update(dict([block.GetName().upper() for block in self.Blocks if isinstance(block, SFC_Step)]))
+names.update(dict([(block.GetName().upper(), True) for block in self.Blocks if isinstance(block, SFC_Step)]))
 format = "Step%d"
 i = 1
 while names.get((format%i).upper(), False):
 i += 1
 return format%i

changeset 361	62570186dad4
parent 352	5cd60f7e510c
child 363	5eb9c5536334